Commit Graph

189 Commits

Author SHA1 Message Date
墨大叔
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
墨大叔
14c283a011 新增时长订单(支付未完成) 2024-07-24 18:05:18 +08:00
墨大叔
922aedda0d 型号新增默认服务费值 2024-07-23 17:29:20 +08:00
墨大叔
d42b3fff75 新增月费功能 2024-07-23 16:27:23 +08:00
墨大叔
bb6edf05f3 模板修改 2024-07-23 11:10:22 +08:00
墨大叔
2f3490a53a Merge remote-tracking branch 'origin/dev' into dev 2024-07-23 09:12:07 +08:00
墨大叔
843314c5d3 提交 2024-07-23 09:11:43 +08:00
墨大叔
c778ca5abc debug:设备操作提示优化 2024-07-22 17:45:59 +08:00
墨大叔
89993b9be5 提交 2024-07-22 17:33:01 +08:00
墨大叔
76f2bb2150 提交部署 2024-07-22 17:07:09 +08:00
墨大叔
eaa86d0ec3 余额变动,临时提交 2024-07-22 11:53:44 +08:00
墨大叔
8d753fbdbb debug 2024-07-22 10:54:00 +08:00
墨大叔
99b0d2767b Merge remote-tracking branch 'origin/master' into dev 2024-07-22 10:32:14 +08:00
墨大叔
a05fe97eb8 登录bug修改 2024-07-22 10:23:48 +08:00
墨大叔
49f1c50460 套餐排序,暂未测试 2024-07-22 10:19:40 +08:00
墨大叔
a44c907099 前台用户账号密码登录 2024-07-20 14:58:55 +08:00
墨大叔
608ff95255 添加套餐清空 2024-07-19 18:00:29 +08:00
墨大叔
b969fa2a52 秘钥缓存、WIFI、设备类名称重构 2024-07-19 17:48:58 +08:00