Merge remote-tracking branch 'origin/dev' into yy_dev

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<String, Object> 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
 }