Commit Graph

121 Commits

Author SHA1 Message Date
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
zhujunshuai 0452a1d3cd 去掉限制 2023-03-21 14:06:08 +08:00
zhujunshuai 1aa2f8c5f0 取消提现限制 2023-03-21 13:47:32 +08:00
lyf 8ef03ab28f Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui 2023-03-20 15:14:51 +08:00
lyf 7509cb7323 四要素注销 2023-03-20 15:14:26 +08:00
zhujunshuai e132fa3112 update 2023-03-20 15:00:41 +08:00
lyf efc6019f59 更改部分文本细节 2023-03-20 10:14:47 +08:00
zhujunshuai f7f390befa 去掉随行付签名测试用 2023-03-17 15:07:42 +08:00
zhujunshuai c10814f3da 修改开户回调 2023-03-16 18:10:14 +08:00
lyf 334bf49033 银盛新增加部分 2023-03-10 15:44:58 +08:00
lyf afab60e572 银盛新增加部分 2023-03-06 18:01:20 +08:00
lyf 33950f8101 加入反扫金额校验 2023-02-24 15:11:06 +08:00
zhujunshuai 3010cd58f3 修改域名 2023-02-21 09:03:12 +08:00
lyf 0520d75bd8 四要素检测修改 2023-02-16 18:20:34 +08:00
lyf ca958158db 收款、余额、账单、收银点 2023-02-14 09:14:13 +08:00
lyf ff900668b2 '认证相关对接差不多' 2023-02-09 14:10:51 +08:00
zhujunshuai 023f923889 去掉只能一个终端登录限制 2023-02-08 11:51:13 +08:00
lyf 177b966237 Merge remote-tracking branch 'origin/master' 2023-02-03 14:47:06 +08:00
lyf 496b5bce2e 反扫调试结束 2023-02-03 14:45:03 +08:00
zhujunshuai 453052a936 解决冲突 2023-02-02 16:50:59 +08:00
zhujunshuai a0d5f0fb3c update 2023-02-02 16:46:35 +08:00
lyf b9b0330659 进件相关调试 2023-02-02 15:23:04 +08:00
lyf 00b256f4f7 银行卡绑定 2023-01-31 14:56:11 +08:00
lyf d557d6cb6b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/workspace.xml
#	pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class
2023-01-30 09:35:42 +08:00
lyf b5ddf6eb9d wap部分配置 2023-01-30 09:35:01 +08:00
zhujunshuai 20dc71421d 解决冲突 2023-01-29 14:28:01 +08:00
zhujunshuai 9a0b839abe delete 2023-01-29 14:22:32 +08:00
lyf c513d14203 wap部分配置 2023-01-29 10:36:30 +08:00
lyf 76c4265134 更改发送短信, 2023-01-28 17:21:04 +08:00
lyf b017339f5f 更改配置 2023-01-28 15:57:27 +08:00
lyf e1ff6a0eb7 更改部分配置问题 2023-01-28 15:43:04 +08:00
zhujunshuai 84774ece1d 修改开通商户同步生活项目域名 2023-01-17 16:45:00 +08:00
junshuai 62548736a7 add file 2022-07-23 13:54:07 +08:00