墨大叔
|
6348f52646
|
删除设备前关闭订单
|
2024-10-06 14:29:59 +08:00 |
|
墨大叔
|
c38bcae036
|
设备余额恢复
|
2024-10-06 13:32:53 +08:00 |
|
墨大叔
|
1b3c9d90a6
|
Merge remote-tracking branch 'origin/dev-agent' into dev
|
2024-10-06 08:47:44 +08:00 |
|
墨大叔
|
31301441c4
|
配置修改
|
2024-10-06 08:47:17 +08:00 |
|
磷叶
|
1d52c5db8d
|
Debug:服务费类型
|
2024-10-02 15:21:39 +08:00 |
|
磷叶
|
27bf7c5fad
|
更新
|
2024-10-02 15:00:29 +08:00 |
|
墨大叔
|
75dede5e20
|
Merge remote-tracking branch 'origin/master' into dev-agent
|
2024-09-30 17:55:29 +08:00 |
|
墨大叔
|
beb93dad38
|
临时提交:语音版
|
2024-09-30 17:54:21 +08:00 |
|
墨大叔
|
9d42395253
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-09-30 13:46:33 +08:00 |
|
墨大叔
|
84ea7c334e
|
debug:统计日期缺失最后一天
|
2024-09-30 13:41:43 +08:00 |
|
墨大叔
|
c749ad40de
|
临时提交
|
2024-09-30 13:37:19 +08:00 |
|
墨大叔
|
b78c4e7858
|
更新
|
2024-09-29 18:34:15 +08:00 |
|
墨大叔
|
bbb29ccc21
|
更新
|
2024-09-29 18:15:57 +08:00 |
|
墨大叔
|
3960f10abf
|
Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
# smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java
# smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java
|
2024-09-29 10:35:59 +08:00 |
|
墨大叔
|
47284ed2a5
|
优化抄表
|
2024-09-29 10:19:26 +08:00 |
|
墨大叔
|
d0ae71835c
|
debug:双模数据获取
|
2024-09-29 09:38:37 +08:00 |
|
墨大叔
|
cc388750ba
|
debug:双模数据获取
|
2024-09-29 09:22:48 +08:00 |
|
墨大叔
|
2188a27e0b
|
细节优化
|
2024-09-28 18:04:40 +08:00 |
|
墨大叔
|
16e2ead7e6
|
细节优化
|
2024-09-28 17:14:43 +08:00 |
|
墨大叔
|
0983df3a96
|
订单分成,还差月费处理
|
2024-09-28 14:42:13 +08:00 |
|
墨大叔
|
f301da2af8
|
订单分成,还差最低收取手续费
|
2024-09-27 18:03:41 +08:00 |
|
墨大叔
|
3bfb58a5ba
|
订单分成,还差最低收取手续费
|
2024-09-27 17:48:50 +08:00 |
|
墨大叔
|
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 |
|