Commit Graph

173 Commits

Author SHA1 Message Date
韩鹏辉 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
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 3f018b54dd "拉卡拉进件支付代码" 2023-06-08 10:53:09 +08:00
hankaikai 53437eea3e "拉卡拉进件支付代码" 2023-06-07 17:18:22 +08:00
hankaikai 2f13c101cc "拉卡拉进件支付代码" 2023-06-06 18:34:25 +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
hankaikai 20961894dc "拉卡拉进件支付代码" 2023-06-03 14:12:25 +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 6f6938daa4 "拉卡拉进件支付代码" 2023-05-25 11:02:39 +08:00
hankaikai e32605226d "设备" 2023-05-24 18:06:02 +08:00