墨大叔
|
43a9bb67b4
|
临时提交，做到了恢复订单数据
|
2024-09-27 15:38:11 +08:00 |
|
墨大叔
|
013ce24296
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-09-27 09:23:10 +08:00 |
|
墨大叔
|
adeea2b37e
|
debug:型号查询单个
|
2024-09-27 09:15:34 +08:00 |
|
墨大叔
|
f6b9d92c4e
|
临时提交
|
2024-09-27 09:13:44 +08:00 |
|
墨大叔
|
d39a4a4171
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-09-26 16:30:28 +08:00 |
|
墨大叔
|
807c3ef9d3
|
debug:双模设备录入
|
2024-09-26 16:27:07 +08:00 |
|
墨大叔
|
877715ae43
|
临时提交
|
2024-09-26 16:19:56 +08:00 |
|
墨大叔
|
ef87631b5c
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-09-26 11:15:37 +08:00 |
|
墨大叔
|
f045bbbb4d
|
debug:绑定报错
|
2024-09-26 11:10:46 +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 |
|
墨大叔
|
88688e1cea
|
优化实名认证
|
2024-09-24 09:23:13 +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 |
|
墨大叔
|
4bb1962255
|
去掉不必要的日志
|
2024-09-23 09:49:49 +08:00 |
|
墨大叔
|
0c489185c6
|
debug: 时长电量变化记录类型修复
|
2024-09-23 09:37:37 +08:00 |
|
墨大叔
|
135ab05364
|
debug: 时长电量变化记录类型修复
|
2024-09-23 08:55:19 +08:00 |
|
墨大叔
|
f37bc4779a
|
提现风控
|
2024-09-21 19:28:59 +08:00 |
|
墨大叔
|
7ff418ef44
|
debug:设备启动更新设备状态
|
2024-09-21 17:38:46 +08:00 |
|
墨大叔
|
ddb0b75468
|
debug:设备充值成功，但订单未支付成功。
查询日志后发现，是由于死锁导致的数据库异常。
|
2024-09-21 16:51:18 +08:00 |
|
墨大叔
|
8b746cca1c
|
设备刷新bug
|
2024-09-20 18:54:42 +08:00 |
|
墨大叔
|
3a683caafc
|
Merge remote-tracking branch 'origin/master' into debug
|
2024-09-20 17:50:48 +08:00 |
|
墨大叔
|
49c1b8b57b
|
收款账户未显示debug
|
2024-09-20 17:49:27 +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 |
|
墨大叔
|
e8d8f01bc4
|
客服
|
2024-09-19 10:46:53 +08:00 |
|
墨大叔
|
0d546b4105
|
debug:分时段订单账变格式化问题；
|
2024-09-18 17:51:24 +08:00 |
|
墨大叔
|
e369d6c8a9
|
debug:分时段订单账变格式化问题
|
2024-09-18 10:36:27 +08:00 |
|
墨大叔
|
efade2491d
|
debug:归零时，修改订单状态失败
|
2024-09-18 10:03:22 +08:00 |
|
墨大叔
|
0aa9ea1a61
|
debug:归零时，修改订单状态失败
|
2024-09-18 09:54:44 +08:00 |
|
墨大叔
|
156e36c26d
|
debug:归零时，修改订单状态失败
|
2024-09-18 09:33:05 +08:00 |
|
墨大叔
|
a18692a66b
|
debug:归零时，修改订单状态失败
|
2024-09-18 09:07:30 +08:00 |
|
墨大叔
|
7ef89d0521
|
临时提交
|
2024-09-18 09:00:37 +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 |
|
墨大叔
|
ad2f6bdfba
|
设备使用状态
|
2024-09-16 11:07:15 +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 |
|
墨大叔
|
a5ed55768c
|
Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
# smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
|
2024-09-13 17:23:01 +08:00 |
|
墨大叔
|
0c53e63ce3
|
充值限制
|
2024-09-13 17:06:22 +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 |
|