Commit Graph

85 Commits

Author SHA1 Message Date
liuyingfang
89329bcd5a 用户状态部分修改 2023-07-13 15:29:09 +08:00
韩鹏辉
51c75f2c24 修改数据库链接为内网链接 2023-07-12 09:50:29 +08:00
韩鹏辉
f40c48fab9 升级创客 2023-07-11 14:59:07 +08:00
liuyingfang
8f1b329979 推广图片,短信名称,创客申请,和php联通 2023-07-11 14:08:24 +08:00
韩鹏辉
d47550f8df 升级创客 2023-07-10 17:14:18 +08:00
韩鹏辉
3691934e8a 修改提现记录 2023-07-06 18:16:08 +08:00
韩鹏辉
1df582f5f6 修改分润逻辑 2023-07-06 17:24:00 +08:00
liuyingfang
a473fd6457 D1D0数据同步,提现审核相关 2023-07-06 17:01:21 +08:00
liuyingfang
5beafd2970 注册相关,查询用户详情,后台切换通道相关 2023-07-04 10:51:41 +08:00
liuyingfang
faa73ce1bc 结算相关改动 2023-07-03 15:18:55 +08:00
liuyingfang
8e0583b460 支付宝认证,切换支付通道新逻辑,后台切换列表,推广三张图详情,关闭向充值服务请求, 2023-07-01 11:53:01 +08:00
liuyingfang
fe7e9f2074 增加角色相关,进件相关修改,后台增加用户默认通道,前台默认通道 2023-06-28 10:05:28 +08:00
liuyingfang
e26d85f4c9 结算信息逻辑修改(不同步),并且在外层展示用户选择的进件意愿 2023-06-26 17:55:45 +08:00
liuyingfang
c68b1919b5 增加实体类,以及部分逻辑修改 2023-06-26 09:19:40 +08:00
liuyingfang
7eaf21c7e8 银盛大改,增加D1通道 2023-06-21 09:34:28 +08:00
liuyingfang
766351e0f6 收银点改动 2023-06-15 10:33:22 +08:00
liuyingfang
70ae3a3420 实名唯一性判断,进件微小改动 2023-06-13 17:49:46 +08:00
韩鹏辉
8e4133d57e 添加pos 机退款接口 2023-06-13 11:23:44 +08:00
liuyingfang
064d32c93c pos账单查询 2023-06-13 11:17:42 +08:00
韩鹏辉
ade0f2ad0c 添加pos 机退款接口 2023-06-13 10:41:14 +08:00
liuyingfang
df26d12b1c Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui
# Conflicts:
#	pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
2023-06-13 10:34:40 +08:00
liuyingfang
5f1fd5bdbe pos付款相关 2023-06-13 10:31:11 +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
hankaikai
359c991123 "拉卡拉进件支付代码" 2023-06-09 17:54:30 +08:00
hankaikai
b370133857 "拉卡拉进件支付代码" 2023-06-09 16:26:53 +08:00
hankaikai
2527ffb4af "拉卡拉进件支付代码" 2023-06-09 15:24:35 +08:00
hankaikai
1d10ffa019 "拉卡拉进件支付代码" 2023-06-09 14:51:35 +08:00
hankaikai
2f13c101cc "拉卡拉进件支付代码" 2023-06-06 18:34:25 +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
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
1c35150b8a 放开部分接口,测试服改回测试数据库 2023-05-08 18:16:04 +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
9701fdf0b3 update 2023-04-19 15:20:08 +08:00
liuyingfang
aa31ef186d 修改部分 2023-04-18 10:59:35 +08:00
liuyingfang
9770e1f72a 拦截器拦截emoji 2023-04-14 15:49:21 +08:00