puhui999
|
d3f03540f8
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
puhui999
|
82210a9583
|
订单：完善拼团活动
|
3 years ago |
YunaiV
|
367b45e3bd
|
code review：数据统计
|
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 |
|
puhui999
|
5ecd0d94eb
|
订单：添加 order handler 默认抽象实现类，子类可以选择性地实现抽象方法，而不必实现所有方法
|
3 years ago |
owen
|
6b7f071988
|
Review代码修改
|
3 years ago |
|
owen
|
26628913cb
|
错误码分段
|
3 years ago |
|
owen
|
929ff4286a
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
171161e6c7
|
统计：交易统计
|
3 years ago |
|
YunaiV
|
9ee0aebd3f
|
promotion：增加 coupon 的 code review
|
3 years ago |
|
YunaiV
|
666ba351a2
|
trade：退款理由的维护
|
3 years ago |
|
YunaiV
|
3c643f814c
|
trade：补全售后日志的记录
|
3 years ago |
|
YunaiV
|
d402bdb7e0
|
trade：优化售后取消订单的实现代码
|
3 years ago |
|
YunaiV
|
f9bf41d773
|
code review：分佣剩余部分的 review
|
3 years ago |
|
YunaiV
|
b1ce971a2f
|
code review：解决分佣的 npe 问题
|
3 years ago |
|
YunaiV
|
9cd36abf10
|
同步 master 分支代码
|
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 |
|
YunaiV
|
eeb8873b1d
|
trade：微调交易配置的注释
|
3 years ago |
|
YunaiV
|
9e3564bd6a
|
code review：优惠劵逻辑
|
3 years ago |
|
owen
|
b2c608e7a5
|
交易：发货订单日志
|
3 years ago |
|
owen
|
565a8e0e6b
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
b9018baa03
|
trade：简化价格调整的逻辑
|
3 years ago |
|
YunaiV
|
c5f2d07c87
|
商城：增加 stat 统计设计
|
3 years ago |
|
YunaiV
|
26dfbfb2ac
|
trade：发货逻辑，增加订单日志
|
3 years ago |
|
owen
|
be426235dd
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
bc07e1dbf4
|
售后：重构售后更新订单的逻辑
|
3 years ago |
|
owen
|
74ef98f8fc
|
售后：售后成功后，回滚 SKU 库存
|
3 years ago |
|
owen
|
2766dd672a
|
优惠券：过期定时任务
|
3 years ago |
|
owen
|
11ffa45b89
|
积分：Review代码修改
|
3 years ago |
|
YunaiV
|
53bd1b9ec1
|
trade：订单评论超时时，自动评论
|
3 years ago |
|
owen
|
cd2d0b7089
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
77f7763560
|
优惠券：完善优惠券领取接口
|
3 years ago |
|
YunaiV
|
cf41347cb3
|
trade：支付订单成功时，记录订单日志
|
3 years ago |
|
owen
|
b1ac3a0b8b
|
优惠券：完善优惠券匹配接口
|
3 years ago |
|
owen
|
f9aec7d8fd
|
优惠券：完善我的优惠券接口
|
3 years ago |
|
YunaiV
|
debf568750
|
code review：增加取消售后的优化建议
|
3 years ago |
|
owen
|
0a3a6825d5
|
优惠券：完善APP优惠券查询接口
|
3 years ago |
|
YunaiV
|
ad535e674f
|
trade：积分相关的价格计算
|
3 years ago |
|
YunaiV
|
a8c78f3097
|
trade：增加自动收货的 job
|
3 years ago |
|
owen
|
a431bccc02
|
分销：Review代码修改
|
3 years ago |
|
YunaiV
|
826d792ff2
|
trade：增加自动取消的 job
|
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 |
|
YunaiV
|
e384b810bf
|
code review：分销逻辑
|
3 years ago |
|
owen
|
16af31d980
|
分销：@Select sql语句增加逻辑删除字段过滤
|
3 years ago |
|
owen
|
3dca66eefa
|
分销：提现统计
|
3 years ago |
|
owen
|
0b84c18736
|
分销：修正分享海报
|
3 years ago |
|
owen
|
967e578d54
|
分销：重命名提现类型字段
|
3 years ago |
|
owen
|
9856e17974
|
分销：根据商品，计算推广员可以得到的佣金
|
3 years ago |