提交代码

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

@@ -3,6 +3,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.config.CommonSysConst;
 import com.hfkj.entity.*;
 import com.hfkj.service.*;
 import com.hfkj.sysenum.*;
@@ -148,11 +149,14 @@ public class LaKaLaController {
                         // 延迟3秒
                         Thread.sleep(3000);
 
+                        String notifyUrl = CommonSysConst.getSysConfig().getDomainName()+"/crest/merWithdrawal/notify?cupNo="+merLedger.getCupNo();
+
                         // 配置账户自动结算
-                        laKaLaWalletService.ewalletSettleProfile(1,merLedger.getCupNo(), "02", "06");
+                        laKaLaWalletService.ewalletSettleProfile(1,merLedger.getCupNo(), "02", "06", notifyUrl);
 
                         // 配置分账接收方账户自动结算
-                        laKaLaWalletService.ewalletSettleProfile(2,merLedger.getReceiverNo(), "02", "06");
+                        laKaLaWalletService.ewalletSettleProfile(2,merLedger.getReceiverNo(), "02", "06", notifyUrl);
+
                     } else {
                         merLedger.setStatus(MerLedgerStatusEnum.status3.getNumber());
                         merLedger.setRejectReason(respData.getString("remark"));

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

@@ -252,13 +252,14 @@ public class LaKaLaWalletService {
 
     /**
      * 账管家提款模式设置
-     * @param merCupType      商户号类型  1：商户号  2：分账接收方账户
-     * @param merCupNo       商户号
+     * @param merCupType     商户号类型  1：商户号  2：分账接收方账户
+     * @param merCupNo      商户号
      * @param settleType   	提款模式（01主动提款 02自动结算）
      * @param settleTime    结算时间（小时）- 默认值：06。如08:00-09:00到账，则传入08
+     * @param notifyUrl     通知地址
      * @return
      */
-    public JSONObject ewalletSettleProfile(Integer merCupType,String merCupNo, String settleType, String settleTime) {
+    public JSONObject ewalletSettleProfile(Integer merCupType,String merCupNo, String settleType, String settleTime,String notifyUrl) {
         BsMer mer = null;
 
         if (merCupType.equals(1)) {
@@ -299,7 +300,7 @@ public class LaKaLaWalletService {
         map.put("mercId", merCupNo);
         map.put("settleType", settleType);
         map.put("settleTime", settleTime);
-        map.put("notifyUrl", CommonSysConst.getSysConfig().getDomainName());
+        map.put("notifyUrl", notifyUrl);
         param.put("reqData", map);
 
         // 生成签名