From 6667ee9ee0793fbd8d33720f8132e237bd1b9547 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 18 Feb 2023 18:37:13 +0800 Subject: [PATCH] fix car pay bug --- .../src/main/resources/db/migration/V20230200001__car.sql | 2 +- .../callback/car/fute/WxCarFuteCallBackController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V20230200001__car.sql b/mallinkAdmin/src/main/resources/db/migration/V20230200001__car.sql index f3ed15ddc..7e122aead 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V20230200001__car.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V20230200001__car.sql @@ -12,7 +12,7 @@ CREATE TABLE `wx_car_pay_order` ( `transaction_id` varchar(36) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信生成的订单号', `park_order_no` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '车场订单号', `merchant_account` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商户收款账户', - `merchant_id` int(20) NOT NULL COMMENT '商户编号', + `merchant_id` bigint(20) NOT NULL COMMENT '商户编号', `merchant_name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商户名称', `park_notify` int(1) NOT NULL DEFAULT '0' COMMENT '是否已通知车场EnumYesOrNo', `notify_fail_reason` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知失败原因', diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/fute/WxCarFuteCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/fute/WxCarFuteCallBackController.java index f0f7f5c7b..562b93676 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/fute/WxCarFuteCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/fute/WxCarFuteCallBackController.java @@ -38,7 +38,7 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("/futeCarCallback1") +@RequestMapping("/futeCarCallback") public class WxCarFuteCallBackController extends WxParkCallBackBaseController { @Autowired