Commit Graph

121 Commits

Author SHA1 Message Date
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