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 |
|
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 |
|
YunaiV
|
7c4fbc63dc
|
trade：物流费用计算，增加金额 divide 分拆逻辑
|
3 years ago |
|
YunaiV
|
5949727c8d
|
trade：全局配送价格配置
|
3 years ago |
puhui999
|
8060aeb5e7
|
秒杀: app 端返回增加秒杀活动状态
|
3 years ago |
|
YunaiV
|
35569c5ec8
|
trade：下单时，如果是门店自提，增加核销码的生成
|
3 years ago |
|
YunaiV
|
1b477aaa0d
|
trade：优化下单逻辑的实现
|
3 years ago |
|
puhui999
|
583a0a2dd5
|
砍价+拼团: 修复 selectList limit 条件执行报错问题
|
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 |
|
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 |
|
puhui999
|
408df683d8
|
秒杀活动: 完善 app 端获取活动分页、列表、详情接口
|
3 years ago |
|
owen
|
a3e161a9a3
|
trade: 分销业务review代码修改
|
3 years ago |
|
owen
|
a3e8b42be6
|
trade: 分销业务review代码修改
|
3 years ago |
|
puhui999
|
af6016bba5
|
砍价活动: 完善 app 端获取活动分页、列表、详情接口
|
3 years ago |
jason
|
ebd4ea548c
|
Merge remote-tracking branch 'origin/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/CombinationApiImpl.java
|
3 years ago |
|
jason
|
0e1b8126dd
|
新增钱包充值。启动报错修复
|
3 years ago |
|
YunaiV
|
1b9a3f9f63
|
code review：调整操作日志的封装
|
3 years ago |
|
puhui999
|
a10d77cdfe
|
mall+order: 完善部分 TODO 提到的问题
|
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 |
|
owen
|
77daa0085e
|
trade: 分销业务review代码修改
|
3 years ago |
|
puhui999
|
7fb455096c
|
商城活动: 完善活动商品并发库存扣减逻辑
|
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
|
51dab96889
|
支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突
|
3 years ago |
|
puhui999
|
50354462fe
|
spu：分佣属性和分佣保持一致
|
3 years ago |