puhui999
|
89b240c1f9
|
订单：介入 TradeOrderHandler#cancelOrder
|
2 years ago |
|
puhui999
|
c485c6e04d
|
订单：重构拼团下单流程更改为订单支付后再创建拼团记录
|
2 years ago |
|
puhui999
|
f40bd23f6a
|
拼团记录：完善拼团记录创建前的条件校验规则
|
2 years ago |
YunaiV
|
c7b5df930e
|
promotion：修复拼团下单时，相关字段记录不正确的情况。
|
2 years ago |
|
YunaiV
|
34bf360da6
|
trade：调整拼团活动列表接口
|
2 years ago |
owen
|
383439f902
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
owen
|
4f33a0c9c0
|
统计：交易统计Review修改
|
2 years ago |
|
芋道源码
|
a76760c419
|
!653 完善拼团活动下单流程
Merge pull request !653 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
8e7b295d24
|
trade：砍价记录的详情 100%
|
2 years ago |
|
puhui999
|
92da91a7dc
|
订单：修改订单收货地址添加日志记录
|
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 |
|
puhui999
|
07d6ab5842
|
拼团活动：完善 TradeCombinationHandler
|
2 years ago |
|
YunaiV
|
1bda3c8b53
|
promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！
|
2 years ago |
|
YunaiV
|
c5824eedf7
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2 years ago |
|
YunaiV
|
6f39b2c030
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2 years ago |
|
YunaiV
|
8dbabb9efc
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2 years ago |
|
owen
|
7a15b340b0
|
交易：核销
|
2 years ago |
|
owen
|
60ea719b46
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
|
2 years ago |
|
owen
|
8e905f706d
|
交易：核销
|
2 years ago |
|
YunaiV
|
dc1347184f
|
code review：拼团、砍价活动
|
3 years ago |
|
YunaiV
|
20f5834d9a
|
trade：价格计算时，接入优惠劵逻辑
|
3 years ago |
|
owen
|
5819b08740
|
交易：Review修改
|
3 years ago |
|
owen
|
3c5917a6cd
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
a9e822762d
|
统计：交易统计定时任务
|
3 years ago |
|
YunaiV
|
ac55a9657c
|
promotion：完善秒杀模块
|
3 years ago |
|
YunaiV
|
df4716d5a1
|
code review：分销
|
3 years ago |
|
owen
|
b7359706db
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
d0f0bc5888
|
分销：调整推广人列表查询方式
|
3 years ago |
|
YunaiV
|
1f910992d6
|
trade：新增是否自提的配置项
|
3 years ago |
|
YunaiV
|
fdb10aeced
|
trade：优化运费模版的实现
|
3 years ago |
|
YunaiV
|
6f4c04d944
|
trade：完善退款详情
|
3 years ago |
|
YunaiV
|
0c1f5c9582
|
trade：完善订单详情
|
3 years ago |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
3 years ago |
|
YunaiV
|
057952bdeb
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
|
3 years ago |
|
YunaiV
|
b74169acfc
|
trade：优化订单列表的查询
|
3 years ago |
|
owen
|
abfebebdd5
|
交易：增加 积分抵扣计算器 单元测试
|
3 years ago |
|
owen
|
afd306a71d
|
交易：增加 赠送积分计算器 单元测试
|
3 years ago |
|
owen
|
2168145c3e
|
会员：会员配置的积分相关字段加上point前缀
|
3 years ago |
|
owen
|
ab35fcbe9b
|
会员：积分配置改为会员配置
|
3 years ago |
|
puhui999
|
d3f03540f8
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
puhui999
|
82210a9583
|
订单：完善拼团活动
|
3 years ago |
|
owen
|
7d68bdc7c8
|
分销：重构下级分销统计
|
3 years ago |
|
owen
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
aaa01de21d
|
分销：修改佣金排名查询算法
|
3 years ago |
|
owen
|
d0d21b2787
|
优惠券：新增/修改时，校验对应的商品、分类是否存在
|
3 years ago |
|
owen
|
42a899c5d3
|
交易：订单增加字段 推广人编号
|
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 |
|
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
|
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
|
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 |
|
YunaiV
|
cf41347cb3
|
trade：支付订单成功时，记录订单日志
|
3 years ago |
|
owen
|
b1ac3a0b8b
|
优惠券：完善优惠券匹配接口
|
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 |
|
owen
|
e9fd377772
|
分销：Review代码修改
|
3 years ago |
|
YunaiV
|
421bb7d154
|
code review：分销逻辑
|
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
|
b4587fd79e
|
product：订单表，增加 vip 优惠字段
|
3 years ago |
|
YunaiV
|
53e789dfdc
|
trade：订单表，增加 vip 优惠字段
|
3 years ago |
|
YunaiV
|
aa5525d1f5
|
code review：营销活动 & 交易订单的对接
|
3 years ago |
|
YunaiV
|
1da14a3f53
|
trade：删除订单的实现
|
3 years ago |
|
YunaiV
|
a9485ad6bf
|
trade：取消订单、确认收货，增加订单日志
|
3 years ago |
|
YunaiV
|
e9c9ac0cab
|
trade：确认收货时，增加订单日志
|
3 years ago |
|
owen
|
052328c5fa
|
积分：完善积分获得、退还、使用 相关逻辑
|
3 years ago |
|
YunaiV
|
71d6311bd4
|
code review：拼团、秒杀等逻辑
|
3 years ago |
|
芋道源码
|
54fe0174bc
|
!625 完善订单和活动 review 提到的问题，完善 app 端获取拼团活动分页、列表、详情接口
Merge pull request !625 from puhui999/feature/mall_product
|
3 years ago |
|
YunaiV
|
9451342aae
|
trade：营销商品（拼团、砍价）不能使用优惠劵
|
3 years ago |
|
owen
|
dc46dff62c
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
3 years ago |
|
owen
|
bbd18afbcc
|
分佣: 简化推广用户关系树查询方式
|
3 years ago |
|
owen
|
6e6486ccae
|
Trade: 完善配置
|
3 years ago |
|
owen
|
ad0513c87c
|
分佣: 推广人列表
|
3 years ago |
|
YunaiV
|
7c4fbc63dc
|
trade：物流费用计算，增加金额 divide 分拆逻辑
|
3 years ago |
|
owen
|
ee15b802b2
|
分佣: 推广人排行
|
3 years ago |
|
owen
|
972b01c001
|
分佣: 佣金排行
|
3 years ago |
|
owen
|
7a8a440eb6
|
分佣: 佣金记录
|
3 years ago |
|
owen
|
eddc897cd8
|
分佣: 提现记录
|
3 years ago |
|
owen
|
637ae8ce1d
|
分佣: 提现记录
|
3 years ago |
|
owen
|
c146c98b72
|
分佣: 提现
|
3 years ago |
|
owen
|
f72a087007
|
分佣: 我的推广统计接口
|
3 years ago |
|
owen
|
a7de955926
|
trade: 分销业务 - 提现申请
|
3 years ago |
|
owen
|
5ed99a9105
|
trade: 分销业务 - 整理包名
|
3 years ago |
|
YunaiV
|
5949727c8d
|
trade：全局配送价格配置
|
3 years ago |
|
YunaiV
|
35569c5ec8
|
trade：下单时，如果是门店自提，增加核销码的生成
|
3 years ago |
|
YunaiV
|
1b477aaa0d
|
trade：优化下单逻辑的实现
|
3 years ago |
|
puhui999
|
6ef94ade6a
|
完善订单和活动 review 提到的问题
|
3 years ago |
|
YunaiV
|
c766f7daa5
|
code review：砍价、秒杀的逻辑
|
3 years ago |
|
YunaiV
|
2278ad4652
|
Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
|
3 years ago |
|
YunaiV
|
962f2bbf69
|
code review：提现逻辑
|
3 years ago |
|
芋道源码
|
de7699d972
|
!624 trade: 分销业务 - 佣金提现
Merge pull request !624 from 疯狂的世界/brokerate
|
3 years ago |
|
owen
|
e22c577f7a
|
trade: 分销业务 - 佣金提现后台管理
|
3 years ago |
|
YunaiV
|
8cfb738db3
|
code review：分销逻辑
|
3 years ago |
|
owen
|
32e1fc66ce
|
trade: 分销业务 - 佣金提现后台管理
|
3 years ago |
|
puhui999
|
04a391cd4b
|
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/combination/CombinationActivityApiImpl.java
|
3 years ago |
|
owen
|
a3e161a9a3
|
trade: 分销业务review代码修改
|
3 years ago |
|
owen
|
a3e8b42be6
|
trade: 分销业务review代码修改
|
3 years ago |
|
YunaiV
|
1b9a3f9f63
|
code review：调整操作日志的封装
|
3 years ago |
|
puhui999
|
a10d77cdfe
|
mall+order: 完善部分 TODO 提到的问题
|
3 years ago |
xingyu
|
437131cc7a
|
Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
# yudao-dependencies/pom.xml
|
3 years ago |
|
YunaiV
|
9358639c41
|
code review：订单部分逻辑
|
3 years ago |
|
YunaiV
|
e8bdd8349c
|
code review：订单部分逻辑
|
3 years ago |
|
YunaiV
|
bdd81e4cbc
|
Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
|
3 years ago |
|
YunaiV
|
82c6354e1d
|
code review：分销逻辑
|
3 years ago |
|
puhui999
|
254d7828aa
|
mall+order: 订单活动特殊逻辑的抽离
|
3 years ago |
|
xingyu
|
5e9e41c045
|
fix: required 过期
|
3 years ago |
|
owen
|
77daa0085e
|
trade: 分销业务review代码修改
|
3 years ago |
|
owen
|
cddeb37289
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
|
3 years ago |
|
owen
|
290d1671a2
|
trade: 分销业务后台功能：推广订单列表
|
3 years ago |
|
owen
|
6c193f723f
|
trade: 分销业务后台功能：推广订单列表
|
3 years ago |
|
puhui999
|
3976011af0
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
499a054eb9
|
trade: 分销业务后台功能：推广用户列表
|
3 years ago |
|
puhui999
|
57f0ea04f7
|
mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现）
|
3 years ago |
|
puhui999
|
c023209aa5
|
订单管理：完善订单调价分摊逻辑
|
3 years ago |
|
puhui999
|
50354462fe
|
spu：分佣属性和分佣保持一致
|
3 years ago |
|
puhui999
|
95d8be0455
|
订单管理：完善订单聚合搜索
|
3 years ago |
|
YunaiV
|
4265441e1d
|
分销：增加商品的分佣金额计算 api mock
|
3 years ago |