Commit Graph

89 Commits

Author SHA1 Message Date
墨大叔
c749ad40de 临时提交 2024-09-30 13:37:19 +08:00
墨大叔
16e2ead7e6 细节优化 2024-09-28 17:14:43 +08:00
墨大叔
f301da2af8 订单分成,还差最低收取手续费 2024-09-27 18:03:41 +08:00
墨大叔
a08bb65830 临时提交 2024-09-26 11:09:25 +08:00
墨大叔
b8d3f2fc7c Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java
#	smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisLockKey.java
#	smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java
#	smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java
#	smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
#	smart-switch-service/src/main/java/com/ruoyi/iot/service/IotReceiveServiceImpl.java
#	smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
#	smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBill.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
#	smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargePayHandler.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
#	smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/SmUserServiceImpl.java
2024-09-26 09:43:34 +08:00
墨大叔
e2b9f18a21 双模设备、用户密码、蓝牙设备充值、支付回调优化 2024-09-25 18:30:23 +08:00
墨大叔
49469ba6f1 优化实名认证 2024-09-24 10:03:37 +08:00
墨大叔
cc1da5cc4a Merge remote-tracking branch 'refs/remotes/origin/debug-login'
# Conflicts:
#	smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/wx/AccessTokenUtil.java
#	smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
2024-09-23 19:47:17 +08:00
墨大叔
04a6ab76a2 微信登录debug 2024-09-23 19:41:01 +08:00
墨大叔
344c0f3853 实名认证 + 人脸识别 2024-09-23 17:59:52 +08:00
墨大叔
4554d18f7b Merge remote-tracking branch 'origin/master' into debug
# Conflicts:
#	smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
#	smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java
2024-09-23 09:56:01 +08:00
墨大叔
f37bc4779a 提现风控 2024-09-21 19:28:59 +08:00
墨大叔
ddb0b75468 debug:设备充值成功,但订单未支付成功。
查询日志后发现,是由于死锁导致的数据库异常。
2024-09-21 16:51:18 +08:00
墨大叔
435907a5a5 临时提交 2024-09-20 17:41:31 +08:00
墨大叔
5441c04743 临时提交 2024-09-20 16:42:12 +08:00
墨大叔
87b2bd73e7 用户是否已读文章、系统配置 2024-09-19 18:10:13 +08:00
墨大叔
c9859e4b78 套餐低功率关闭 2024-09-19 16:10:04 +08:00
墨大叔
0aa9ea1a61 debug:归零时,修改订单状态失败 2024-09-18 09:54:44 +08:00
墨大叔
9e154620cd Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
2024-09-18 08:41:28 +08:00
磷叶
957ab5abd8 更新 2024-09-16 14:34:34 +08:00
墨大叔
af0a37eabe 限制退款 2024-09-15 17:36:44 +08:00
墨大叔
667d021142 临时提交 2024-09-15 17:04:26 +08:00
墨大叔
dba95cd81f 临时提交 2024-09-14 18:04:35 +08:00
墨大叔
c2b9367442 Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
2024-09-13 16:04:46 +08:00
墨大叔
5143b11ed0 提现限制 2024-09-13 15:42:48 +08:00
墨大叔
ed1df8462c 临时提交 2024-09-13 15:09:35 +08:00
墨大叔
7f9727c246 debug:加密套件更换 2024-09-12 09:22:29 +08:00
墨大叔
93181b4f21 支付完善 2024-09-11 14:05:01 +08:00
墨大叔
d61b9e9391 支付接口更换 2024-09-10 18:25:24 +08:00
墨大叔
90b730c2f8 通联支付接入 2024-09-09 18:05:20 +08:00
墨大叔
3c83165a93 debug 2024-09-09 16:56:29 +08:00
墨大叔
7563bde2bc 充值最低手续费 2024-09-09 15:40:06 +08:00
墨大叔
b5565fba21 支付对接临时提交 2024-09-09 13:53:30 +08:00
墨大叔
a9b169b1d0 首页报表更新 2024-09-07 16:43:49 +08:00
墨大叔
5426294462 提现免审核额度 2024-09-04 14:27:09 +08:00
墨大叔
9ed15965f0 下单时对设备上锁 2024-08-24 10:45:06 +08:00
墨大叔
50741928a5 套餐、订单修改 2024-08-15 21:23:07 +08:00
墨大叔
7b5692787b 套餐配置 2024-08-13 17:01:49 +08:00
墨大叔
bfbd6847d3 代码生成修改 2024-08-13 09:29:10 +08:00
墨大叔
91c924d69b 提现申请优化 2024-08-12 19:28:30 +08:00
墨大叔
babd77042e 提现转账优化 2024-08-12 19:14:35 +08:00
墨大叔
57e507e70a 提现转账 2024-08-12 18:02:43 +08:00
墨大叔
55bced1bb0 转账(未完成) 2024-08-09 18:08:31 +08:00
墨大叔
9842c59084 临时提交 2024-08-09 15:52:58 +08:00
墨大叔
50b70e14ce API收费标准建表 2024-08-08 11:45:58 +08:00
墨大叔
734c33dc18 商户中心 2024-08-08 10:42:57 +08:00
墨大叔
b548e1aad1 首页更新(一半) 2024-08-06 17:43:10 +08:00
墨大叔
8707c24350 临时提交 2024-08-03 18:04:56 +08:00
墨大叔
cd2eb5adec debug 2024-08-03 13:51:24 +08:00
墨大叔
619594e711 临时提交 2024-08-03 09:41:06 +08:00