Commit Graph

82 Commits

Author SHA1 Message Date
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
zhujunshuai 3e7655cd96 Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui 2023-04-24 10:55:47 +08:00
zhujunshuai c095746fba 退款功能增加 2023-04-24 10:55:31 +08:00
liuyingfang 0b76bc417d 修改部分,微信模板消息会员费率变动 2023-04-21 15:03:24 +08:00
liuyingfang 082896aabc 修改部分,微信推送事件,lkl的部分配置 2023-04-20 15:29:59 +08:00
zhujunshuai 31e93abce9 更改推送 2023-04-19 15:21:41 +08:00
zhujunshuai 9701fdf0b3 update 2023-04-19 15:20:08 +08:00
zhujunshuai 234842cd9d Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui 2023-04-18 11:00:08 +08:00
zhujunshuai 89c2147c65 Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui 2023-04-18 10:59:39 +08:00
liuyingfang aa31ef186d 修改部分 2023-04-18 10:59:35 +08:00
zhujunshuai 7e96155e8d 设备商城支付开发 2023-04-18 10:59:24 +08:00
liuyingfang 4446877297 Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui 2023-04-14 13:56:41 +08:00
liuyingfang c9df5137cb 与小程序联调 2023-04-14 13:56:28 +08:00
zhujunshuai c14ab93262 登录增加同步充值服务功能 2023-04-14 13:55:44 +08:00
zhujunshuai 59fd9ee9f5 update 2023-04-14 11:31:04 +08:00
zhujunshuai a87f114e5b 增加登录同步到充值业务功能 2023-04-14 11:29:40 +08:00
liuyingfang 6491ed9c7f pos缺失VO 2023-04-13 09:29:49 +08:00
liuyingfang 665a7bc8a6 Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui into ys
Signed-off-by: liuyingfang <8517512+liuyingfang@user.noreply.gitee.com>
2023-04-12 02:33:07 +00:00
zhujunshuai 9c0608c42d 更改appid 2023-04-10 17:28:05 +08:00
lyf cb4ec5d64e 银盛调试可以签约 2023-04-10 16:49:59 +08:00
zhujunshuai dfb187b789 小程序切换 2023-04-10 10:43:41 +08:00
zhujunshuai 29ff052e5f update 2023-04-07 18:00:58 +08:00
zhujunshuai 2a06b2e866 修改推送 2023-04-07 17:04:16 +08:00
lyf a5db6104bb 银盛相关所有 2023-04-07 14:01:27 +08:00
zhujunshuai 1f5854b5ad update 2023-04-06 09:54:29 +08:00
zhujunshuai 7088eb633d 增加推送 2023-04-06 09:52:45 +08:00
zhujunshuai e01e8145b1 update 2023-04-06 09:51:26 +08:00
zhujunshuai a0a3da7a42 update 2023-04-04 18:21:04 +08:00
zhujunshuai 7de9df5f08 Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui 2023-04-04 11:11:09 +08:00
zhujunshuai c03a65f653 增加推送功能 2023-04-04 11:09:40 +08:00
lyf 39eb6237f8 银盛修复部分代码 2023-04-01 17:31:52 +08:00
lyf 515dc85a8a 扫码pos机支付,改之前的部分bug 2023-03-30 11:04:46 +08:00
lyf 38d3ad79c8 pos支付相关 2023-03-28 18:05:39 +08:00
zhujunshuai 1a329d34e1 更改分润通知小数点位数 2023-03-24 14:36:14 +08:00
lyf 5a146be7d9 邀请码校验 2023-03-23 16:57:31 +08:00