owen
|
ca55e61dd2
|
trade: 分销业务后台功能：清除推广员、修改推广资格
|
2023-09-09 14:38:47 +08:00 |
|
owen
|
4e9be7a181
|
trade: 分销业务后台功能：修改推广资格
|
2023-09-09 01:58:46 +08:00 |
|
owen
|
259734964d
|
trade: 分销业务后台功能：清除推广员、修改推广员
|
2023-09-09 01:54:48 +08:00 |
|
owen
|
f97c7a0f6e
|
trade: 分销业务绑定推广员
|
2023-09-09 01:46:42 +08:00 |
|
owen
|
6ef36d5ca6
|
trade: 增加分销 API
|
2023-09-08 23:33:02 +08:00 |
|
owen
|
1ead368595
|
trade: 优化分销用户佣金字段名称
|
2023-09-08 23:10:04 +08:00 |
|
owen
|
4b43304c76
|
trade: 优化分销用户绑定用户编号、绑定时间字段名称
|
2023-09-08 22:51:05 +08:00 |
|
owen
|
f36a6c5d6c
|
trade: 优化修改推广员接口字段名称
|
2023-09-08 22:40:49 +08:00 |
|
owen
|
b85d660a5c
|
trade: 分销业务完善校验
|
2023-09-08 22:33:44 +08:00 |
|
owen
|
0a0c3c0ede
|
trade: 分销业务相关类型移除Trade前缀
|
2023-09-08 12:56:34 +08:00 |
|
owen
|
ddcebb1986
|
common: MoneyUtils 移到 common 模块
|
2023-09-08 12:46:43 +08:00 |
|
owen
|
1cc2dfc963
|
trade: 分销Review代码修改
|
2023-09-08 12:29:38 +08:00 |
|
owen
|
166b1b31c0
|
trade: 分销用户管理
|
2023-09-08 11:03:57 +08:00 |
|
YunaiV
|
5808f77ade
|
code review：订单分佣
|
2023-09-08 00:29:25 +08:00 |
|
YunaiV
|
eb342d5abf
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
|
2023-09-06 23:50:55 +08:00 |
|
YunaiV
|
62a4e8242b
|
分销：增加提现接口
|
2023-09-06 23:50:23 +08:00 |
|
芋道源码
|
ea26691967
|
!607 member: 佣金解冻
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
|
2023-09-06 15:49:39 +00:00 |
|
owen
|
fa53a3b15e
|
trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord
|
2023-09-06 00:35:40 +08:00 |
|
owen
|
9336a0a102
|
trade: 分销业务从 member 模块 转移到 trade模块
|
2023-09-06 00:16:47 +08:00 |
|
YunaiV
|
e4b153a866
|
分佣：增加获得分销排行分页 API mock
|
2023-09-05 23:49:35 +08:00 |
|
owen
|
a68691f2d9
|
trade: 增加分销用户表
|
2023-09-05 23:45:53 +08:00 |
|
owen
|
6474502738
|
trade: 增加交易中心配置表
|
2023-09-05 22:31:36 +08:00 |
|
YunaiV
|
0329f13fbf
|
分佣：增加获得分销排行分页 API mock
|
2023-09-05 21:32:34 +08:00 |
|
owen
|
9eb7837b67
|
member: 佣金失效
|
2023-09-05 19:43:07 +08:00 |
|
owen
|
c7ef8519c8
|
member: 分销增加佣金
|
2023-09-05 08:56:39 +08:00 |
|
YunaiV
|
b69d4e0852
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-09-03 17:59:50 +08:00 |
|
owen
|
71efa0ed6f
|
promotion: 订单使用品类券时，根据品类过滤可用商品
|
2023-09-02 10:05:56 +08:00 |
|
owen
|
8bbaaf1ce9
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
2023-09-02 09:53:37 +08:00 |
|
YunaiV
|
c25bf38f50
|
code review：交易订单的取消
|
2023-09-02 00:52:31 +08:00 |
|
YunaiV
|
9c0d0c809a
|
Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2023-09-02 00:45:26 +08:00 |
|
owen
|
3fbce643ee
|
mall: 发送优惠券功能优化
|
2023-09-01 23:45:50 +08:00 |
|
owen
|
b3fcefa677
|
trade: 会员取消订单
|
2023-09-01 20:37:20 +08:00 |
|
YunaiV
|
28adfff10e
|
code review：订单逻辑
|
2023-09-01 20:00:04 +08:00 |
|
芋道源码
|
8dd600a300
|
!600 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口
Merge pull request !600 from puhui999/feature/mall_product
|
2023-09-01 11:49:23 +00:00 |
|
zhijiantianya@gmail.com
|
dd6adb8ee6
|
code review order
|
2023-09-01 19:08:27 +08:00 |
|
puhui999
|
1f9968d784
|
订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口
|
2023-09-01 12:12:15 +08:00 |
|
YunaiV
|
d982a95fdd
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-31 20:38:59 +08:00 |
|
YunaiV
|
60d4aa97fb
|
code review：售后详情接口
|
2023-08-30 20:18:40 +08:00 |
|
YunaiV
|
059202a588
|
购物车：调整购物车接口
|
2023-08-30 19:14:28 +08:00 |
|
chenchen
|
73f1636daa
|
售后日志添加售前售后状态
|
2023-08-30 10:58:37 +08:00 |
|
YunaiV
|
3e4b1c0552
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-08-30 08:43:13 +08:00 |
|
YunaiV
|
5a788af084
|
购物车：简化 cart 表命名
|
2023-08-30 08:43:07 +08:00 |
|
puhui999
|
d5fe7708ce
|
订单售后退款：添加获取售后订单详情接口
|
2023-08-29 09:54:14 +08:00 |
|
puhui999
|
0411b3464a
|
订单售后退款：添加获取售后订单详情接口
|
2023-08-28 17:21:29 +08:00 |
|
puhui999
|
498edfffb1
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-08-28 09:24:04 +08:00 |
|
puhui999
|
655eefc340
|
订单管理：完善订单管理提到的一些问题
|
2023-08-28 09:23:30 +08:00 |
|
YunaiV
|
8b98d13d8b
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-27 21:05:42 +08:00 |
|
YunaiV
|
02bc9d28de
|
解决 MapStruct 的时区问题
|
2023-08-27 11:19:48 +08:00 |
|
owen
|
02abe86253
|
member:
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
|
2023-08-26 13:52:20 +08:00 |
|
YunaiV
|
b75d777670
|
code review：订单评论、订单积分的变更
|
2023-08-26 10:54:45 +08:00 |
|