墨大叔
|
183828d4a4
|
debug:下单时长单位校验
|
2024-08-20 10:02:12 +08:00 |
|
墨大叔
|
73163e31f2
|
debug：渠道成本计算
|
2024-08-19 17:25:09 +08:00 |
|
墨大叔
|
6b1f38f07a
|
套餐修改
|
2024-08-16 22:20:53 +08:00 |
|
墨大叔
|
50741928a5
|
套餐、订单修改
|
2024-08-15 21:23:07 +08:00 |
|
墨大叔
|
a1f0aa4e49
|
套餐移除没有的类
|
2024-08-13 17:02:25 +08:00 |
|
墨大叔
|
7b5692787b
|
套餐配置
|
2024-08-13 17:01:49 +08:00 |
|
墨大叔
|
6ef84a9fe3
|
设备型号配置产品ID
|
2024-08-12 20:55:59 +08:00 |
|
墨大叔
|
91c924d69b
|
提现申请优化
|
2024-08-12 19:28:30 +08:00 |
|
墨大叔
|
babd77042e
|
提现转账优化
|
2024-08-12 19:14:35 +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 |
|
墨大叔
|
57398b8fe5
|
订单报表bug
|
2024-08-09 09:11:27 +08:00 |
|
墨大叔
|
66b948e120
|
API收费及各种优化
|
2024-08-08 17:54:35 +08:00 |
|
墨大叔
|
50b70e14ce
|
API收费标准建表
|
2024-08-08 11:45:58 +08:00 |
|
墨大叔
|
734c33dc18
|
商户中心
|
2024-08-08 10:42:57 +08:00 |
|
墨大叔
|
611c535acb
|
商户中心核心功能
|
2024-08-07 15:51:04 +08:00 |
|
墨大叔
|
f6b16a225b
|
debug:提现后剩余金额为0
|
2024-08-07 10:22:37 +08:00 |
|
墨大叔
|
ed4da3954e
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-08-07 10:19:31 +08:00 |
|
墨大叔
|
7f3212a4bf
|
debug:提现后剩余金额为0
|
2024-08-07 10:15:42 +08:00 |
|
墨大叔
|
85f7c37cc7
|
Merge remote-tracking branch 'origin/master'
|
2024-08-07 10:15:15 +08:00 |
|
墨大叔
|
caf14cbdf2
|
debug:提现后剩余金额为0
|
2024-08-07 10:14:58 +08:00 |
|
墨大叔
|
e68b3e85ab
|
debug:提现后剩余金额为0
|
2024-08-07 10:11:52 +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 |
|
墨大叔
|
995a89b0dc
|
设备租期
|
2024-08-06 10:38:17 +08:00 |
|
墨大叔
|
62d4326103
|
设备租期（未测试）
|
2024-08-05 17:55:44 +08:00 |
|
墨大叔
|
7f49032338
|
店铺申请debug
|
2024-08-05 16:01:21 +08:00 |
|
墨大叔
|
51a3056fa3
|
店铺申请
|
2024-08-05 15:42:45 +08:00 |
|
墨大叔
|
9b1ef44141
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-08-05 10:05:03 +08:00 |
|
墨大叔
|
4d9b5d28ba
|
debug:设备最近更新时间
|
2024-08-05 10:02:14 +08:00 |
|
墨大叔
|
8707c24350
|
临时提交
|
2024-08-03 18:04:56 +08:00 |
|
墨大叔
|
cd2eb5adec
|
debug
|
2024-08-03 13:51:24 +08:00 |
|
墨大叔
|
a2086e0ab1
|
归零逻辑更新，时长改为1秒
|
2024-08-03 10:29:38 +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 |
|
墨大叔
|
43af667f20
|
debug
|
2024-08-01 14:37:37 +08:00 |
|
墨大叔
|
93d6761f18
|
提现参数修改
|
2024-08-01 14:26:29 +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 |
|
墨大叔
|
65f5fc5234
|
临时提交
|
2024-07-30 15:08:05 +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 |
|
墨大叔
|
2eadd24576
|
提现金额不能小于20
|
2024-07-30 10:31:46 +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 |
|
墨大叔
|
32cfdffc06
|
Merge branch 'refs/heads/master' into dev
|
2024-07-29 14:57:44 +08:00 |
|
墨大叔
|
acdd27e5e4
|
debug
|
2024-07-29 14:57:22 +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 |
|
墨大叔
|
7fbf87ff3f
|
0元支付
|
2024-07-27 10:00:16 +08:00 |
|
墨大叔
|
9b59ab7e20
|
0元支付
|
2024-07-27 09:34:30 +08:00 |
|
墨大叔
|
14c283a011
|
新增时长订单（支付未完成）
|
2024-07-24 18:05:18 +08:00 |
|
墨大叔
|
922aedda0d
|
型号新增默认服务费值
|
2024-07-23 17:29:20 +08:00 |
|
墨大叔
|
d42b3fff75
|
新增月费功能
|
2024-07-23 16:27:23 +08:00 |
|
墨大叔
|
843314c5d3
|
提交
|
2024-07-23 09:11:43 +08:00 |
|
墨大叔
|
c778ca5abc
|
debug:设备操作提示优化
|
2024-07-22 17:45:59 +08:00 |
|
墨大叔
|
76f2bb2150
|
提交部署
|
2024-07-22 17:07:09 +08:00 |
|
墨大叔
|
eaa86d0ec3
|
余额变动，临时提交
|
2024-07-22 11:53:44 +08:00 |
|
墨大叔
|
8d753fbdbb
|
debug
|
2024-07-22 10:54:00 +08:00 |
|
墨大叔
|
49f1c50460
|
套餐排序，暂未测试
|
2024-07-22 10:19:40 +08:00 |
|
墨大叔
|
a44c907099
|
前台用户账号密码登录
|
2024-07-20 14:58:55 +08:00 |
|
墨大叔
|
b969fa2a52
|
秘钥缓存、WIFI、设备类名称重构
|
2024-07-19 17:48:58 +08:00 |
|
墨大叔
|
b3eb9b8313
|
debug秘钥
|
2024-07-18 18:52:12 +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 |
|
墨大叔
|
11fda9f59e
|
服务费调整、支付BUG修改
|
2024-07-16 14:44:00 +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 |
|
墨大叔
|
53e2a00a62
|
debug 店铺删除
|
2024-05-24 17:42:48 +08:00 |
|
墨大叔
|
36d1c75a55
|
debug 蓝牙充值、设备是否在线
|
2024-05-24 16:20:30 +08:00 |
|
墨大叔
|
8a1ad7c929
|
debug 蓝牙充值
|
2024-05-24 13:53:36 +08:00 |
|
墨大叔
|
6dcb9f123e
|
debug 蓝牙充值
|
2024-05-24 09:33:41 +08:00 |
|
墨大叔
|
5162eb39c2
|
debug
|
2024-05-23 09:31:16 +08:00 |
|