118 Commits (1bb2010dc0ed73b1bf8fc8d936a11ee72222927e)

Author	SHA1	Message	Date
puhui999	6e11154010	SPU: 添加选择优惠卷	2 years ago
puhui999	4273b8f09c	营销活动：完善 review 提到的问题	2 years ago
YunaiV	4359c584bb	code review：拼团逻辑	2 years ago
puhui999	55eed1377a	营销活动: 新增文章管理	2 years ago
puhui999	a47ab32800	营销活动: 新增文章分类管理	2 years ago
puhui999	a4613f0af9	拼团活动: 完善 review 提到的问题	2 years ago
YunaiV	670a098aa8	code review：拼团记录流程	2 years ago
puhui999	245f14b8f1	秒杀活动：完成订单取消时恢复活动库存和商品库存	2 years ago
puhui999	53e67c0437	拼团活动：完善 review 提到的问题	2 years ago
YunaiV	7b727d5ce2	code review：拼团记录流程	2 years ago
puhui999	2c0f1121ca	拼团活动：完善 review 提到的问题	2 years ago
puhui999	2e559ebe06	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/service/combination/CombinationRecordServiceImpl.java	2 years ago
puhui999	c8a9d68933	拼团活动：完善 review 提到的问题	2 years ago
YunaiV	01e6140d67	code review：拼团记录流程	2 years ago
YunaiV	99649bfdb8	code review：拼团记录流程	2 years ago
puhui999	c485c6e04d	订单：重构拼团下单流程更改为订单支付后再创建拼团记录	2 years ago
puhui999	f40bd23f6a	拼团记录：完善拼团记录创建前的条件校验规则	2 years ago
YunaiV	c7b5df930e	promotion：修复拼团下单时，相关字段记录不正确的情况。	2 years ago
puhui999	f732e7a750	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/api/bargain/BargainRecordApiImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainRecordServiceImpl.java	2 years ago
YunaiV	aec8e853e4	trade：完善砍价的下单流程	2 years ago
puhui999	0b2943ba8b	拼团活动：完善拼团下单金额结算	2 years ago
YunaiV	1bda3c8b53	promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！	2 years ago
YunaiV	16e436a0f5	promotion：增加助力砍价的接口	2 years ago
YunaiV	cc087e4eca	promotion：增加创建砍价的接口	2 years ago
YunaiV	8dbabb9efc	trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算	2 years ago
YunaiV	20f5834d9a	trade：价格计算时，接入优惠劵逻辑	3 years ago
puhui999	82210a9583	订单：完善拼团活动	3 years ago
puhui999	597eacaaeb	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java	3 years ago
puhui999	0b35d4a7e3	订单：完善拼团活动部分 TODO	3 years ago
owen	26628913cb	错误码分段	3 years ago
YunaiV	5913ee0706	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java # yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java # yudao-server/src/main/resources/application-local.yaml	3 years ago
owen	0a3a6825d5	优惠券：完善APP优惠券查询接口	3 years ago
puhui999	bce96b29a6	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java	3 years ago
puhui999	42c47d9b44	秒回活动：订单金额计算初步设计	3 years ago
owen	f7296d18b9	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate ... # Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java	3 years ago
YunaiV	53e789dfdc	trade：订单表，增加 vip 优惠字段	3 years ago
YunaiV	aa5525d1f5	code review：营销活动 & 交易订单的对接	3 years ago
owen	052328c5fa	积分：完善积分获得、退还、使用 相关逻辑	3 years ago
YunaiV	71d6311bd4	code review：拼团、秒杀等逻辑	3 years ago
puhui999	6ef94ade6a	完善订单和活动 review 提到的问题	3 years ago
puhui999	52848d6341	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/app/seckill/AppSeckillActivityController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java	3 years ago
puhui999	1d2a6ad065	拼团活动: 完善 app 端获取活动分页、列表、详情接口	3 years ago
YunaiV	c766f7daa5	code review：砍价、秒杀的逻辑	3 years ago
puhui999	408df683d8	秒杀活动: 完善 app 端获取活动分页、列表、详情接口	3 years ago
puhui999	a10d77cdfe	mall+order: 完善部分 TODO 提到的问题	3 years ago
YunaiV	e8bdd8349c	code review：订单部分逻辑	3 years ago
puhui999	254d7828aa	mall+order: 订单活动特殊逻辑的抽离	3 years ago
YunaiV	8b50cd9661	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... Conflicts: yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java	3 years ago
puhui999	7fb455096c	商城活动: 完善活动商品并发库存扣减逻辑	3 years ago
puhui999	57f0ea04f7	mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现）	3 years ago