磷叶
|
6cd799bfdb
|
设备系数
|
2024-12-16 21:36:17 +08:00 |
|
磷叶
|
8530c133bc
|
命令日志
|
2024-12-14 00:59:44 +08:00 |
|
磷叶
|
dc01fb47cd
|
退款通知
|
2024-12-11 16:35:56 +08:00 |
|
磷叶
|
6421f31853
|
转账
|
2024-12-11 15:25:57 +08:00 |
|
磷叶
|
4c1cf4d042
|
支付修改
|
2024-12-10 18:11:21 +08:00 |
|
磷叶
|
309bcb18a2
|
提交
|
2024-12-10 13:38:03 +08:00 |
|
磷叶
|
0a144abd3e
|
监控电量订单结束时间
|
2024-12-09 10:22:48 +08:00 |
|
磷叶
|
66565eda94
|
支付宝登录、获取支付宝手机号、远程配网
|
2024-12-04 11:22:46 +08:00 |
|
磷叶
|
5c91bfa2aa
|
支付宝登录（一半）
|
2024-12-03 18:03:21 +08:00 |
|
磷叶
|
8a9a04733f
|
对账更新
|
2024-12-03 16:29:20 +08:00 |
|
磷叶
|
fa9ebdc484
|
对账更新
|
2024-12-03 11:11:46 +08:00 |
|
磷叶
|
b2c23342d8
|
去除验签
|
2024-11-29 17:29:46 +08:00 |
|
磷叶
|
0f1fe51fd6
|
太米支付
|
2024-11-28 18:02:06 +08:00 |
|
磷叶
|
dad4dd742a
|
太米支付
|
2024-11-28 17:47:20 +08:00 |
|
磷叶
|
0a14baad16
|
提交
|
2024-11-28 10:56:01 +08:00 |
|
磷叶
|
3c1030b55b
|
debug:退款
|
2024-11-28 09:52:35 +08:00 |
|
磷叶
|
6d94892d35
|
员工提交
|
2024-11-27 18:06:07 +08:00 |
|
磷叶
|
41daefbda2
|
风控提交
|
2024-11-26 17:30:35 +08:00 |
|
磷叶
|
d2e00163bd
|
风控提交
|
2024-11-25 18:01:55 +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 |
|
磷叶
|
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 |
|