YunaiV
|
d2112458d2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 22:51:28 +08:00 |
|
YunaiV
|
1ff9bc6a71
|
code review：文章管理
|
2023-10-16 22:51:19 +08:00 |
|
jason
|
34210d3534
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 22:43:54 +08:00 |
|
jason
|
7d0bcf5d3b
|
wallet - 管理端钱包余额菜单脚本
|
2023-10-16 22:43:39 +08:00 |
|
owen
|
6f08645f61
|
会员：增加字段【注册终端】
|
2023-10-16 14:22:43 +08:00 |
|
owen
|
df70402484
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 09:55:17 +08:00 |
|
owen
|
f5dac38ca5
|
商城：增加商城首页
|
2023-10-16 09:51:20 +08:00 |
|
jason
|
3db7b30e66
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 08:46:44 +08:00 |
|
jason
|
fcbbbc737d
|
wallet - 管理端, 充值套餐脚本
|
2023-10-16 08:46:27 +08:00 |
|
YunaiV
|
ca5e3f7bd1
|
优化最新的商城的 sql
|
2023-10-14 22:00:30 +08:00 |
|
jason
|
2e207019b3
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-12 22:21:17 +08:00 |
|
jason
|
571961b4da
|
充值套餐修改
|
2023-10-12 22:20:42 +08:00 |
|
owen
|
df16278a03
|
统计：会员统计
|
2023-10-09 23:27:10 +08:00 |
|
YunaiV
|
6a04d6c458
|
promotion：新增助力记录列表
|
2023-10-05 12:43:14 +08:00 |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2023-10-01 23:31:07 +08:00 |
|
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
|
2023-10-01 22:00:31 +08:00 |
|
YunaiV
|
b74169acfc
|
trade：优化订单列表的查询
|
2023-10-01 21:59:51 +08:00 |
|
owen
|
2168145c3e
|
会员：会员配置的积分相关字段加上point前缀
|
2023-10-01 10:41:21 +08:00 |
|
owen
|
ab35fcbe9b
|
会员：积分配置改为会员配置
|
2023-10-01 10:25:18 +08:00 |
|
owen
|
4f03635fcd
|
签到：签到后增加用户积分、经验
|
2023-10-01 09:53:54 +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
|
16cea61435
|
wallet：增加充值套餐
|
2023-09-30 18:54:10 +08:00 |
|
owen
|
42a899c5d3
|
交易：订单增加字段 推广人编号
|
2023-09-30 17:49:38 +08:00 |
|
owen
|
497ea2eee8
|
会员详情，修改会员积分
|
2023-09-30 15:50:13 +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 |
|
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 |
|
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 |
|
owen
|
0a3a6825d5
|
优惠券：完善APP优惠券查询接口
|
2023-09-26 20:44:22 +08:00 |
|
YunaiV
|
9b7c757942
|
1.8.2 版本发布
|
2023-09-24 23:24:24 +08:00 |
|
owen
|
0b84c18736
|
分销：修正分享海报
|
2023-09-24 23:18:51 +08:00 |
|
owen
|
967e578d54
|
分销：重命名提现类型字段
|
2023-09-24 22:32:13 +08:00 |
|
dhb52
|
2a9aa357cb
|
fix: 对具有软删除的表去除UNIQUE INDEX
|
2023-09-24 08:29:56 +08:00 |
|
owen
|
052328c5fa
|
积分：完善积分获得、退还、使用 相关逻辑
|
2023-09-23 14:11:16 +08:00 |
|
owen
|
dc46dff62c
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2023-09-22 23:15:31 +08:00 |
|
owen
|
bbd18afbcc
|
分佣: 简化推广用户关系树查询方式
|
2023-09-22 23:13:39 +08:00 |
|
owen
|
6e6486ccae
|
Trade: 完善配置
|
2023-09-22 22:51:46 +08:00 |
|
jason
|
910ffa7a5a
|
钱包充值退款
|
2023-09-22 19:04:59 +08:00 |
|
owen
|
a7de955926
|
trade: 分销业务 - 提现申请
|
2023-09-22 00:27:45 +08:00 |
|
jason
|
c880dbfa60
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-21 17:32:43 +08:00 |
|
jason
|
dbd7ab5f23
|
code review 修改
|
2023-09-21 17:31:58 +08:00 |
|
owen
|
32e1fc66ce
|
trade: 分销业务 - 佣金提现后台管理
|
2023-09-19 22:03:28 +08:00 |
|
owen
|
a3e8b42be6
|
trade: 分销业务review代码修改
|
2023-09-19 16:37:51 +08:00 |
|
jason
|
0e1b8126dd
|
新增钱包充值。启动报错修复
|
2023-09-14 16:55:31 +08:00 |
|
jason
|
bcb3b19418
|
钱包充值 表结构设计
|
2023-09-13 17:28:42 +08:00 |
|
YunaiV
|
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 |
|
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
|
6c193f723f
|
trade: 分销业务后台功能：推广订单列表
|
2023-09-10 23:30:43 +08:00 |
|