From 37581518e03415e1df4d3319a5d467c38fd4af17 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Thu, 4 Aug 2022 16:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cweb/controller/pay/OrderController.java | 3 ++- .../src/main/java/com/hai/config/JinZhuJiaYouService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java index 86a648c6..583037c1 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java @@ -420,7 +420,8 @@ public class OrderController { } // 来源类型 1：平台自建 2：团油 - if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) { + if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber()) + || store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) { BigDecimal account = new BigDecimal("0"); // 查询账号余额 HighMerchantAccount merAccount = merchantAccountService.getStoreAccountDetail(store.getMerchantId()); diff --git a/hai-service/src/main/java/com/hai/config/JinZhuJiaYouService.java b/hai-service/src/main/java/com/hai/config/JinZhuJiaYouService.java index 8cbb5bc7..45fe01ba 100644 --- a/hai-service/src/main/java/com/hai/config/JinZhuJiaYouService.java +++ b/hai-service/src/main/java/com/hai/config/JinZhuJiaYouService.java @@ -133,7 +133,7 @@ public class JinZhuJiaYouService { if (repsObject == null || !repsObject.getInteger("status").equals(200) || !repsObject.getString("type").equals("OK")) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, repsObject == null?"请求失败":repsObject.getString("title")); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, repsObject == null?"请求失败":repsObject.getString("detail")); } return repsObject; }