磷叶
|
b65b3c9528
|
临时提交
|
2024-10-17 18:04:05 +08:00 |
|
磷叶
|
2f03f23288
|
debug:电量变化记录错误
|
2024-10-17 10:31:45 +08:00 |
|
磷叶
|
f7fa804b07
|
debug:电量变化记录错误
|
2024-10-17 10:16:21 +08:00 |
|
磷叶
|
ecbe7038c6
|
debug:智能订单未开始使用时的金额计算
|
2024-10-17 09:05:17 +08:00 |
|
磷叶
|
23313ec463
|
debug:归零记录（获取用户信息失败，因为是系统自动关闭）
|
2024-10-16 23:04:45 +08:00 |
|
磷叶
|
0727da1bd3
|
debug:押金全额退款
|
2024-10-16 21:32:01 +08:00 |
|
磷叶
|
585316b44b
|
debug:订单用户手机号
|
2024-10-16 19:27:52 +08:00 |
|
磷叶
|
0071b2c242
|
1.新增设备商户ID
2.debug：智能电量套餐金额计算错误
|
2024-10-16 18:05:00 +08:00 |
|
墨大叔
|
78577db9b3
|
商户中心优化
|
2024-10-15 17:58:15 +08:00 |
|
墨大叔
|
5b2246c9d9
|
绑定代理、商户
|
2024-10-15 15:03:33 +08:00 |
|
墨大叔
|
dcc9cd845d
|
用户实名去掉手机号
|
2024-10-15 10:23:32 +08:00 |
|
墨大叔
|
682597d821
|
修复统计
|
2024-10-15 09:35:40 +08:00 |
|
墨大叔
|
710a05b677
|
商户查看用户手机号
|
2024-10-15 09:29:42 +08:00 |
|
墨大叔
|
beaa110dad
|
商户查看用户手机号
|
2024-10-14 18:03:16 +08:00 |
|
墨大叔
|
b994a52f13
|
设备归零
|
2024-10-14 14:20:32 +08:00 |
|
墨大叔
|
4cc8ab112c
|
临时提交
|
2024-10-14 13:29:54 +08:00 |
|
墨大叔
|
32ed751e3d
|
Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
# smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
|
2024-10-14 08:36:19 +08:00 |
|
墨大叔
|
c1aa9ac39d
|
10-12更新：
1.设备充值debug
2.新增登录手机号配置
|
2024-10-12 12:25:20 +08:00 |
|
墨大叔
|
5b789179e4
|
代理商修改设备
|
2024-10-12 09:52:17 +08:00 |
|
墨大叔
|
bac38cf247
|
修改手机号
|
2024-10-11 17:25:58 +08:00 |
|
墨大叔
|
7550ad1ac7
|
修改手机号（一半）
|
2024-10-11 17:06:41 +08:00 |
|
墨大叔
|
a1204272be
|
套餐、订单修改
|
2024-10-11 14:48:27 +08:00 |
|
墨大叔
|
1ae280ad0d
|
修改套餐、订单，待测试
|
2024-10-09 18:03:01 +08:00 |
|
墨大叔
|
518a48ac97
|
debug:设备恢复总用电量
|
2024-10-09 15:51:29 +08:00 |
|
墨大叔
|
d668228d25
|
debug:设备分成
|
2024-10-09 14:32:57 +08:00 |
|
墨大叔
|
3bb4f33182
|
1.设备分成计算修改，待测试；
2.用户登录无需手机号
|
2024-10-09 11:27:47 +08:00 |
|
墨大叔
|
6ef91e7506
|
店铺配置
|
2024-10-09 10:53:03 +08:00 |
|
墨大叔
|
d7c8581bdd
|
套餐校验设备是否支持电量
|
2024-10-09 09:11:34 +08:00 |
|
墨大叔
|
56bee7f862
|
商户订单统计
|
2024-10-08 16:23:19 +08:00 |
|
墨大叔
|
c35a60695c
|
商户订单统计
|
2024-10-08 16:05:28 +08:00 |
|
墨大叔
|
085050cbdc
|
店铺营业时间可到次日
|
2024-10-08 10:46:27 +08:00 |
|
墨大叔
|
9f7aadd2c3
|
恢复设备总用电量
|
2024-10-07 09:25:18 +08:00 |
|
墨大叔
|
903884cecb
|
设备双MAC在线状态
|
2024-10-06 18:03:03 +08:00 |
|
墨大叔
|
334420cbe5
|
管理员充值电量
|
2024-10-06 17:00:37 +08:00 |
|
墨大叔
|
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 |
|
磷叶
|
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 |
|
墨大叔
|
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 |
|