zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,885 Commits
3 Branches
0 Tags
162 MiB
Commit Graph

4885 Commits (master)

Author SHA1 Message Date
TanGH 81e3a97a42 Merge pull request 'test合并到master 20230703' (#20) from test into master 
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/20
 2023-07-03 17:54:52 +08:00
TanGH acc88820e5 Merge pull request '退款功能BUG修复（商户提现后余额不足时进行退款，微信支付返回异常后订单处于退款中的状态，未重置到未退款的状态）' (#19) from bugfix/tgh20230703 into test 
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/19
 2023-07-03 17:45:39 +08:00
TanGH f3087008d4 退款功能BUG修复（商户提现后余额不足时进行退款，微信支付返回异常后订单处于退款中的状态，未重置到未退款的状态） 2023-07-03 17:41:53 +08:00
TanGH 3cb06b2b74 Merge pull request 'H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》，增加前端提示（暂不修改其他逻辑）' (#18) from bugfix/tgh20230630 into test 
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/18
 2023-06-30 17:33:45 +08:00
TanGH cb28d6ba4e H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》，增加前端提示（暂不修改其他逻辑） 2023-06-30 17:32:58 +08:00
TanGH 047741d04c Merge pull request 'H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》' (#17) from bugfix/tgh20230630 into test 
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/17
 2023-06-30 10:52:32 +08:00
TanGH c0b5a4233a H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》 2023-06-30 10:46:42 +08:00
Jruome 1c0376f60c 管理端 批量更改发货状态进行二次确认提示 2023-06-27 14:03:19 +08:00
Jruome f7da38634b Merge remote-tracking branch 'origin/test' 2023-06-27 14:02:43 +08:00
tangqian 877e40d7a0 Merge branch 'feature/mall_product' into test 2023-06-25 14:37:32 +08:00
tangqian 6194189803 fix:数据分析 2023-06-25 14:35:51 +08:00
tangqian 6b3c96c8f9 fix:数据分析 2023-06-25 12:02:12 +08:00
Jruome 8a93752fbc 管理端 退款提示语修改 2023-06-21 17:36:10 +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
Jruome 2ac2faf592 Merge remote-tracking branch 'origin/master' 2023-06-21 10:28:01 +08:00
Jruome 6fa7a0103f 管理端 退款订单管理 2023-06-20 18:03:44 +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 bd806cc2ba Merge branch 'feature/mall_product' into test 2023-06-20 17:38:28 +08:00
tangqian 7b919a32e4 fix: 订单管理备注和订单查询 2023-06-20 17:38:16 +08:00
tangqian 5846de1445 Merge branch 'feature/mall_product' into test 2023-06-20 17:27:36 +08:00
tangqian 3948729a18 fix: 订单管理备注和订单查询 2023-06-20 17:27:27 +08:00
tangqian 18bc18be76 Merge branch 'feature/mall_product' into test 2023-06-20 16:57:19 +08:00
tangqian b24ff62342 fix: 订单管理备注和订单查询 2023-06-20 16:56:55 +08:00
tangqian 6849a68446 Merge branch 'feature/mall_product' into test 2023-06-20 16:36:54 +08:00
tangqian 51378e0a22 fix: 订单管理备注和订单查询 2023-06-20 16:36:28 +08:00
Jruome acb1e72a57 管理端 退款订单管理 2023-06-20 15:58:35 +08:00
tangqian bccc325bda Merge branch 'feature/mall_product' into test 2023-06-20 15:55:02 +08:00
tangqian ba45dc7202 fix: 订单管理备注和订单查询 2023-06-20 15:54:51 +08:00
tangqian 9e1a653dbe Merge branch 'feature/mall_product' into test 2023-06-20 15:41:32 +08:00
tangqian b7b9c15b18 fix: 订单管理备注和订单查询 2023-06-20 15:40:57 +08:00
tangqian 714650a275 Merge branch 'feature/mall_product' into test 2023-06-20 14:27:51 +08:00
tangqian e3d06db343 fix: 订单管理备注和订单查询 2023-06-20 14:27:36 +08:00
tangqian 9bb2ba3740 Merge branch 'feature/mall_product' into test 2023-06-20 12:11:09 +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 c5c73744f0 Merge branch 'feature/mall_product' into test 2023-06-20 10:05:53 +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 022b9d2c8f Merge branch 'feature/mall_product' 2023-06-19 18:07:20 +08:00
tangqian 8afd5700ab Merge branch 'feature/mall_product' into test 2023-06-19 18:07:08 +08:00
tangqian 0f36f07dc3 fix: 订单列表根据商户名称和退款状态查询 2023-06-19 18:06:52 +08:00
tangqian c6240b23b5 fix: 订单列表根据商户名称和退款状态查询 2023-06-19 18:05:40 +08:00
Jruome 5ae6e3481c Merge remote-tracking branch 'origin/master' 2023-06-19 17:28:58 +08:00
Jruome 8b78cc917e Merge remote-tracking branch 'origin/test' 2023-06-19 14:37:17 +08:00
Jruome 9d0790a24f 管理端 新增需求 2023-06-19 14:37:00 +08:00
tangqian 322d5aae1a Merge branch 'master' into feature/mall_product 2023-06-18 13:14:30 +08:00
tangqian 676b7c73a1 fix:app推广员只查询付款订单 2023-06-18 13:06:07 +08:00
tangqian 41c099eaf6 Merge branch 'feature/mall_product' into test 2023-06-17 16:43:26 +08:00