磷叶
|
0f6251455f
|
临时提交
|
2025-03-03 18:04:17 +08:00 |
|
磷叶
|
6213e5114e
|
临时提交
|
2025-03-03 18:04:08 +08:00 |
|
磷叶
|
9ef5a10782
|
用户扣减余额功能、分时段电量订单优化，超出押金直接关闭
|
2025-02-26 16:49:41 +08:00 |
|
磷叶
|
2c64d6d72c
|
更新在线状态逻辑
|
2025-02-12 10:33:40 +08:00 |
|
磷叶
|
e6c6f8c406
|
更新
|
2025-01-25 18:02:45 +08:00 |
|
磷叶
|
0ca8a9f9db
|
提交更新
|
2025-01-19 16:38:40 +08:00 |
|
磷叶
|
c8f9a9237c
|
提交
|
2025-01-18 18:05:09 +08:00 |
|
磷叶
|
9afb61f2ea
|
提交
|
2025-01-17 18:16:02 +08:00 |
|
磷叶
|
46a8b4abbd
|
提交
|
2025-01-16 18:06:02 +08:00 |
|
磷叶
|
96dd651d80
|
debug：套餐精度
|
2025-01-16 13:51:42 +08:00 |
|
磷叶
|
b4aa567ad4
|
提交
|
2025-01-09 18:09:16 +08:00 |
|
磷叶
|
970ff655f8
|
提交
|
2025-01-08 18:09:55 +08:00 |
|
磷叶
|
2378e99c3b
|
提交
|
2025-01-07 18:22:12 +08:00 |
|
磷叶
|
2d4f601816
|
在线状态优化
|
2025-01-04 13:43:34 +08:00 |
|
磷叶
|
dc01fb47cd
|
退款通知
|
2024-12-11 16:35:56 +08:00 |
|
磷叶
|
0a144abd3e
|
监控电量订单结束时间
|
2024-12-09 10:22:48 +08:00 |
|
磷叶
|
41daefbda2
|
风控提交
|
2024-11-26 17:30:35 +08:00 |
|
磷叶
|
9c9aeadb61
|
员工功能
|
2024-11-23 14:47:44 +08:00 |
|
磷叶
|
f6ff7b75ac
|
太米支付（待测试）
|
2024-11-22 16:47:12 +08:00 |
|
磷叶
|
8760f7a39e
|
店铺员工、提现debug
|
2024-11-15 10:44:30 +08:00 |
|
磷叶
|
b65b3c9528
|
临时提交
|
2024-10-17 18:04:05 +08:00 |
|
墨大叔
|
c749ad40de
|
临时提交
|
2024-09-30 13:37:19 +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 |
|
墨大叔
|
f37bc4779a
|
提现风控
|
2024-09-21 19:28:59 +08:00 |
|
墨大叔
|
ddb0b75468
|
debug:设备充值成功，但订单未支付成功。
查询日志后发现，是由于死锁导致的数据库异常。
|
2024-09-21 16:51:18 +08:00 |
|
墨大叔
|
0aa9ea1a61
|
debug:归零时，修改订单状态失败
|
2024-09-18 09:54:44 +08:00 |
|
墨大叔
|
ed1df8462c
|
临时提交
|
2024-09-13 15:09:35 +08:00 |
|
墨大叔
|
d61b9e9391
|
支付接口更换
|
2024-09-10 18:25:24 +08:00 |
|
墨大叔
|
a9b169b1d0
|
首页报表更新
|
2024-09-07 16:43:49 +08:00 |
|
墨大叔
|
5426294462
|
提现免审核额度
|
2024-09-04 14:27:09 +08:00 |
|
墨大叔
|
50741928a5
|
套餐、订单修改
|
2024-08-15 21:23:07 +08:00 |
|
墨大叔
|
91c924d69b
|
提现申请优化
|
2024-08-12 19:28:30 +08:00 |
|
墨大叔
|
f72ca5ecb6
|
设备套餐修改
|
2024-07-31 17:15:33 +08:00 |
|
墨大叔
|
14c283a011
|
新增时长订单（支付未完成）
|
2024-07-24 18:05:18 +08:00 |
|
墨大叔
|
8d753fbdbb
|
debug
|
2024-07-22 10:54:00 +08:00 |
|
墨大叔
|
49f1c50460
|
套餐排序，暂未测试
|
2024-07-22 10:19:40 +08:00 |
|
墨大叔
|
d8b9992b23
|
BUG修复：支付、时长、套餐
|
2024-07-18 17:40:30 +08:00 |
|
墨大叔
|
f75febd2b4
|
部署
|
2024-07-10 16:00:33 +08:00 |
|
墨大叔
|
765a795e36
|
debug
|
2024-05-22 15:50:24 +08:00 |
|
墨大叔
|
7590c5db9c
|
设备对接、优化设备表
|
2024-05-20 16:04:35 +08:00 |
|
墨大叔
|
c8d55e7df9
|
故障上报、订单、商户合作申请
|
2024-05-05 17:10:04 +08:00 |
|
墨大叔
|
9932c98745
|
店铺API
|
2024-04-29 15:03:18 +08:00 |
|
墨大叔
|
b6209a326d
|
商户管理
|
2024-04-28 17:14:23 +08:00 |
|
墨大叔
|
51c6a4d9ad
|
临时保存
|
2024-04-27 10:31:34 +08:00 |
|
墨大叔
|
285897d58d
|
项目结构重构
|
2024-04-23 11:19:24 +08:00 |
|