Commit Graph

142 Commits

Author SHA1 Message Date
墨大叔
6852d7afeb 提现和支付渠道分离 2024-10-09 14:11:01 +08:00
墨大叔
6ef91e7506 店铺配置 2024-10-09 10:53:03 +08:00
墨大叔
d7c8581bdd 套餐校验设备是否支持电量 2024-10-09 09:11:34 +08:00
墨大叔
9877f3a1f6 切换到千6的商户号 2024-10-08 17:57:12 +08:00
墨大叔
c35a60695c 商户订单统计 2024-10-08 16:05:28 +08:00
墨大叔
085050cbdc 店铺营业时间可到次日 2024-10-08 10:46:27 +08:00
墨大叔
334420cbe5 管理员充值电量 2024-10-06 17:00:37 +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
磷叶
27bf7c5fad 更新 2024-10-02 15:00:29 +08:00
墨大叔
beb93dad38 临时提交:语音版 2024-09-30 17:54:21 +08:00
墨大叔
bbb29ccc21 更新 2024-09-29 18:15:57 +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
墨大叔
3bfb58a5ba 订单分成,还差最低收取手续费 2024-09-27 17:48:50 +08:00
墨大叔
43a9bb67b4 临时提交,做到了恢复订单数据 2024-09-27 15:38:11 +08:00
墨大叔
f6b9d92c4e 临时提交 2024-09-27 09:13:44 +08:00
墨大叔
877715ae43 临时提交 2024-09-26 16:19:56 +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
墨大叔
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
墨大叔
7ff418ef44 debug:设备启动更新设备状态 2024-09-21 17:38:46 +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
墨大叔
e8d8f01bc4 客服 2024-09-19 10:46:53 +08:00
墨大叔
0d546b4105 debug:分时段订单账变格式化问题; 2024-09-18 17:51:24 +08:00
墨大叔
0aa9ea1a61 debug:归零时,修改订单状态失败 2024-09-18 09:54:44 +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
墨大叔
af0a37eabe 限制退款 2024-09-15 17:36:44 +08:00
墨大叔
667d021142 临时提交 2024-09-15 17:04:26 +08:00
墨大叔
7f9727c246 debug:加密套件更换 2024-09-12 09:22:29 +08:00
磷叶
501e83c15e 更新 2024-09-11 23:06:20 +08:00
磷叶
e556b37c7c 订单金额修改 2024-09-11 20:58:13 +08:00
墨大叔
65754161b6 刷新退款结果 2024-09-11 09:16:08 +08:00
墨大叔
d61b9e9391 支付接口更换 2024-09-10 18:25:24 +08:00
墨大叔
5284c604f7 过滤设备MAC 2024-09-10 09:19:46 +08:00
墨大叔
90b730c2f8 通联支付接入 2024-09-09 18:05:20 +08:00
墨大叔
b5565fba21 支付对接临时提交 2024-09-09 13:53:30 +08:00
墨大叔
6f1b8047cd 首页报表优化 2024-09-07 17:40:12 +08:00
墨大叔
eebccd5453 套餐最低0.1元,手续费最低0.05元 2024-09-07 17:22:19 +08:00
墨大叔
a9b169b1d0 首页报表更新 2024-09-07 16:43:49 +08:00