301 Commits (9abff2c7adc92c934ef204d91ec0240d500eb863)

Author SHA1 Message Date
YunaiV d048daf7d6 mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖 2 years ago
YunaiV 3a9ac56f96 修复 banner 返回字段不对 2 years ago
YunaiV c11300d33a 解决启动问题 2 years ago
YunaiV 52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
2 years ago
YunaiV 07dbfc5546 code review:sign 签到逻辑 2 years ago
puhui999 ff3b1e942a Banner: market ==> promotion 2 years ago
YunaiV df00126fa4 统一 boot 和 cloud 代码 2 years ago
YunaiV 7bff98b658 统一 boot 和 cloud 代码 2 years ago
YunaiV 054569a3d3 promotion:去除已经不使用的代码 2 years ago
puhui999 6723cae781 营销活动:完善 review 提到的问题 2 years ago
YunaiV 728308cbc0 member:优化部分变量的命名 2 years ago
YunaiV 0db4581030 code review:签到逻辑 2 years ago
芋道源码 3e570b8b89
!685 完善遗留的问题
Merge pull request !685 from puhui999/feature/mall_product
2 years ago
YunaiV 785fbeeb5b code review:限时折扣活动 2 years ago
芋道源码 90fb2c62b8
!683 mall模块
Merge pull request !683 from zxiaoxiu/discount
2 years ago
puhui999 f363c598d8 Banner:完善 review 提到的问题 2 years ago
puhui999 f18a4741a9 营销活动:完善 review 提到的问题 2 years ago
puhui999 f462ac7f96 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2 years ago
zhangshuai 04061b028c mall模块-限时折扣功能 2 years ago
puhui999 283ca908b7 SPU: 完善选择优惠卷 2 years ago
puhui999 6e11154010 SPU: 添加选择优惠卷 2 years ago
YunaiV 453f69931f code review:营销文章 2 years ago
puhui999 ffbf9278b8 营销文章:修正文章浏览量类型错误,新增时初始化浏览量 2 years ago
puhui999 6081ce30d5 营销活动:完善 review 提到的问题 2 years ago
YunaiV d842708c23 code review:数据统计 2 years ago
YunaiV 1ff9bc6a71 code review:文章管理 2 years ago
puhui999 4273b8f09c 营销活动:完善 review 提到的问题 2 years ago
puhui999 01ef5f7911 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/ArticleController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExcelVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExportReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java
2 years ago
YunaiV 7345933d6b code review:文章管理 2 years ago
YunaiV 4359c584bb code review:拼团逻辑 2 years ago
puhui999 0d45acaf20 营销活动:完善文章相关 app 端接口 2 years ago
puhui999 26d3672668 营销活动: 文章分类管理软件包调整 2 years ago
puhui999 1fe6c82899 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2 years ago
puhui999 55eed1377a 营销活动: 新增文章管理 2 years ago
puhui999 a47ab32800 营销活动: 新增文章分类管理 2 years ago
YunaiV ca5e3f7bd1 优化最新的商城的 sql 2 years ago
puhui999 a4613f0af9 拼团活动: 完善 review 提到的问题 2 years ago
YunaiV 670a098aa8 code review:拼团记录流程 2 years ago
YunaiV b0179457ce 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(补全各种排重逻辑) 2 years ago
puhui999 cfbc8b4849 拼团记录(admin-api):增加 page-by-headId 接口获取指定 headId 完整拼团列表分页 2 years ago
puhui999 bccd270fc7 营销活动:完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 2 years ago
puhui999 fdbebc406c 秒杀活动:纠正秒杀库存和秒杀总库存扣减错误的问题 2 years ago
puhui999 42fcbe0501 砍价活动:完成订单取消时恢复活动库存 2 years ago
puhui999 245f14b8f1 秒杀活动:完成订单取消时恢复活动库存和商品库存 2 years ago
puhui999 831983e314 营销活动:重构 getCombinationActivityBySpuIdsAndStatus 方法 2 years ago
puhui999 57407a39d2 营销活动:修正 selectListBySpuIdsAndStatus 查询 sql,添加接口测试 2 years ago
puhui999 c869d99a0f 修复:启动报错-循环依赖 2 years ago
puhui999 53e67c0437 拼团活动:完善 review 提到的问题 2 years ago
YunaiV 7b727d5ce2 code review:拼团记录流程 2 years ago
puhui999 2c0f1121ca 拼团活动:完善 review 提到的问题 2 years ago