chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
299 Commits 3 Branches 0 Tags 3.5 MiB
8760f7a39e
Commit Graph

112 Commits

Author SHA1 Message Date
磷叶
8760f7a39e 店铺员工、提现debug 2024-11-15 10:44:30 +08:00
磷叶
004c357153 报错提示优化 2024-11-11 09:04:19 +08:00
磷叶
0109e30920 代理商设备商户是否允许开启 2024-11-08 15:17:35 +08:00
磷叶
eb7e4d2b97 实名身份证唯一、设备录入 2024-11-04 15:28:58 +08:00
磷叶
9c7c87b3f9 debug:微信用户注册加锁 2024-10-25 15:07:09 +08:00
磷叶
72c8a68c39 风控 2024-10-21 14:19:15 +08:00
磷叶
b65b3c9528 临时提交 2024-10-17 18:04:05 +08:00
墨大叔
78577db9b3 商户中心优化 2024-10-15 17:58:15 +08:00
墨大叔
5b2246c9d9 绑定代理、商户 2024-10-15 15:03:33 +08:00
墨大叔
710a05b677 商户查看用户手机号 2024-10-15 09:29:42 +08:00
墨大叔
beaa110dad 商户查看用户手机号 2024-10-14 18:03:16 +08:00
墨大叔
92444077e6 debug：添加用户报错 2024-10-14 08:50:30 +08:00
墨大叔
0f4ed47422 微信登录 2024-10-14 08:38:13 +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
墨大叔
7550ad1ac7 修改手机号（一半） 2024-10-11 17:06:41 +08:00
墨大叔
d668228d25 debug:设备分成 2024-10-09 14:32:57 +08:00
墨大叔
6852d7afeb 提现和支付渠道分离 2024-10-09 14:11:01 +08:00
墨大叔
3bb4f33182 1.设备分成计算修改，待测试； 
2.用户登录无需手机号
 2024-10-09 11:27:47 +08:00
墨大叔
c35a60695c 商户订单统计 2024-10-08 16:05:28 +08:00
墨大叔
9f7aadd2c3 恢复设备总用电量 2024-10-07 09:25:18 +08:00
墨大叔
903884cecb 设备双MAC在线状态 2024-10-06 18:03:03 +08:00
墨大叔
beb93dad38 临时提交：语音版 2024-09-30 17:54:21 +08:00
墨大叔
c749ad40de 临时提交 2024-09-30 13:37:19 +08:00
墨大叔
16e2ead7e6 细节优化 2024-09-28 17:14:43 +08:00
墨大叔
f301da2af8 订单分成，还差最低收取手续费 2024-09-27 18:03:41 +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
墨大叔
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
墨大叔
f37bc4779a 提现风控 2024-09-21 19:28:59 +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
墨大叔
0aa9ea1a61 debug:归零时，修改订单状态失败 2024-09-18 09:54:44 +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
墨大叔
dba95cd81f 临时提交 2024-09-14 18:04:35 +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
墨大叔
7f9727c246 debug：加密套件更换 2024-09-12 09:22:29 +08:00