磷叶
|
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 |
|
墨大叔
|
15b7f77fb5
|
结束订单、设备电量归零
|
2024-09-06 16:16:42 +08:00 |
|
墨大叔
|
5426294462
|
提现免审核额度
|
2024-09-04 14:27:09 +08:00 |
|
墨大叔
|
6b1f38f07a
|
套餐修改
|
2024-08-16 22:20:53 +08:00 |
|
墨大叔
|
50741928a5
|
套餐、订单修改
|
2024-08-15 21:23:07 +08:00 |
|
墨大叔
|
7b5692787b
|
套餐配置
|
2024-08-13 17:01:49 +08:00 |
|
墨大叔
|
6ef84a9fe3
|
设备型号配置产品ID
|
2024-08-12 20:55:59 +08:00 |
|
墨大叔
|
57e507e70a
|
提现转账
|
2024-08-12 18:02:43 +08:00 |
|
墨大叔
|
55bced1bb0
|
转账（未完成）
|
2024-08-09 18:08:31 +08:00 |
|
墨大叔
|
9842c59084
|
临时提交
|
2024-08-09 15:52:58 +08:00 |
|
墨大叔
|
999f164830
|
API订单建表
|
2024-08-09 11:17:21 +08:00 |
|
墨大叔
|
ce6f30a195
|
前台余额变动排序
|
2024-08-09 09:17:06 +08:00 |
|
墨大叔
|
66b948e120
|
API收费及各种优化
|
2024-08-08 17:54:35 +08:00 |
|
墨大叔
|
50b70e14ce
|
API收费标准建表
|
2024-08-08 11:45:58 +08:00 |
|
墨大叔
|
611c535acb
|
商户中心核心功能
|
2024-08-07 15:51:04 +08:00 |
|
墨大叔
|
6ea063f36d
|
临时提交
|
2024-08-07 10:10:50 +08:00 |
|
墨大叔
|
b548e1aad1
|
首页更新（一半）
|
2024-08-06 17:43:10 +08:00 |
|
墨大叔
|
3ae0c70b87
|
余额变动记录
|
2024-08-06 13:32:16 +08:00 |
|
墨大叔
|
7f49032338
|
店铺申请debug
|
2024-08-05 16:01:21 +08:00 |
|
墨大叔
|
51a3056fa3
|
店铺申请
|
2024-08-05 15:42:45 +08:00 |
|
墨大叔
|
4854685931
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-08-05 09:39:22 +08:00 |
|
墨大叔
|
bcf84c8879
|
添加设备日志
|
2024-08-05 09:39:03 +08:00 |
|
墨大叔
|
8707c24350
|
临时提交
|
2024-08-03 18:04:56 +08:00 |
|
墨大叔
|
cd2eb5adec
|
debug
|
2024-08-03 13:51:24 +08:00 |
|
墨大叔
|
1d36920701
|
提现渠道优化
|
2024-08-02 17:56:39 +08:00 |
|
墨大叔
|
4fd545fdcb
|
新增提现渠道
|
2024-08-02 14:03:28 +08:00 |
|
墨大叔
|
8990eb3297
|
接入支付平台测试
|
2024-08-02 11:05:36 +08:00 |
|
墨大叔
|
93d6761f18
|
提现参数修改
|
2024-08-01 14:26:29 +08:00 |
|
墨大叔
|
faa7f18924
|
微信登录位置移动
|
2024-08-01 11:17:25 +08:00 |
|
墨大叔
|
6342d71a89
|
微信支付小重构
|
2024-08-01 11:15:23 +08:00 |
|
墨大叔
|
f72ca5ecb6
|
设备套餐修改
|
2024-07-31 17:15:33 +08:00 |
|
墨大叔
|
4706a4e524
|
临时提交
|
2024-07-30 17:35:22 +08:00 |
|
墨大叔
|
147bb2a3fd
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-30 15:21:33 +08:00 |
|
墨大叔
|
26ed635923
|
更新提现渠道逻辑
|
2024-07-30 15:20:38 +08:00 |
|
墨大叔
|
6696ade7d3
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-30 14:24:19 +08:00 |
|
墨大叔
|
9250fa2160
|
渠道更新
|
2024-07-30 14:23:53 +08:00 |
|
墨大叔
|
6708e537f1
|
临时提交
|
2024-07-30 13:55:03 +08:00 |
|
墨大叔
|
fca590fbd3
|
临时提交
|
2024-07-30 11:39:55 +08:00 |
|
墨大叔
|
76714ad044
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-30 10:33:23 +08:00 |
|
墨大叔
|
aa285be9b1
|
提现金额不能小于20
|
2024-07-30 10:32:36 +08:00 |
|
墨大叔
|
cd26fe837f
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-29 17:38:04 +08:00 |
|
墨大叔
|
52db6e2137
|
绑定微信收款账户
|
2024-07-29 17:36:28 +08:00 |
|
墨大叔
|
7694fe894b
|
临时提交
|
2024-07-29 17:23:05 +08:00 |
|
墨大叔
|
1a50637556
|
Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
# smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java
|
2024-07-29 11:12:24 +08:00 |
|
墨大叔
|
537ef41933
|
debug
|
2024-07-29 11:09:03 +08:00 |
|
墨大叔
|
7afc60db82
|
收款账户、充值、提现申请手续费调整
|
2024-07-29 10:32:36 +08:00 |
|
墨大叔
|
b84385e313
|
收款账户
|
2024-07-28 10:41:03 +08:00 |
|
墨大叔
|
390cf406a2
|
Merge remote-tracking branch 'origin/master' into debug
|
2024-07-28 09:00:42 +08:00 |
|
墨大叔
|
d9021c7a34
|
收款人订单列表、0元下单提交
|
2024-07-27 18:41:48 +08:00 |
|
墨大叔
|
2326029f50
|
临时提交
|
2024-07-27 17:59:09 +08:00 |
|
墨大叔
|
85402f8a7d
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-27 16:58:43 +08:00 |
|
墨大叔
|
cc9be65fb1
|
提现审核
|
2024-07-27 16:57:30 +08:00 |
|
墨大叔
|
1ff3807725
|
临时提交
|
2024-07-27 14:30:08 +08:00 |
|
墨大叔
|
14c283a011
|
新增时长订单（支付未完成）
|
2024-07-24 18:05:18 +08:00 |
|
墨大叔
|
d42b3fff75
|
新增月费功能
|
2024-07-23 16:27:23 +08:00 |
|
墨大叔
|
76f2bb2150
|
提交部署
|
2024-07-22 17:07:09 +08:00 |
|
墨大叔
|
eaa86d0ec3
|
余额变动，临时提交
|
2024-07-22 11:53:44 +08:00 |
|
墨大叔
|
99b0d2767b
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-22 10:32:14 +08:00 |
|
墨大叔
|
a05fe97eb8
|
登录bug修改
|
2024-07-22 10:23:48 +08:00 |
|
墨大叔
|
49f1c50460
|
套餐排序，暂未测试
|
2024-07-22 10:19:40 +08:00 |
|
墨大叔
|
a44c907099
|
前台用户账号密码登录
|
2024-07-20 14:58:55 +08:00 |
|
墨大叔
|
608ff95255
|
添加套餐清空
|
2024-07-19 18:00:29 +08:00 |
|
墨大叔
|
b969fa2a52
|
秘钥缓存、WIFI、设备类名称重构
|
2024-07-19 17:48:58 +08:00 |
|
墨大叔
|
49baa39cd1
|
密钥对接口完善
|
2024-07-18 18:17:35 +08:00 |
|
墨大叔
|
d8b9992b23
|
BUG修复：支付、时长、套餐
|
2024-07-18 17:40:30 +08:00 |
|
墨大叔
|
bd428814a3
|
套餐时间修改
|
2024-07-17 13:47:04 +08:00 |
|
墨大叔
|
099249122f
|
修复正在使用中的设备问题
|
2024-07-15 17:56:58 +08:00 |
|
墨大叔
|
8a0a9475ad
|
移除套餐模板（无用模块）
|
2024-07-15 16:06:46 +08:00 |
|
墨大叔
|
b48c4dcbc9
|
提交测试环境
|
2024-07-15 15:26:48 +08:00 |
|
墨大叔
|
2296efa998
|
订单套餐时间（暂未测试）
|
2024-07-12 17:54:14 +08:00 |
|
墨大叔
|
a495de04fc
|
部署
|
2024-07-10 17:57:39 +08:00 |
|
墨大叔
|
f75febd2b4
|
部署
|
2024-07-10 16:00:33 +08:00 |
|
墨大叔
|
c6edec8083
|
部署
|
2024-07-09 15:10:40 +08:00 |
|
墨大叔
|
1a2128642f
|
debug
|
2024-07-09 11:17:20 +08:00 |
|
墨大叔
|
8ebe489761
|
debug + 绑定操作修改
|
2024-06-14 17:12:03 +08:00 |
|
墨大叔
|
1e22037196
|
设备在线状态推送
|
2024-06-04 15:13:00 +08:00 |
|
墨大叔
|
36d1c75a55
|
debug 蓝牙充值、设备是否在线
|
2024-05-24 16:20:30 +08:00 |
|
墨大叔
|
6dcb9f123e
|
debug 蓝牙充值
|
2024-05-24 09:33:41 +08:00 |
|
墨大叔
|
765a795e36
|
debug
|
2024-05-22 15:50:24 +08:00 |
|
墨大叔
|
b66a5f3e15
|
debug
|
2024-05-21 14:33:47 +08:00 |
|
墨大叔
|
7590c5db9c
|
设备对接、优化设备表
|
2024-05-20 16:04:35 +08:00 |
|
墨大叔
|
7d2bfc4bbf
|
优化店铺、设备、用户
|
2024-05-13 15:05:46 +08:00 |
|
墨大叔
|
753db322c7
|
文章协议
|
2024-05-10 14:16:02 +08:00 |
|
墨大叔
|
a04c399c71
|
套餐API
|
2024-05-09 17:31:24 +08:00 |
|
墨大叔
|
d51db24133
|
微信支付回调
|
2024-05-08 14:19:18 +08:00 |
|
墨大叔
|
060019c830
|
设备调整80%、充值记录、抄表
|
2024-05-07 18:01:55 +08:00 |
|
墨大叔
|
5ee530e494
|
异常上报、SN绑定、设备推送
|
2024-05-06 18:06:58 +08:00 |
|
墨大叔
|
1b342869d3
|
优化订单、用户信息
|
2024-05-06 15:07:24 +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 |
|