提交代码

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());

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;
     }