|
|
052328c5fa
|
积分：完善积分获得、退还、使用 相关逻辑
|
2023-09-23 14:11:16 +08:00 |
|
|
|
71d6311bd4
|
code review：拼团、秒杀等逻辑
|
2023-09-23 09:27:29 +08:00 |
|
|
|
54fe0174bc
|
!625 完善订单和活动 review 提到的问题，完善 app 端获取拼团活动分页、列表、详情接口
Merge pull request !625 from puhui999/feature/mall_product
|
2023-09-23 01:03:00 +00:00 |
|
|
|
9451342aae
|
trade：营销商品（拼团、砍价）不能使用优惠劵
|
2023-09-22 23:54:18 +08:00 |
|
|
|
dc46dff62c
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2023-09-22 23:15:31 +08:00 |
|
|
|
bbd18afbcc
|
分佣: 简化推广用户关系树查询方式
|
2023-09-22 23:13:39 +08:00 |
|
|
|
6e6486ccae
|
Trade: 完善配置
|
2023-09-22 22:51:46 +08:00 |
|
|
|
ad0513c87c
|
分佣: 推广人列表
|
2023-09-22 22:12:15 +08:00 |
|
|
|
7c4fbc63dc
|
trade：物流费用计算，增加金额 divide 分拆逻辑
|
2023-09-22 21:56:09 +08:00 |
|
|
|
ee15b802b2
|
分佣: 推广人排行
|
2023-09-22 21:12:09 +08:00 |
|
|
|
972b01c001
|
分佣: 佣金排行
|
2023-09-22 20:55:05 +08:00 |
|
|
|
7a8a440eb6
|
分佣: 佣金记录
|
2023-09-22 18:49:26 +08:00 |
|
|
|
eddc897cd8
|
分佣: 提现记录
|
2023-09-22 18:48:16 +08:00 |
|
|
|
637ae8ce1d
|
分佣: 提现记录
|
2023-09-22 18:35:43 +08:00 |
|
|
|
c146c98b72
|
分佣: 提现
|
2023-09-22 18:06:11 +08:00 |
|
|
|
f72a087007
|
分佣: 我的推广统计接口
|
2023-09-22 15:42:59 +08:00 |
|
|
|
a7de955926
|
trade: 分销业务 - 提现申请
|
2023-09-22 00:27:45 +08:00 |
|
|
|
5ed99a9105
|
trade: 分销业务 - 整理包名
|
2023-09-22 00:26:32 +08:00 |
|
|
|
5949727c8d
|
trade：全局配送价格配置
|
2023-09-21 22:02:22 +08:00 |
|
|
|
8060aeb5e7
|
秒杀: app 端返回增加秒杀活动状态
|
2023-09-21 09:07:37 +08:00 |
|
|
|
35569c5ec8
|
trade：下单时，如果是门店自提，增加核销码的生成
|
2023-09-20 23:21:00 +08:00 |
|
|
|
1b477aaa0d
|
trade：优化下单逻辑的实现
|
2023-09-20 20:21:41 +08:00 |
|
|
|
583a0a2dd5
|
砍价+拼团: 修复 selectList limit 条件执行报错问题
|
2023-09-20 16:28:41 +08:00 |
|
|
|
6ef94ade6a
|
完善订单和活动 review 提到的问题
|
2023-09-20 16:06:29 +08:00 |
|
|
|
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
|
2023-09-20 10:14:43 +08:00 |
|
|
|
1d2a6ad065
|
拼团活动: 完善 app 端获取活动分页、列表、详情接口
|
2023-09-20 10:09:15 +08:00 |
|
|
|
c766f7daa5
|
code review：砍价、秒杀的逻辑
|
2023-09-20 01:07:41 +08:00 |
|
|
|
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
|
2023-09-20 00:03:18 +08:00 |
|
|
|
962f2bbf69
|
code review：提现逻辑
|
2023-09-19 23:58:16 +08:00 |
|
|
|
de7699d972
|
!624 trade: 分销业务 - 佣金提现
Merge pull request !624 from 疯狂的世界/brokerate
|
2023-09-19 14:25:43 +00:00 |
|
|
|
e22c577f7a
|
trade: 分销业务 - 佣金提现后台管理
|
2023-09-19 22:20:32 +08:00 |
|
|
|
8cfb738db3
|
code review：分销逻辑
|
2023-09-19 22:16:25 +08:00 |
|
|
|
32e1fc66ce
|
trade: 分销业务 - 佣金提现后台管理
|
2023-09-19 22:03:28 +08:00 |
|
|
|
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
|
2023-09-19 18:58:53 +08:00 |
|
|
|
408df683d8
|
秒杀活动: 完善 app 端获取活动分页、列表、详情接口
|
2023-09-19 18:57:28 +08:00 |
|
|
|
a3e161a9a3
|
trade: 分销业务review代码修改
|
2023-09-19 16:50:43 +08:00 |
|
|
|
a3e8b42be6
|
trade: 分销业务review代码修改
|
2023-09-19 16:37:51 +08:00 |
|
|
|
af6016bba5
|
砍价活动: 完善 app 端获取活动分页、列表、详情接口
|
2023-09-19 16:35:21 +08:00 |
|
|
|
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
|
2023-09-14 16:59:05 +08:00 |
|
|
|
0e1b8126dd
|
新增钱包充值。启动报错修复
|
2023-09-14 16:55:31 +08:00 |
|
|
|
1b9a3f9f63
|
code review：调整操作日志的封装
|
2023-09-13 23:25:52 +08:00 |
|
|
|
a10d77cdfe
|
mall+order: 完善部分 TODO 提到的问题
|
2023-09-13 12:04:13 +08:00 |
|
|
|
437131cc7a
|
Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
# yudao-dependencies/pom.xml
|
2023-09-13 12:00:10 +08:00 |
|
|
|
9358639c41
|
code review：订单部分逻辑
|
2023-09-12 23:01:12 +08:00 |
|
|
|
e8bdd8349c
|
code review：订单部分逻辑
|
2023-09-12 13:54:52 +08:00 |
|
|
|
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
|
2023-09-12 12:22:55 +08:00 |
|
|
|
82c6354e1d
|
code review：分销逻辑
|
2023-09-12 09:20:42 +08:00 |
|
|
|
254d7828aa
|
mall+order: 订单活动特殊逻辑的抽离
|
2023-09-11 17:48:01 +08:00 |
|
|
|
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
|
2023-09-11 16:19:55 +08:00 |
|
|
|
5e9e41c045
|
fix: required 过期
|
2023-09-11 12:30:33 +08:00 |
|
