owen
|
a3e161a9a3
|
trade: 分销业务review代码修改
|
2023-09-19 16:50:43 +08:00 |
|
owen
|
a3e8b42be6
|
trade: 分销业务review代码修改
|
2023-09-19 16:37:51 +08:00 |
|
owen
|
75874035a4
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2023-09-19 15:31:14 +08:00 |
|
YunaiV
|
be1ecf96d4
|
code review：会员签到逻辑
|
2023-09-18 22:18:42 +08:00 |
|
YunaiV
|
477342d324
|
Merge branch 'feature/mall_product' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/mall_product
|
2023-09-18 13:49:07 +08:00 |
|
YunaiV
|
080c32b9f3
|
code review：钱包充值
|
2023-09-18 13:07:54 +08:00 |
|
owen
|
a52e490c86
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2023-09-16 08:41:06 +08:00 |
|
xiaqing
|
d4a891e6c4
|
新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
|
2023-09-15 23:21:11 +08:00 |
|
xiaqing
|
0907ca2081
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-15 22:09:13 +08:00 |
|
jason
|
bbc16bb937
|
钱包充值 Mapper 类
|
2023-09-15 16:14:04 +08:00 |
|
owen
|
73e4976ae4
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2023-09-15 16:11:01 +08:00 |
|
xiaqing
|
e893cfd757
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
|
2023-09-15 15:27:59 +08:00 |
|
xiaqing
|
9d262e8e7f
|
新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
|
2023-09-15 15:20:39 +08:00 |
|
owen
|
2c821d2bbf
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2023-09-15 14:13:48 +08:00 |
|
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
|
2023-09-14 16:59:05 +08:00 |
|
jason
|
0e1b8126dd
|
新增钱包充值。启动报错修复
|
2023-09-14 16:55:31 +08:00 |
|
YunaiV
|
cfaffd3c88
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-13 23:26:38 +08:00 |
|
YunaiV
|
1b9a3f9f63
|
code review：调整操作日志的封装
|
2023-09-13 23:25:52 +08:00 |
|
jason
|
bcb3b19418
|
钱包充值 表结构设计
|
2023-09-13 17:28:42 +08:00 |
|
YunaiV
|
9358639c41
|
code review：订单部分逻辑
|
2023-09-12 23:01:12 +08:00 |
|
YunaiV
|
e8bdd8349c
|
code review：订单部分逻辑
|
2023-09-12 13:54:52 +08:00 |
|
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
|
2023-09-12 12:22:55 +08:00 |
|
YunaiV
|
82c6354e1d
|
code review：分销逻辑
|
2023-09-12 09:20:42 +08:00 |
|
芋道源码
|
18c9f22560
|
!616 完善分销功能
Merge pull request !616 from 疯狂的世界/brokerate
|
2023-09-11 14:20:02 +00:00 |
|
owen
|
c67ecbf61d
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2023-09-11 20:04:23 +08:00 |
|
puhui999
|
950ec10cff
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-11 17:51:17 +08:00 |
|
puhui999
|
254d7828aa
|
mall+order: 订单活动特殊逻辑的抽离
|
2023-09-11 17:48:01 +08:00 |
|
YunaiV
|
314dee430e
|
bugfix：微信公众号登录报 access token 的问题
|
2023-09-11 11:06:42 +08:00 |
|
owen
|
77daa0085e
|
trade: 分销业务review代码修改
|
2023-09-11 00:54:12 +08:00 |
|
puhui999
|
7fb455096c
|
商城活动: 完善活动商品并发库存扣减逻辑
|
2023-09-11 00:13:45 +08:00 |
|
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
|
2023-09-10 23:56:00 +08:00 |
|
owen
|
4eedf6ad36
|
Merge remote-tracking branch 'owen/brokerate' into brokerate
|
2023-09-10 23:36:46 +08:00 |
|
owen
|
290d1671a2
|
trade: 分销业务后台功能：推广订单列表
|
2023-09-10 23:36:38 +08:00 |
|
owen
|
0c9485a6bf
|
infra: 修正 查询实体列表方法，传入的ID集合为空时，会导致异常的问题
|
2023-09-10 23:36:23 +08:00 |
|
owen
|
dffdd471d5
|
member: 修正 查询用户列表方法，传入的ID集合为空时，会导致异常的问题
|
2023-09-10 23:32:40 +08:00 |
|
owen
|
6c193f723f
|
trade: 分销业务后台功能：推广订单列表
|
2023-09-10 23:30:43 +08:00 |
|
puhui999
|
3976011af0
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-10 22:54:01 +08:00 |
|
owen
|
499a054eb9
|
trade: 分销业务后台功能：推广用户列表
|
2023-09-10 22:32:39 +08:00 |
|
YunaiV
|
40e1a879e3
|
登录：社交登录时，额外返回 openid
|
2023-09-10 18:01:53 +08:00 |
|
puhui999
|
57f0ea04f7
|
mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现）
|
2023-09-10 11:06:39 +08:00 |
|
puhui999
|
c023209aa5
|
订单管理：完善订单调价分摊逻辑
|
2023-09-10 00:50:13 +08:00 |
|
puhui999
|
51dab96889
|
支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突
|
2023-09-10 00:48:30 +08:00 |
|
puhui999
|
50354462fe
|
spu：分佣属性和分佣保持一致
|
2023-09-09 23:18:09 +08:00 |
|
puhui999
|
95d8be0455
|
订单管理：完善订单聚合搜索
|
2023-09-09 23:04:13 +08:00 |
|
YunaiV
|
4265441e1d
|
分销：增加商品的分佣金额计算 api mock
|
2023-09-09 22:28:01 +08:00 |
|
YunaiV
|
a47d744f64
|
分销：绑定分销的 url 调整
|
2023-09-09 21:05:44 +08:00 |
|
owen
|
797680895b
|
trade: 分销业务后台功能：佣金格式化
|
2023-09-09 20:00:57 +08:00 |
|
YunaiV
|
cd51d57f12
|
分销：调整 app 的 price 到 brokeragePrice
|
2023-09-09 19:42:53 +08:00 |
|
YunaiV
|
426594ae00
|
分销：调整 app 的 price 到 brokeragePrice
|
2023-09-09 19:34:50 +08:00 |
|
owen
|
643602d038
|
trade: 分销业务后台功能：修改上级推广人
|
2023-09-09 19:20:12 +08:00 |
|