Commit Graph

456 Commits

Author SHA1 Message Date
墨大叔
7f49032338 店铺申请debug 2024-08-05 16:01:21 +08:00
墨大叔
51a3056fa3 店铺申请 2024-08-05 15:42:45 +08:00
墨大叔
9b1ef44141 Merge remote-tracking branch 'origin/master' into dev 2024-08-05 10:05:03 +08:00
墨大叔
82d7229dbb Merge remote-tracking branch 'origin/master' into debug 2024-08-05 10:02:40 +08:00
墨大叔
4d9b5d28ba debug:设备最近更新时间 2024-08-05 10:02:14 +08:00
墨大叔
4854685931 Merge remote-tracking branch 'origin/master' into dev 2024-08-05 09:39:22 +08:00
墨大叔
bcf84c8879 添加设备日志 2024-08-05 09:39:03 +08:00
墨大叔
8707c24350 临时提交 2024-08-03 18:04:56 +08:00
墨大叔
cd2eb5adec debug 2024-08-03 13:51:24 +08:00
墨大叔
a72dfb8602 Merge remote-tracking branch 'origin/master' into dev 2024-08-03 10:30:36 +08:00
墨大叔
a2086e0ab1 归零逻辑更新,时长改为1秒 2024-08-03 10:29:38 +08:00
墨大叔
619594e711 临时提交 2024-08-03 09:41:06 +08:00
墨大叔
1d36920701 提现渠道优化 2024-08-02 17:56:39 +08:00
墨大叔
4fd545fdcb 新增提现渠道 2024-08-02 14:03:28 +08:00
墨大叔
8990eb3297 接入支付平台测试 2024-08-02 11:05:36 +08:00
墨大叔
43af667f20 debug 2024-08-01 14:37:37 +08:00
墨大叔
93d6761f18 提现参数修改 2024-08-01 14:26:29 +08:00
墨大叔
faa7f18924 微信登录位置移动 2024-08-01 11:17:25 +08:00
墨大叔
6342d71a89 微信支付小重构 2024-08-01 11:15:23 +08:00
墨大叔
f72ca5ecb6 设备套餐修改 2024-07-31 17:15:33 +08:00
墨大叔
f2f4692784 Merge remote-tracking branch 'origin/master' into dev 2024-07-30 17:36:23 +08:00
墨大叔
b77cf4cb21 debug:故障报错 2024-07-30 17:36:03 +08:00
墨大叔
4706a4e524 临时提交 2024-07-30 17:35:22 +08:00
墨大叔
147bb2a3fd Merge remote-tracking branch 'origin/master' into dev 2024-07-30 15:21:33 +08:00
墨大叔
26ed635923 更新提现渠道逻辑 2024-07-30 15:20:38 +08:00
墨大叔
65f5fc5234 临时提交 2024-07-30 15:08:05 +08:00
墨大叔
6696ade7d3 Merge remote-tracking branch 'origin/master' into dev 2024-07-30 14:24:19 +08:00
墨大叔
9250fa2160 渠道更新 2024-07-30 14:23:53 +08:00
墨大叔
6708e537f1 临时提交 2024-07-30 13:55:03 +08:00
墨大叔
fca590fbd3 临时提交 2024-07-30 11:39:55 +08:00
墨大叔
76714ad044 Merge remote-tracking branch 'origin/master' into dev 2024-07-30 10:33:23 +08:00
墨大叔
aa285be9b1 提现金额不能小于20 2024-07-30 10:32:36 +08:00
墨大叔
2eadd24576 提现金额不能小于20 2024-07-30 10:31:46 +08:00
墨大叔
cd26fe837f Merge remote-tracking branch 'origin/master' into dev 2024-07-29 17:38:04 +08:00
墨大叔
52db6e2137 绑定微信收款账户 2024-07-29 17:36:28 +08:00
墨大叔
7694fe894b 临时提交 2024-07-29 17:23:05 +08:00
墨大叔
32cfdffc06 Merge branch 'refs/heads/master' into dev 2024-07-29 14:57:44 +08:00
墨大叔
acdd27e5e4 debug 2024-07-29 14:57:22 +08:00
墨大叔
1a50637556 Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java
2024-07-29 11:12:24 +08:00
墨大叔
537ef41933 debug 2024-07-29 11:09:03 +08:00
墨大叔
7afc60db82 收款账户、充值、提现申请手续费调整 2024-07-29 10:32:36 +08:00
墨大叔
b84385e313 收款账户 2024-07-28 10:41:03 +08:00
墨大叔
390cf406a2 Merge remote-tracking branch 'origin/master' into debug 2024-07-28 09:00:42 +08:00
墨大叔
d9021c7a34 收款人订单列表、0元下单提交 2024-07-27 18:41:48 +08:00
墨大叔
2326029f50 临时提交 2024-07-27 17:59:09 +08:00
墨大叔
85402f8a7d Merge remote-tracking branch 'origin/master' into dev 2024-07-27 16:58:43 +08:00
墨大叔
cc9be65fb1 提现审核 2024-07-27 16:57:30 +08:00
墨大叔
1ff3807725 临时提交 2024-07-27 14:30:08 +08:00
墨大叔
7fbf87ff3f 0元支付 2024-07-27 10:00:16 +08:00
墨大叔
9b59ab7e20 0元支付 2024-07-27 09:34:30 +08:00