202 Commits (31249481759ed9a87653a1f2c04974a728cc533a)

Author	SHA1	Message	Date
YunaiV	94a32d34b2	1. 会员用户，增加 point 积分字段 ... 2. 增加获得优惠劵、收藏数量的 API 接口	3 years ago
YunaiV	61fbb9909a	订单： ... 1、简化交易订单的逻辑	3 years ago
YunaiV	fe07e223e4	订单： ... 1、简化交易订单的逻辑	3 years ago
YunaiV	f217ba0807	售后： ... 1、完善整个流程的实现	3 years ago
YunaiV	5dd6e5bee8	营销： ... 1. 售后订单，增加对 afterSaleId 的更新	3 years ago
YunaiV	a159a983a2	订单： ... 1. 拆分读写 OrderService，避免单 Service 逻辑过重。	3 years ago
YunaiV	159c74ce15	订单： ... 1. review 发货 2. review 拼团逻辑	3 years ago
芋道源码	60171ce7e4	!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 ... Merge pull request !571 from puhui999/feature/mall_product	3 years ago
YunaiV	e4a2c738b2	订单： ... 1. 增加查询物流接口	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	715c42574f	订单： ... 1、订单评价的接入	3 years ago
YunaiV	7dc398717a	订单： ... 1、实现确认收货接口	3 years ago
YunaiV	503c996acd	订单： ... 1、移除 deliverStatus 发货状态，暂时没作用 2、无需发货时，使用 logisticsId 进行实现 3、订单详情，增加 logisticsId 和 logisticsName 返回	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	92b10e2ecf	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	3 years ago
puhui999	d156d43d63	fix：完善 review 拼团、秒杀活动的实现提到的问题	3 years ago
wcz	a6ffb5d650	BaseMapperX.java少了几个方法，TradeCartMapper.java方法调整，BpmProcessInstanceServiceImpl.java多了	3 years ago
YunaiV	b84f7825c5	review 拼团、秒杀活动的实现	3 years ago
puhui999	7957cfa50d	fix：优化拼团与订单集成逻辑	3 years ago
puhui999	8d13ecc9c8	fix：优化订单发货逻辑使其支持一单分发	3 years ago
puhui999	f23e1b857a	fix：合并差异修正	3 years ago
puhui999	a73e078593	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/service/order/TradeOrderServiceImpl.java	3 years ago
puhui999	259807600a	feat：拼团订单集成	3 years ago
zhijiantianya@gmail.com	3f410c2735	by gateway: ... 1. 补全 channel 单元测试 2. 完善部分 order 单元测试	3 years ago
puhui999	d80bf5a368	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	3 years ago
YunaiV	6f475f8c85	mall + pay： ... 1. 优化 PayClient 支付逻辑，返回业务失败 errorCode + errorMsg 错误码	3 years ago
puhui999	927f71c7e2	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	3 years ago
YunaiV	ca4afc2909	mall + pay： ... 1. 调整 cashier 的 channels 的读取实现方式	3 years ago
YunaiV	2485a5ebc9	mall + pay： ... 1. 将 amount 统一都修改成 price 2. 将 payed 统一改成 payStatus	3 years ago
puhui999	e7d8643665	fix：修复 mall review @puhui999	3 years ago
YunaiV	20eb0a2a88	mall + pay： ... 1、调整 returnUrl 的实现	3 years ago
YunaiV	9b90320985	mall + trade： ... 1、增加配送信息	3 years ago
YunaiV	6fc724545b	mall + trade： ... 1、取消订单 mock 接口 2、删除订单 mock 接口	3 years ago
YunaiV	6206dd94e2	mall + trade： ... 1、获取订单结算信息，增加门店自提编号	3 years ago
YunaiV	3750dc76c7	mall + trade： ... 1、获取订单结算信息，增加积分的 mock 返回	3 years ago
YunaiV	ef656cf762	mall + promotion： ... 1、增加获得符合条件的优惠劵	3 years ago
YunaiV	b3c1be108c	mall + trade： ... 1、增加门店自提的 mock 接口	3 years ago
YunaiV	1dfbe45913	mall + order：review 售后日志	3 years ago
YunaiV	07884ef423	Merge branch 'mall_trade_aftersalelog' of https://gitee.com/chen934298133/ruoyi-vue-pro into feature/mall_product ... Conflicts: yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java	3 years ago
YunaiV	bc54e2fb35	mall + order：订单详情	3 years ago
芋道源码	b92ed60136	!519 订单详情后端修改 ... Merge pull request !519 from 矿泉水/feature/mall_product	3 years ago
YunaiV	2efdbf93cb	mall + promotion：review 秒杀、评论代码	3 years ago
puhui999	666925da6e	fix：mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED	3 years ago
puhui999	700d95a43d	fix：完善商品评论 review 提到的问题	3 years ago
chenchen	2f0aaee823	售后日志优化	3 years ago
xiaobai	32b348a2d3	Merge branch 'feature/mall_product' of https://gitee.com/joly_xiaobai/ruoyi-vue-pro into mall_product ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java	3 years ago