提交代码

cweb/src/main/java/com/cweb/controller/BsMerLedgerController.java

@@ -1,5 +1,6 @@
 package com.cweb.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hfkj.common.exception.ErrorCode;
@@ -51,6 +52,7 @@ public class BsMerLedgerController {
     @ApiOperation(value = "商户分账功能申请")
     public ResponseData merLedgerApply(@RequestBody BsMerLedger body) {
         try {
+            System.out.println("请求参数：" + JSONObject.toJSONString(body));
             if (body.getMerId() == null || body.getPlatformType() == null) {
                 log.error("BsDeviceOrderPayController -> payOrder error!","参数校验失败");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");

service/src/main/java/com/hfkj/channel/lakala/LaKaLaLedgerService.java

@@ -103,7 +103,7 @@ public class LaKaLaLedgerService {
 
         BsMerLedgerApply merLedgerApply = new BsMerLedgerApply();
         merLedgerApply.setMerLedgerId(merLedger.getId());
-        merLedgerApply.setMerId(merLedger.getId());
+        merLedgerApply.setMerId(merLedger.getMerId());
         merLedgerApply.setOrderNo(orderNo);
         merLedgerApply.setRequestBody(JSONObject.toJSONString(requestMap));
 
@@ -111,6 +111,9 @@ public class LaKaLaLedgerService {
         if (!responseBody.getString("retCode").equals("000000")) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseBody.getString("retMsg"));
         }
+        merLedger.setStatus(MerLedgerStatusEnum.status2.getNumber());
+        merLedgerService.editMerLedger(merLedger);
+
         System.out.println("body：" + JSONObject.toJSONString(commonParam));
         System.out.println("response：" + responseBody.toJSONString());
         merLedgerApply.setApplyId(responseBody.getJSONObject("respData").getString("applyId"));