134 Commits (main)

Author	SHA1	Message	Date
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	2 years ago
YunaiV	53e789dfdc	trade：订单表，增加 vip 优惠字段	2 years ago
YunaiV	aa5525d1f5	code review：营销活动 & 交易订单的对接	2 years ago
owen	052328c5fa	积分：完善积分获得、退还、使用 相关逻辑	2 years ago
YunaiV	71d6311bd4	code review：拼团、秒杀等逻辑	2 years ago
puhui999	6ef94ade6a	完善订单和活动 review 提到的问题	2 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	2 years ago
puhui999	1d2a6ad065	拼团活动: 完善 app 端获取活动分页、列表、详情接口	2 years ago
YunaiV	c766f7daa5	code review：砍价、秒杀的逻辑	2 years ago
puhui999	408df683d8	秒杀活动: 完善 app 端获取活动分页、列表、详情接口	2 years ago
puhui999	a10d77cdfe	mall+order: 完善部分 TODO 提到的问题	2 years ago
YunaiV	e8bdd8349c	code review：订单部分逻辑	2 years ago
puhui999	254d7828aa	mall+order: 订单活动特殊逻辑的抽离	2 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	2 years ago
puhui999	7fb455096c	商城活动: 完善活动商品并发库存扣减逻辑	2 years ago
puhui999	57f0ea04f7	mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现）	2 years ago
dhb52	d7488e70b0	使用下划线分割ErrorCodeConstants的ErrorCode	2 years ago
YunaiV	87c55784c4	code review：营销活动+订单	2 years ago
puhui999	5d6bb84d25	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	2 years ago
puhui999	0e8755972c	营销活动+订单：完善大部分 TODO 提到的问题	2 years ago
puhui999	2591ab5d36	订单中心+营销活动：完善部分 TODO 提到的问题	2 years ago
owen	8bbaaf1ce9	promotion: 优惠券模板 productSpuIds 改成 productScopeValues	2 years ago
YunaiV	c25bf38f50	code review：交易订单的取消	2 years ago
YunaiV	9c0d0c809a	Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product ... Conflicts: yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java 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/order/TradeOrderUpdateServiceImpl.java	2 years ago
YunaiV	a6ec3fefcf	code review：优惠劵发放	2 years ago
owen	3fbce643ee	mall: 发送优惠券功能优化	2 years ago
YunaiV	76f510f247	code review：优惠劵发放	2 years ago
owen	b3fcefa677	trade: 会员取消订单	2 years ago
owen	530ec7ab24	mall: 完善后台发送优惠券	2 years ago
YunaiV	94a32d34b2	1. 会员用户，增加 point 积分字段 ... 2. 增加获得优惠劵、收藏数量的 API 接口	3 years ago
YunaiV	c3de25e760	营销： ... 1. 调整店铺装修接口	3 years ago
YunaiV	159c74ce15	订单： ... 1. review 发货 2. review 拼团逻辑	3 years ago
puhui999	de828e3d04	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/bargain/BargainActivityController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityCreateReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityUpdateReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityCreateReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityPageReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/product/BargainProductBaseVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityPageReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainActivityDO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainProductDO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationServiceImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java	3 years ago
puhui999	651725e3e8	fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑	3 years ago
YunaiV	6fdd4da0b3	优化秒杀活动的管理后台代码	3 years ago
zhijiantianya@gmail.com	ba59ec85e0	code review 各种活动	3 years ago
puhui999	384359c9d4	fix: 完善拼团、秒杀、砍价活动管理	3 years ago
puhui999	5f9184904a	fix: 完善拼团、秒杀、砍价活动管理	3 years ago
YunaiV	5e2fa48f20	code review：拼团、秒杀活动的代码	3 years ago
puhui999	d156d43d63	fix：完善 review 拼团、秒杀活动的实现提到的问题	3 years ago
YunaiV	b84f7825c5	review 拼团、秒杀活动的实现	3 years ago
puhui999	7957cfa50d	fix：优化拼团与订单集成逻辑	3 years ago
puhui999	8d13ecc9c8	fix：优化订单发货逻辑使其支持一单分发	3 years ago
puhui999	259807600a	feat：拼团订单集成	3 years ago
puhui999	7cdb321fe4	fix：完善拼团活动CRUD	3 years ago
puhui999	78b3d2a20f	fix：mall promotion Combination	3 years ago
puhui999	41d996f7f3	feat：mall promotion CombinationProduct	3 years ago
puhui999	409ec555e8	feat：mall CombinationActivity	3 years ago
jason	050f0bb6a2	页面装修 review 修改	3 years ago
YunaiV	b582206003	mall + promotion：review 页面装修	3 years ago
jason	ad1f656dfa	页面装修修改,后端只负责存取	3 years ago
芋道源码	b16632ea41	!522 mall seckill ... Merge pull request !522 from puhui999/feature/mall_product	3 years ago
jason	6b1d996b66	页面装修数据结构定义	3 years ago
puhui999	331be53b8b	fix：完善时段配置管理	3 years ago
YunaiV	4f5ac0edbb	mall + promotion：增加营销活动的 mock 接口	3 years ago
puhui999	ba380ea615	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/price/PriceServiceTest.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/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java	3 years ago
YunaiV	1452f6b231	mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试	3 years ago
YunaiV	5de8fa2e42	mall + trade：解决报错问题	3 years ago
puhui999	35daee84e7	fix: 解决合并代码后项目运行失败的问题，相关问题已标注 TODO	3 years ago
YunaiV	0631c51d93	mall + trade：review 配置管理列表	3 years ago
YunaiV	02fa6fc5c6	mall + trade：调整价格字段，更易懂	3 years ago
崔家辉	fbeaa06100	bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误	3 years ago
halfninety	54baad165d	秒杀时段新增修改时间段冲突校验。 ... 秒杀活动新增，修改，删除时对秒杀时段的秒杀活动数量进行修改	3 years ago
halfninety	7bc1ae5f35	秒杀活动增删改查	3 years ago
halfninety	cd62c4d220	秒杀时段相关	3 years ago
halfninety	83ee1c6129	秒杀活动，添加商品，分页查询	3 years ago
YunaiV	16f5d0f5a4	trade：增加优惠劵使用、商品库存的扣减	3 years ago
YunaiV	01d10b518c	trade：优化创建订单接口的后端实现	3 years ago
YunaiV	edc5d0f1d0	promotion：增加获得优惠劵匹配结果的列表	3 years ago
YunaiV	d10f49b6a7	promotion：优化价格计算的接口，增加 orderPrice 字段	3 years ago
YunaiV	636cc794dd	promotion：完善价格计算，重新接入限时折扣的多种优惠方式	3 years ago
YunaiV	d4b7f4aaa0	promotion：增加限时折扣的基础代码	3 years ago
YunaiV	00f90e75d9	promotion：增加满减送活动的关闭功能	3 years ago
YunaiV	79304b3a73	promotion：增加满减送活动的排重校验、单元测试	3 years ago
YunaiV	0e5b7734ac	promotion：增加满减送活动的后端 20%	3 years ago
YunaiV	873b530652	promotion：增加优惠劵的回收操作	3 years ago
YunaiV	47c2dfa623	promotion：增加优惠劵的前端分页界面 100%	3 years ago
YunaiV	a89d5a83db	promotion：增加优惠劵的后端分页接口	3 years ago
YunaiV	2c39405bce	promotion：完善的优惠卷的实体	3 years ago
YunaiV	2aaeb7af88	promotion：实现部分优惠劵模板的前端表单 80%	3 years ago
YunaiV	dc51a93533	promotion：实现部分优惠劵模板的前端列表	3 years ago
YunaiV	979ba0f916	promotion：实现优惠劵模板的逻辑	3 years ago
YunaiV	035c2cf28c	promotion：完善 优惠劵模板 表~	3 years ago
YunaiV	e6acdf7098	将 market 模块，调整成 promotion 模块	3 years ago