owen
|
4f03635fcd
|
签到：签到后增加用户积分、经验
|
2023-10-01 09:53:54 +08:00 |
|
owen
|
a04a3a27a9
|
Review代码修改
|
2023-09-30 23:41:11 +08:00 |
|
puhui999
|
d3f03540f8
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-30 23:35:19 +08:00 |
|
puhui999
|
82210a9583
|
订单：完善拼团活动
|
2023-09-30 23:34:45 +08:00 |
|
owen
|
7d68bdc7c8
|
分销：重构下级分销统计
|
2023-09-30 23:30:06 +08:00 |
|
owen
|
cafa938ff4
|
common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间
|
2023-09-30 22:21:47 +08:00 |
|
owen
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-30 22:09:49 +08:00 |
|
YunaiV
|
3875c80471
|
wallet：钱包支付，接入 user 付款界面
|
2023-09-30 22:08:15 +08:00 |
|
owen
|
d2c5eaf916
|
优惠券：重构是否领取检查方式
|
2023-09-30 22:05:11 +08:00 |
|
owen
|
aaa01de21d
|
分销：修改佣金排名查询算法
|
2023-09-30 19:55:18 +08:00 |
|
owen
|
d0d21b2787
|
优惠券：新增/修改时，校验对应的商品、分类是否存在
|
2023-09-30 19:39:02 +08:00 |
|
YunaiV
|
16cea61435
|
wallet：增加充值套餐
|
2023-09-30 18:54:10 +08:00 |
|
owen
|
42a899c5d3
|
交易：订单增加字段 推广人编号
|
2023-09-30 17:49:38 +08:00 |
|
owen
|
fc432ba073
|
优惠券：新人券使用 MQ 发放
|
2023-09-30 17:29:32 +08:00 |
|
ligiteezhanghao
|
9d71dff2a4
|
操作日志搜索参数名修改
Signed-off-by: ligiteezhanghao <3550906264@qq.com>
|
2023-09-30 09:10:02 +00:00 |
|
owen
|
497ea2eee8
|
会员详情，修改会员积分
|
2023-09-30 15:50:13 +08:00 |
|
kehaiyou
|
d7ae944438
|
feat: 【工作流】--减签逻辑优化
|
2023-09-30 15:35:14 +08:00 |
|
kehaiyou
|
cd678e997a
|
feat: 【工作流】--减签和加签共用处理父任务逻辑
|
2023-09-30 14:56:16 +08:00 |
|
owen
|
be6399238b
|
会员详情，查询钱包信息
|
2023-09-30 12:40:22 +08:00 |
|
芋道源码
|
86e2523069
|
!638 修改springdoc版本，解决Swagger文档都是form提交。
Merge pull request !638 from fangyuan/master
|
2023-09-30 04:35:25 +00:00 |
|
YunaiV
|
3489144757
|
新任务：日志的清理 job
|
2023-09-30 12:31:18 +08:00 |
|
YunaiV
|
367b45e3bd
|
code review：数据统计
|
2023-09-30 12:30:01 +08:00 |
|
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
|
2023-09-30 11:35:51 +08:00 |
|
puhui999
|
0b35d4a7e3
|
订单：完善拼团活动部分 TODO
|
2023-09-30 11:27:24 +08:00 |
|
puhui999
|
5ecd0d94eb
|
订单：添加 order handler 默认抽象实现类，子类可以选择性地实现抽象方法，而不必实现所有方法
|
2023-09-30 11:24:52 +08:00 |
|
芋道源码
|
b376de1ad3
|
!640 交易统计
Merge pull request !640 from 疯狂的世界/feature/mall_product
|
2023-09-30 03:00:12 +00:00 |
|
owen
|
6b7f071988
|
Review代码修改
|
2023-09-29 22:47:04 +08:00 |
|
owen
|
26628913cb
|
错误码分段
|
2023-09-29 21:34:38 +08:00 |
|
owen
|
929ff4286a
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-29 21:08:49 +08:00 |
|
owen
|
171161e6c7
|
统计：交易统计
|
2023-09-29 21:08:15 +08:00 |
|
YunaiV
|
96b1662e4a
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-29 20:52:22 +08:00 |
|
YunaiV
|
9ee0aebd3f
|
promotion：增加 coupon 的 code review
|
2023-09-29 20:52:11 +08:00 |
|
kehaiyou
|
80d532b0f1
|
feat: 【工作流】--减签
|
2023-09-29 15:51:00 +08:00 |
|
kehaiyou
|
7d497ce09b
|
feat: 【工作流】--加签
|
2023-09-29 14:57:28 +08:00 |
|
jason
|
71ec06393a
|
merge 冲突修改
|
2023-09-29 14:56:32 +08:00 |
|
jason
|
57d782bc94
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
|
2023-09-29 14:06:12 +08:00 |
|
jason
|
ce6f7ab1b1
|
Pay: 新增转账示例单
|
2023-09-29 14:01:58 +08:00 |
|
jason
|
aa2f651124
|
Pay: 转账单实现
|
2023-09-29 13:50:06 +08:00 |
|
YunaiV
|
666ba351a2
|
trade：退款理由的维护
|
2023-09-29 13:35:40 +08:00 |
|
YunaiV
|
3c643f814c
|
trade：补全售后日志的记录
|
2023-09-29 11:46:43 +08:00 |
|
YunaiV
|
d402bdb7e0
|
trade：优化售后取消订单的实现代码
|
2023-09-29 10:08:20 +08:00 |
|
wangfy
|
62f821abf2
|
wangfangyuan,fix:修改springdoc版本，解决Swagger文档都是form提交。
|
2023-09-28 23:15:00 +08:00 |
|
YunaiV
|
f9bf41d773
|
code review：分佣剩余部分的 review
|
2023-09-28 22:22:38 +08:00 |
|
YunaiV
|
b1ce971a2f
|
code review：解决分佣的 npe 问题
|
2023-09-28 16:39:07 +08:00 |
|
YunaiV
|
9cd36abf10
|
同步 master 分支代码
|
2023-09-28 15:28:40 +08:00 |
|
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
|
2023-09-28 15:18:59 +08:00 |
|
YunaiV
|
eeb8873b1d
|
trade：微调交易配置的注释
|
2023-09-28 15:10:56 +08:00 |
|
YunaiV
|
9e3564bd6a
|
code review：优惠劵逻辑
|
2023-09-28 09:23:42 +08:00 |
|
芋道源码
|
8811ce0200
|
!637 完善优惠券功能
Merge pull request !637 from 疯狂的世界/feature/mall_product
|
2023-09-28 00:11:43 +00:00 |
|
owen
|
b2c608e7a5
|
交易：发货订单日志
|
2023-09-27 21:27:55 +08:00 |
|