 lwl0608
|
bb529375d8
|
merge
|
2024-12-09 16:44:34 +08:00 |
|
lwl0608
|
293dd70d67
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
|
2024-12-09 16:44:14 +08:00 |
|
lwl0608
|
3a873c13a3
|
add
|
2024-12-09 16:44:08 +08:00 |
|
lwl0608
|
b6085d518a
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
|
2024-12-09 16:32:44 +08:00 |
|
lwl0608
|
724249bf6a
|
cancel ws
|
2024-12-09 16:32:37 +08:00 |
|
lwl0608
|
e59615c963
|
merge
|
2024-12-09 16:28:10 +08:00 |
 chenhao
|
67c3dfc8af
|
Merge pull request 'by Robin at 20241209' (#875) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/875
|
2024-12-09 16:26:11 +08:00 |
Robin
|
16b2d31fb5
|
by Robin at 20241209
|
2024-12-09 16:24:52 +08:00 |
|
lwl0608
|
87e344c636
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
# Conflicts:
# app/mix/dao/mongo.go
# app/mix/dao/mongo_vas.go
# dbstruct/vas_mongo.go
|
2024-12-09 16:20:13 +08:00 |
 wangxinyu
|
d973389e98
|
feat: 主播微信号不能设置[wxid]开头的初始微信
|
2024-12-09 16:18:43 +08:00 |
|
lwl0608
|
00c4baba5f
|
/withraw_sync_alipay
|
2024-12-09 16:08:19 +08:00 |
|
wangxinyu
|
aeb26c06b7
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-09 15:12:01 +08:00 |
|
wangxinyu
|
e365c3b1af
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-09 15:08:14 +08:00 |
|
wangxinyu
|
7ef275a85e
|
fix: 分页
|
2024-12-09 15:01:37 +08:00 |
|
chenhao
|
2f71646c6d
|
Merge pull request 'by Robin at 20241209' (#874) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/874
|
2024-12-09 14:53:27 +08:00 |
|
Robin
|
10abcad30f
|
by Robin at 20241209
|
2024-12-09 14:52:49 +08:00 |
|
chenhao
|
43934d201b
|
Merge pull request 'conf-250' (#873) from conf-250 into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/873
|
2024-12-09 14:49:25 +08:00 |
|
Robin
|
3ebc0b6204
|
Merge branch 'feat-IRONFANS-250-Robin' into conf-250
|
2024-12-09 14:48:40 +08:00 |
|
wangxinyu
|
86e6bb4281
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-09 13:46:32 +08:00 |
|
wangxinyu
|
468b1cbea9
|
fix: 退款参数校验，非本人id 操作
|
2024-12-09 12:21:42 +08:00 |
|
wangxinyu
|
1d76ad43c4
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-09 11:41:34 +08:00 |
|
wangxinyu
|
10af8eab2d
|
fix: list 改成空数组，offset修改
|
2024-12-09 11:40:55 +08:00 |
|
wangxinyu
|
7f86bc7d9f
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-09 10:47:27 +08:00 |
|
wangxinyu
|
7a2969236f
|
fix: consts
|
2024-12-09 10:46:42 +08:00 |
|
wangxinyu
|
4e4b603a43
|
fix: 参数校验和日志
|
2024-12-09 10:44:20 +08:00 |
|
wangxinyu
|
87c0ffc9bd
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
# Conflicts:
# app/mix/controller/zone_vas_api.go
|
2024-12-06 18:17:49 +08:00 |
|
wangxinyu
|
6dc5cbd36a
|
Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into feature-refund_v2-wxy-20241204
|
2024-12-06 18:15:42 +08:00 |
|
wangxinyu
|
2a9379677b
|
fix: 参数校验
|
2024-12-06 18:15:28 +08:00 |
|
Robin
|
289b4616ad
|
by Robin at 20241206
|
2024-12-06 17:41:45 +08:00 |
|
wangxinyu
|
4b2a4d92c6
|
fix: b_mid 和 mid 逻辑
|
2024-12-06 16:48:47 +08:00 |
|
wangxinyu
|
944595752c
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-06 16:35:15 +08:00 |
|
wangxinyu
|
bb26a6676b
|
fix: xxl-job ctx不能删除
|
2024-12-06 16:34:40 +08:00 |
|
wangxinyu
|
f65a4464e1
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-06 16:28:08 +08:00 |
|
wangxinyu
|
d90d746c6b
|
fix: mid
|
2024-12-06 16:26:51 +08:00 |
|
Robin
|
30f874af1f
|
by Robin at 20241206
|
2024-12-06 15:07:23 +08:00 |
|
Robin
|
d73c4d5034
|
by Robin at 20241206
|
2024-12-06 13:16:00 +08:00 |
|
wangxinyu
|
19130f931d
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-06 12:34:54 +08:00 |
|
wangxinyu
|
c56de2019c
|
fix: refund_list 入参 Zid 改为 BMid
|
2024-12-06 12:34:30 +08:00 |
|
wangxinyu
|
174e5045af
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-06 10:58:30 +08:00 |
|
wangxinyu
|
5ee947622a
|
feat:xxl-job 扫描主播审批超时的退款单
|
2024-12-06 10:58:02 +08:00 |
|
wangxinyu
|
6264ce5b17
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-05 16:24:00 +08:00 |
|
wangxinyu
|
e24b88cb3a
|
fix: int64
|
2024-12-05 16:23:29 +08:00 |
|
Robin
|
23cfc8a897
|
by Robin at 20241205
|
2024-12-05 15:58:08 +08:00 |
|
wangxinyu
|
7cd2ac2d83
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-05 15:54:58 +08:00 |
|
wangxinyu
|
b9bbb70b96
|
fix: 接口参数
feat: 审核校验
|
2024-12-05 15:54:24 +08:00 |
|
wangxinyu
|
fc0d077050
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-05 15:06:02 +08:00 |
|
wangxinyu
|
d0d17a6570
|
fix: 接口 debug 错误修改 1
|
2024-12-05 15:05:06 +08:00 |
|
wangxinyu
|
f5d8e04dca
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-05 14:45:51 +08:00 |
|
wangxinyu
|
1e974bc7e5
|
fix: 接口 debug 错误修改 1
|
2024-12-05 14:44:39 +08:00 |
|
wangxinyu
|
7c396bccee
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-05 14:16:08 +08:00 |