Commit Graph

310 Commits

Author SHA1 Message Date
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
zhujunshuai 4fd5d1dbaa 退款功能增加 2023-04-24 10:55:06 +08:00
liuyingfang 0b76bc417d 修改部分,微信模板消息会员费率变动 2023-04-21 15:03:24 +08:00
liuyingfang 6af4f70998 修改部分,微信推送事件 2023-04-21 13:50:12 +08:00
liuyingfang 082896aabc 修改部分,微信推送事件,lkl的部分配置 2023-04-20 15:29:59 +08:00
zhujunshuai 73fdf1b517 update 2023-04-19 16:53:47 +08:00
zhujunshuai 263b6b9849 update 2023-04-19 16:53:06 +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 9770e1f72a 拦截器拦截emoji 2023-04-14 15:49:21 +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
zhujunshuai 17ec8176fc Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui 2023-04-12 14:05:07 +08:00
zhujunshuai 6eac88b2c3 更改地址 2023-04-12 14:04:53 +08:00
liuyingfang 690f9a0e4f
!1 pos以及银盛
Merge pull request !1 from liuyingfang/ys
2023-04-12 02:33:54 +00: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
liuyingfang 403df2b287 pos机部分逻辑 2023-04-12 10:27:55 +08: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 6daf1025f5 update 2023-04-07 18:00:24 +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 7ec1efa6b9 增加推送 2023-04-06 09:52:11 +08:00
zhujunshuai e01e8145b1 update 2023-04-06 09:51:26 +08:00
zhujunshuai d7e41884f5 update 2023-04-04 18:21:51 +08:00
zhujunshuai a0a3da7a42 update 2023-04-04 18:21:04 +08:00
zhujunshuai dedd4e60e2 update 2023-04-04 13:28:29 +08:00
zhujunshuai 7de9df5f08 Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui 2023-04-04 11:11:09 +08:00
zhujunshuai cd8d91d067 增加推送 2023-04-04 11:10:53 +08:00
zhujunshuai c03a65f653 增加推送功能 2023-04-04 11:09:40 +08:00
lyf ae57fea6b5 支付宝支付ui更改 2023-04-03 09:19:26 +08:00
lyf 39eb6237f8 银盛修复部分代码 2023-04-01 17:31:52 +08:00
lyf a3e96fa81a 后台将收银呗改为快银 2023-03-31 10:49:43 +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
lyf e1470566c6 pos机验证机制更改usercode字段 2023-03-24 17:25:40 +08:00
lyf 38ca560cd6 pos机验证机制 2023-03-24 17:24:43 +08:00