韩鹏辉
|
7d9e3e00fb
|
添加修改通知
|
2023-08-11 16:15:50 +08:00 |
|
韩鹏辉
|
91b566cda3
|
添加修改通知
|
2023-08-11 15:26:37 +08:00 |
|
韩鹏辉
|
4de1c31c38
|
添加修改通知
|
2023-08-11 15:26:23 +08:00 |
liuyingfang
|
f2af33243f
|
VO,
|
2023-08-11 14:04:31 +08:00 |
|
韩鹏辉
|
742cd8e485
|
修改查询
|
2023-08-10 15:10:49 +08:00 |
|
韩鹏辉
|
b74e87c845
|
Merge remote-tracking branch 'origin/master'
|
2023-08-10 14:44:05 +08:00 |
|
韩鹏辉
|
eb662c7c05
|
修改查询
|
2023-08-10 14:43:38 +08:00 |
|
liuyingfang
|
0ae6cf60cf
|
推广宽图改版，商户列表，注册改版
|
2023-08-02 18:19:54 +08:00 |
|
liuyingfang
|
9e5aca8d74
|
推广部分最后修改
|
2023-07-27 09:53:50 +08:00 |
|
liuyingfang
|
817223d79f
|
推广部分小修改
|
2023-07-25 14:41:25 +08:00 |
|
liuyingfang
|
ae628adba4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java
# pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml
# pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/PromoterMainPageServiceImpl.java
|
2023-07-21 19:33:56 +08:00 |
|
liuyingfang
|
d4fe97d570
|
推广部分大改
|
2023-07-21 19:30:00 +08:00 |
|
韩鹏辉
|
994eb1a754
|
修改分佣
|
2023-07-21 19:25:55 +08:00 |
|
liuyingfang
|
b92f72b53e
|
替换收银呗字样，更改创客错误状态,更改提现时手机号显示,分享注册，提现算法列表,后台推广员列表补充推送
|
2023-07-18 15:37:00 +08:00 |
|
liuyingfang
|
0a7da333b2
|
替换收银呗字样，更改创客错误状态,更改提现时手机号显示,分享注册，提现算法列表,后台推广员列表·
|
2023-07-18 15:34:44 +08:00 |
|
韩鹏辉
|
542a1079a0
|
修改分佣算法添加异常费率判断处理
|
2023-07-14 16:41:37 +08:00 |
|
韩鹏辉
|
22179ce8de
|
Merge remote-tracking branch 'origin/master'
|
2023-07-13 16:41:14 +08:00 |
|
韩鹏辉
|
9a3d238371
|
修改分佣算法添加异常费率判断处理
|
2023-07-13 16:40:49 +08:00 |
|
liuyingfang
|
89329bcd5a
|
用户状态部分修改
|
2023-07-13 15:29:09 +08:00 |
|
韩鹏辉
|
67c4a1e858
|
修改分佣算法添加异常费率判断处理
|
2023-07-13 11:53:12 +08:00 |
|
韩鹏辉
|
bf6d441383
|
修改分佣算法添加异常费率判断处理
|
2023-07-12 17:44:20 +08:00 |
|
韩鹏辉
|
d5556450c3
|
修改分佣算法
|
2023-07-12 16:48:09 +08:00 |
|
韩鹏辉
|
a6e3fc2bcb
|
修改分佣算法
|
2023-07-12 14:06:08 +08:00 |
|
韩鹏辉
|
f40c48fab9
|
升级创客
|
2023-07-11 14:59:07 +08:00 |
|
liuyingfang
|
056bd8169d
|
补充推送
|
2023-07-11 14:09:22 +08:00 |
|
liuyingfang
|
8f1b329979
|
推广图片，短信名称，创客申请，和php联通
|
2023-07-11 14:08:24 +08:00 |
|
韩鹏辉
|
d47550f8df
|
升级创客
|
2023-07-10 17:14:18 +08:00 |
|
韩鹏辉
|
c131dc051b
|
添加对私非法人结算
|
2023-07-10 13:36:44 +08:00 |
|
韩鹏辉
|
bcaea4df88
|
修改队列数据
|
2023-07-07 18:00:54 +08:00 |
|
韩鹏辉
|
457b5ce724
|
修改时间格式
|
2023-07-07 17:35:54 +08:00 |
|
韩鹏辉
|
1df582f5f6
|
修改分润逻辑
|
2023-07-06 17:24:00 +08:00 |
|
liuyingfang
|
a473fd6457
|
D1D0数据同步，提现审核相关
|
2023-07-06 17:01:21 +08:00 |
|
韩鹏辉
|
f0174ef087
|
修改分润逻辑
|
2023-07-06 14:22:04 +08:00 |
|
liuyingfang
|
dfa5c6670f
|
银盛D1相关，提现部分改动，注册逻辑更改，后台切换通道
|
2023-07-05 17:01:33 +08:00 |
|
liuyingfang
|
5beafd2970
|
注册相关,查询用户详情,后台切换通道相关
|
2023-07-04 10:51:41 +08:00 |
|
liuyingfang
|
b426dfa12e
|
注册时加入代理商查询
|
2023-07-03 16:16:23 +08:00 |
|
韩鹏辉
|
38cd7b6402
|
修改注册逻辑
|
2023-07-03 15:39:57 +08:00 |
|
liuyingfang
|
faa73ce1bc
|
结算相关改动
|
2023-07-03 15:18:55 +08:00 |
|
韩鹏辉
|
dbf20ce758
|
添加拉卡拉设备绑定解绑功能
|
2023-07-03 15:08:46 +08:00 |
|
韩鹏辉
|
eaada0d4f9
|
添加拉卡拉设备绑定解绑功能
|
2023-07-03 14:34:54 +08:00 |
|
韩鹏辉
|
8e4d3f5137
|
添加拉卡拉设备绑定解绑功能
|
2023-07-03 14:25:51 +08:00 |
|
liuyingfang
|
8e0583b460
|
支付宝认证，切换支付通道新逻辑，后台切换列表，推广三张图详情，关闭向充值服务请求，
|
2023-07-01 11:53:01 +08:00 |
|
韩鹏辉
|
69049951c3
|
修改进件失败的提醒
|
2023-07-01 10:34:01 +08:00 |
|
韩鹏辉
|
ab18856816
|
提交
|
2023-06-30 11:23:30 +08:00 |
|
liuyingfang
|
fe7e9f2074
|
增加角色相关，进件相关修改，后台增加用户默认通道，前台默认通道
|
2023-06-28 10:05:28 +08:00 |
|
liuyingfang
|
e26d85f4c9
|
结算信息逻辑修改（不同步），并且在外层展示用户选择的进件意愿
|
2023-06-26 17:55:45 +08:00 |
|
liuyingfang
|
082d069909
|
博实结枚举
|
2023-06-26 11:11:35 +08:00 |
|
liuyingfang
|
c68b1919b5
|
增加实体类，以及部分逻辑修改
|
2023-06-26 09:19:40 +08:00 |
|
liuyingfang
|
8531da830c
|
银盛大改进件完成，增加银盛进件不成功逻辑
|
2023-06-21 17:26:13 +08:00 |
|
liuyingfang
|
7eaf21c7e8
|
银盛大改，增加D1通道
|
2023-06-21 09:34:28 +08:00 |
|
liuyingfang
|
2cb6f7de9a
|
Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui
|
2023-06-17 16:50:13 +08:00 |
|
韩鹏辉
|
1efdf1a3f6
|
修改模板启动顺序
|
2023-06-17 16:21:08 +08:00 |
|
liuyingfang
|
51537d9421
|
Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui
|
2023-06-17 15:41:12 +08:00 |
|
韩鹏辉
|
ab47d9eec8
|
添加模板依赖
|
2023-06-17 15:40:40 +08:00 |
|
liuyingfang
|
df19a15049
|
Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui
|
2023-06-17 15:20:44 +08:00 |
|
liuyingfang
|
d5b9107c6e
|
小程序店铺相关
|
2023-06-17 14:39:54 +08:00 |
|
韩鹏辉
|
d22b69d8c0
|
修改进件接口
|
2023-06-17 10:35:54 +08:00 |
|
韩鹏辉
|
0e926adf3d
|
修改进件接口
|
2023-06-15 10:32:21 +08:00 |
|
韩鹏辉
|
b1655b7f56
|
添加pos 机退款接口
|
2023-06-15 09:35:55 +08:00 |
|
韩鹏辉
|
400bbe6e0f
|
添加pos 机退款接口
|
2023-06-14 17:54:49 +08:00 |
|
韩鹏辉
|
f864f69d03
|
Merge remote-tracking branch 'origin/master'
|
2023-06-14 16:07:12 +08:00 |
|
韩鹏辉
|
c1f8056629
|
添加pos 机退款接口
|
2023-06-14 16:06:34 +08:00 |
|
liuyingfang
|
70ae3a3420
|
实名唯一性判断，进件微小改动
|
2023-06-13 17:49:46 +08:00 |
|
韩鹏辉
|
8e4133d57e
|
添加pos 机退款接口
|
2023-06-13 11:23:44 +08:00 |
|
韩鹏辉
|
b0104531df
|
Merge remote-tracking branch 'origin/master'
|
2023-06-13 10:10:21 +08:00 |
|
韩鹏辉
|
0dba7bcfb9
|
添加pos 机退款接口
|
2023-06-13 10:08:57 +08:00 |
|
liuyingfang
|
cbad5d16b7
|
Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui
|
2023-06-12 16:14:05 +08:00 |
|
liuyingfang
|
3dae9f31e4
|
pos相关
|
2023-06-12 16:13:52 +08:00 |
|
韩鹏辉
|
02b3038538
|
新增拉卡拉退款接口
|
2023-06-12 14:59:24 +08:00 |
|
韩鹏辉
|
704ab93093
|
修改支付类型
|
2023-06-12 14:05:48 +08:00 |
|
韩鹏辉
|
7d62be44ea
|
修改支付类型
|
2023-06-12 13:58:08 +08:00 |
hankaikai
|
b370133857
|
"拉卡拉进件支付代码"
|
2023-06-09 16:26:53 +08:00 |
|
hankaikai
|
2527ffb4af
|
"拉卡拉进件支付代码"
|
2023-06-09 15:24:35 +08:00 |
|
hankaikai
|
3c7b7ad5a7
|
"拉卡拉进件支付代码"
|
2023-06-09 15:09:37 +08:00 |
|
hankaikai
|
e25b298447
|
"拉卡拉进件支付代码"
|
2023-06-09 09:06:38 +08:00 |
|
hankaikai
|
ae39099b41
|
"拉卡拉进件支付代码"
|
2023-06-08 16:28:19 +08:00 |
|
hankaikai
|
a6145b884f
|
"拉卡拉进件支付代码"
|
2023-06-08 15:33:56 +08:00 |
|
hankaikai
|
55824b1964
|
"拉卡拉进件支付代码"
|
2023-06-08 15:33:04 +08:00 |
|
hankaikai
|
2214055e3b
|
"拉卡拉进件支付代码"
|
2023-06-08 14:45:57 +08:00 |
|
hankaikai
|
1ce8f58690
|
"拉卡拉进件支付代码"
|
2023-06-08 14:10:11 +08:00 |
|
hankaikai
|
9c8acfd108
|
"拉卡拉进件支付代码"
|
2023-06-08 14:09:07 +08:00 |
|
hankaikai
|
0257043454
|
"拉卡拉进件支付代码"
|
2023-06-08 13:38:27 +08:00 |
|
hankaikai
|
61d2ffb8fa
|
"拉卡拉进件支付代码"
|
2023-06-08 11:37:52 +08:00 |
|
hankaikai
|
53437eea3e
|
"拉卡拉进件支付代码"
|
2023-06-07 17:18:22 +08:00 |
|
hankaikai
|
c0bdfdff5d
|
"拉卡拉进件支付代码"
|
2023-06-06 18:27:57 +08:00 |
|
liuyingfang
|
fd84e2d469
|
更改文字，更改AppGuide字段，实名逻辑更改，收银点判断逻辑更改，RSA相关
|
2023-06-06 18:23:13 +08:00 |
|
hankaikai
|
eeffe90fc7
|
"拉卡拉进件支付代码"
|
2023-06-05 16:39:07 +08:00 |
|
hankaikai
|
6102029af0
|
Merge remote-tracking branch 'origin/master'
|
2023-06-05 14:28:43 +08:00 |
|
hankaikai
|
ecbdd3f0b1
|
"拉卡拉进件支付代码"
|
2023-06-05 14:27:09 +08:00 |
|
liuyingfang
|
fffecb1535
|
Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui
# Conflicts:
# pluss-manage-page/src/main/resources/application-dev.yml
|
2023-06-03 09:24:28 +08:00 |
|
liuyingfang
|
3c6085805f
|
设备商城金额换成真实，配置文件更改，配置微信模板消息，快递鸟相关
|
2023-06-03 09:22:51 +08:00 |
|
hankaikai
|
c29c10c193
|
"拉卡拉进件支付代码"
|
2023-06-01 17:14:02 +08:00 |
|
hankaikai
|
b7793fe1ff
|
"设备规格修改"
|
2023-05-23 11:38:33 +08:00 |
|
liuyingfang
|
01335276c7
|
后台协议添加，快递鸟相关常数，正式服务器相关参数改动，快递鸟相关接口，苹果相关cid配置，改变提示，登录接口改为post请求，微信跳转连接
|
2023-05-22 16:34:08 +08:00 |
|
liuyingfang
|
329aafb487
|
IOS端公众号app相关，更改401错误码message，更改getAccessToken方法，银盛部分相关，四要素新增错误码
|
2023-05-17 09:18:16 +08:00 |
|
liuyingfang
|
4a5bc0dd25
|
收银呗改为快银收银，部分调整
|
2023-05-08 11:00:47 +08:00 |
|
liuyingfang
|
f8a583063f
|
VIP数据同步，部分调整
|
2023-05-05 18:25:57 +08:00 |
|
liuyingfang
|
87b056b47f
|
银盛以及部分逻辑
|
2023-04-27 18:39:50 +08:00 |
|
liuyingfang
|
b5174dce3d
|
后台主页逻辑加规则，账单详情改变接口传参方式，vip同步小程序，后台营业执照日期格式，银盛回调暂时在测试服上
|
2023-04-25 16:36:31 +08:00 |
zhujunshuai
|
69eea7ab5f
|
退款更改
|
2023-04-24 14:47:28 +08:00 |