 TanGH
|
f3087008d4
|
退款功能BUG修复（商户提现后余额不足时进行退款，微信支付返回异常后订单处于退款中的状态，未重置到未退款的状态）
|
2023-07-03 17:41:53 +08:00 |
 Jruome
|
f7da38634b
|
Merge remote-tracking branch 'origin/test'
|
2023-06-27 14:02:43 +08:00 |
tangqian
|
6194189803
|
fix:数据分析
|
2023-06-25 14:35:51 +08:00 |
|
tangqian
|
6b3c96c8f9
|
fix:数据分析
|
2023-06-25 12:02:12 +08:00 |
|
tangqian
|
caaed12df4
|
Merge branch 'feature/mall_product'
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/task/ReplenishmentTask.java
|
2023-06-21 17:03:18 +08:00 |
|
tangqian
|
79841d62ee
|
fix: 订单管理备注和订单查询
|
2023-06-21 17:01:18 +08:00 |
|
tangqian
|
82d5f5408e
|
Merge branch 'feature/mall_product'
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/task/ReplenishmentTask.java
|
2023-06-20 17:57:42 +08:00 |
|
tangqian
|
3b4ad83dd0
|
fix: 订单管理备注和订单查询
|
2023-06-20 17:55:02 +08:00 |
|
tangqian
|
7b919a32e4
|
fix: 订单管理备注和订单查询
|
2023-06-20 17:38:16 +08:00 |
|
tangqian
|
3948729a18
|
fix: 订单管理备注和订单查询
|
2023-06-20 17:27:27 +08:00 |
|
tangqian
|
b24ff62342
|
fix: 订单管理备注和订单查询
|
2023-06-20 16:56:55 +08:00 |
|
tangqian
|
51378e0a22
|
fix: 订单管理备注和订单查询
|
2023-06-20 16:36:28 +08:00 |
|
tangqian
|
ba45dc7202
|
fix: 订单管理备注和订单查询
|
2023-06-20 15:54:51 +08:00 |
|
tangqian
|
b7b9c15b18
|
fix: 订单管理备注和订单查询
|
2023-06-20 15:40:57 +08:00 |
|
tangqian
|
e3d06db343
|
fix: 订单管理备注和订单查询
|
2023-06-20 14:27:36 +08:00 |
|
tangqian
|
932295c664
|
fix: 订单管理备注和订单查询
|
2023-06-20 12:10:42 +08:00 |
|
tangqian
|
fe0e7ae3b9
|
fix: 订单管理备注和订单查询
|
2023-06-20 12:10:12 +08:00 |
|
tangqian
|
4aff4b3d03
|
fix: 定时任务补单
|
2023-06-20 10:04:04 +08:00 |
|
tangqian
|
7e49674bd4
|
fix: 定时任务补单
|
2023-06-20 10:01:56 +08:00 |
|
tangqian
|
0f36f07dc3
|
fix: 订单列表根据商户名称和退款状态查询
|
2023-06-19 18:06:52 +08:00 |
|
tangqian
|
c6240b23b5
|
fix: 订单列表根据商户名称和退款状态查询
|
2023-06-19 18:05:40 +08:00 |
|
tangqian
|
676b7c73a1
|
fix:app推广员只查询付款订单
|
2023-06-18 13:06:07 +08:00 |
|
tangqian
|
9c88d5c6e1
|
fix:推广员导出
|
2023-06-17 16:42:59 +08:00 |
|
tangqian
|
cdf62a17da
|
fix:推广员导出
|
2023-06-16 17:42:47 +08:00 |
|
tangqian
|
6be709216e
|
fix:推广员导出
|
2023-06-16 14:34:30 +08:00 |
|
tangqian
|
cb5b989e20
|
fix:推广员导出
|
2023-06-16 14:12:21 +08:00 |
|
tangqian
|
3a9b7376f2
|
fix:推广员导出
|
2023-06-16 10:37:28 +08:00 |
|
tangqian
|
b7dcf93fb3
|
fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己
|
2023-06-16 09:46:49 +08:00 |
|
tangqian
|
8d6bfcdcdd
|
fix:修改用于测试跳转金额
|
2023-06-15 16:20:04 +08:00 |
|
tangqian
|
68db974170
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-15 09:41:31 +08:00 |
|
tangqian
|
72beac0b3a
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-14 18:17:21 +08:00 |
|
tangqian
|
1389bb9b91
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-14 16:09:08 +08:00 |
|
tangqian
|
8c740295c2
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-13 16:40:23 +08:00 |
|
tangqian
|
9bf1a14ae6
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-13 14:19:16 +08:00 |
|
tangqian
|
5eec2d9820
|
fix: 修改
|
2023-06-09 19:08:08 +08:00 |
|
tangqian
|
24467a92a6
|
fix: 修改
|
2023-06-09 18:24:13 +08:00 |
|
tangqian
|
fe4236d607
|
fix: 修改
|
2023-06-09 15:19:17 +08:00 |
|
tangqian
|
eca405b763
|
fix: 修改
|
2023-06-09 14:55:56 +08:00 |
|
tangqian
|
cf9be203b1
|
fix: 修改
|
2023-06-09 14:32:23 +08:00 |
|
tangqian
|
0d0623276b
|
fix: 修改
|
2023-06-09 13:52:54 +08:00 |
|
tangqian
|
c231870cad
|
fix: 修改
|
2023-06-08 16:43:51 +08:00 |
|
tangqian
|
81f1fb70b9
|
fix: 只查询已付款的订单
|
2023-06-08 11:48:56 +08:00 |
|
tangqian
|
9bef9b0cc3
|
fix: 修改相关提成单位
|
2023-06-02 16:03:47 +08:00 |
|
tangqian
|
e1aaf55a53
|
fix: 修改相关提成单位
|
2023-06-02 15:44:51 +08:00 |
|
tangqian
|
413ded83a9
|
fix: 修改相关提成单位
|
2023-06-02 11:05:09 +08:00 |
|
tangqian
|
6d3211e7b9
|
fix: 修改部门
|
2023-06-02 10:35:18 +08:00 |
|
tangqian
|
54cc1cde59
|
Merge branch 'feature/mall_product'
|
2023-06-02 10:34:52 +08:00 |
|
tangqian
|
e2328d8567
|
fix: 修改部门
|
2023-06-02 10:34:38 +08:00 |
|
tangqian
|
a1321eaca1
|
fix: 修改部门
|
2023-06-01 19:06:27 +08:00 |
|
tangqian
|
cf897c2b9c
|
fix: 修改部门
|
2023-06-01 18:46:06 +08:00 |