提交代码

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

@@ -31,7 +31,7 @@ import java.util.Map;
  * @date: 2023/4/21
  **/
 @Controller
-@Api(value = "设备管理")
+@Api(value = "商户分账功能")
 @RequestMapping(value = "/merLedger")
 public class BsMerLedgerController {
 

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

@@ -1,6 +1,7 @@
 package com.cweb.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.hfkj.common.utils.DateUtil;
 import com.hfkj.common.utils.ResponseMsgUtil;
 import com.hfkj.entity.BsMer;
 import com.hfkj.entity.BsMerPlatformNo;
@@ -13,6 +14,7 @@ import com.hfkj.sysenum.MerWithdrawalStatusEnum;
 import com.hfkj.sysenum.PlatformTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -58,7 +60,7 @@ public class BsMerWithdrawalController {
                 merWithdrawal.setPlatformType(PlatformTypeEnum.type1.getNumber());
                 if (merPlatform != null) {
                     merWithdrawal.setMerId(merPlatform.getMerId());
-                    merWithdrawal.setMerNo(merWithdrawal.getMerNo());
+                    merWithdrawal.setMerNo(merPlatform.getMerNo());
                     merWithdrawal.setPlatformNo(merPlatform.getPlatformNo());
                     merWithdrawal.setCupNo(merPlatform.getCupNo());
                     // 查询商户
@@ -79,7 +81,10 @@ public class BsMerWithdrawalController {
             merWithdrawal.setSettleNo(respData.getString("settleNo"));
             merWithdrawal.setBankNo(respData.getString("bankNo"));
             merWithdrawal.setBankName(respData.getString("nbkName"));
-            merWithdrawal.setCompleteTime(respData.getDate("completeTime"));
+            merWithdrawal.setCreateTime(DateUtil.format(respData.getString("createdTime"), "yyyy-MM-dd HH:mm:ss"));
+            if (StringUtils.isNotBlank(respData.getString("completeTime"))) {
+                merWithdrawal.setCompleteTime(DateUtil.format(respData.getString("completeTime"), "yyyy-MM-dd HH:mm:ss"));
+            }
 
 /*          DRAW.ACCEPTED 提款已受理
             DRAW.FREEZE 提款冻结

cweb/src/main/java/com/cweb/notify/LaKaLaController.java

@@ -2,6 +2,7 @@ package com.cweb.notify;
 
 import com.alibaba.fastjson.JSONObject;
 import com.hfkj.channel.lakala.LaKaLaLedgerService;
+import com.hfkj.channel.lakala.LaKaLaWalletService;
 import com.hfkj.entity.*;
 import com.hfkj.service.*;
 import com.hfkj.sysenum.*;
@@ -49,6 +50,8 @@ public class LaKaLaController {
     private BsMerLedgerReceiverApplyService merLedgerReceiverApplyService;
     @Resource
     private LaKaLaLedgerService laKaLaLedgerService;
+    @Resource
+    private LaKaLaWalletService laKaLaWalletService;
 
     @RequestMapping(value="/microPay",method = RequestMethod.POST)
     @ResponseBody

service/src/main/java/com/hfkj/service/impl/BsMerWithdrawalServiceImpl.java

@@ -22,8 +22,10 @@ public class BsMerWithdrawalServiceImpl implements BsMerWithdrawalService {
 
     @Override
     public void editData(BsMerWithdrawal merWithdrawal) {
-        if (merWithdrawal.getId() == null) {
+        if (merWithdrawal.getCreateTime() == null) {
             merWithdrawal.setCreateTime(new Date());
+        }
+        if (merWithdrawal.getId() == null) {
             merWithdrawal.setUpdateTime(new Date());
             merWithdrawalMapper.insert(merWithdrawal);
         } else {