From a9fa2273f5bc4f40ee6ee7b67be79e1e23a88de6 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 25 Oct 2023 12:04:25 +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 --- .../service/TianQueFundManageService.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/service/src/main/java/com/hfkj/channel/tianque/service/TianQueFundManageService.java b/service/src/main/java/com/hfkj/channel/tianque/service/TianQueFundManageService.java index 3ba697c..eb61434 100644 --- a/service/src/main/java/com/hfkj/channel/tianque/service/TianQueFundManageService.java +++ b/service/src/main/java/com/hfkj/channel/tianque/service/TianQueFundManageService.java @@ -38,11 +38,7 @@ public class TianQueFundManageService { * @return */ public JSONObject orgTransfer(String mno, String orderNo, BigDecimal amount,String remark, String investor) { -<<<<<<< HEAD - log.info("========= Start 营销转账 Start ==========="); -======= log.info("========= Start 营销转账接口 Start ==========="); ->>>>>>> pre Map param = new HashMap<>(); param.put("mno", mno); param.put("orderNo", orderNo); @@ -56,15 +52,10 @@ public class TianQueFundManageService { System.out.println("body：" + JSONObject.toJSONString(param)); System.out.println("response：" + responseBody.toJSONString()); if (!"0000".equals(responseBody.getString("bizCode"))) { -<<<<<<< HEAD - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseBody.getString("bizMsg")); - } - log.info("========= END 营销转账 END ==========="); -======= throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.COMMON_ERROR, responseBody.getString("bizMsg")); } - log.info("========= END 营销转账接口 END ==========="); ->>>>>>> pre + + log.info("========= END 营销转账 END ==========="); return responseBody; } @@ -84,17 +75,9 @@ public class TianQueFundManageService { System.out.println("body：" + JSONObject.toJSONString(param)); System.out.println("response：" + responseBody.toJSONString()); if (!"0000".equals(responseBody.getString("bizCode"))) { -<<<<<<< HEAD - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseBody.getString("bizMsg")); -======= throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.COMMON_ERROR, responseBody.getString("bizMsg")); ->>>>>>> pre } log.info("========= END 营销转账 END ==========="); return responseBody; } -<<<<<<< HEAD -======= - ->>>>>>> pre }