Commit Graph

292 Commits

Author SHA1 Message Date
韩鹏辉
69049951c3 修改进件失败的提醒 2023-07-01 10:34:01 +08:00
韩鹏辉
ab18856816 提交 2023-06-30 11:23:30 +08:00
liuyingfang
fe7e9f2074 增加角色相关,进件相关修改,后台增加用户默认通道,前台默认通道 2023-06-28 10:05:28 +08:00
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
0f6cc8d945 Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui 2023-06-19 11:47:45 +08:00
韩鹏辉
81e22e37a8 添加html 模板配置 2023-06-19 11:47:10 +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
e473a8a736 银收客log相关 2023-06-17 15:21:53 +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
liuyingfang
766351e0f6 收银点改动 2023-06-15 10:33:22 +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
liuyingfang
064d32c93c pos账单查询 2023-06-13 11:17:42 +08:00
韩鹏辉
ade0f2ad0c 添加pos 机退款接口 2023-06-13 10:41:14 +08:00
liuyingfang
87fb7091b4 实体类 2023-06-13 10:38:15 +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
韩鹏辉
704ab93093 修改支付类型 2023-06-12 14:05:48 +08:00
韩鹏辉
7d62be44ea 修改支付类型 2023-06-12 13:58:08 +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
3c7b7ad5a7 "拉卡拉进件支付代码" 2023-06-09 15:09:37 +08:00
hankaikai
1d10ffa019 "拉卡拉进件支付代码" 2023-06-09 14:51:35 +08:00
liuyingfang
7671e3eeb6 Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui 2023-06-09 10:02:39 +08:00
liuyingfang
f016398d3d cidIOS和安卓相同 2023-06-09 09:59:05 +08:00
hankaikai
e25b298447 "拉卡拉进件支付代码" 2023-06-09 09:06:38 +08:00
hankaikai
de1e0f402b "拉卡拉进件支付代码" 2023-06-08 16:53:45 +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