汇入清算保存

isc-funds-business/src/main/java/com/brilliance/isc/funds/crtcri/register/settle/CrtcriSettleRegister.java

@@ -10,7 +10,6 @@ import com.brilliance.isc.common.setmod.service.SetmodService;
 import com.brilliance.isc.common.setmod.vo.SetmodVo;
 import com.brilliance.isc.common.vo.PtsptaVo;
 import com.brilliance.isc.funds.crtcri.service.CrtcriTransactionServiceImpl;
-import com.brilliance.isc.mda.dao.ActMapper;
 import com.brilliance.isc.vo.funds.CrdBizInfoVo;
 import com.brilliance.mda.runtime.mda.util.MdaUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +20,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
 
+import static com.brilliance.mda.runtime.mda.Constants.CR;
 import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
 
 /**
@@ -50,9 +50,6 @@ public class CrtcriSettleRegister implements ISettleRegister {
     CrtcriTransactionServiceImpl crtcriTransactionService;
 
 
-    @Autowired
-    private ActMapper actMapper;
-
     @Override
     public void registerSettlement(SetmodVo setmodVo) {
         transRegister(setmodVo);
@@ -71,6 +68,7 @@ public class CrtcriSettleRegister implements ISettleRegister {
             maxCur = setmodVo.getCbsMap().get("MAX").getCur();
         }
         setmodVo.setDocamt(maxAmt);
+        setmodVo.setOpnamt(maxAmt);
         SetglgVo setglg = setmodVo.getSetglg();
         setglgService.setglgClrAmount(setglg, "TRN");
 
@@ -86,8 +84,11 @@ public class CrtcriSettleRegister implements ISettleRegister {
         String dbtKey = setmodService.setGlgAmt(setmodVo, "TRN", rol, setmodVo.getDoccur(), maxAmt, "");
         if (!MdaUtils.isEmpty(rec.getForare())) {
 //            this.getTrnmod().getTrnism().setDefDsp(rol, "D", "NOD" + CR + "VOD" + CR + "ARD");
+            setmodService.setDefDsp(setmodVo, rol, "D", "NOD" + CR + "VOD" + CR + "ARD");
         } else {
 //            this.getTrnmod().getTrnism().setDefDsp(rol, "D", "NOD" + CR + "VOD");
+            setmodService.setDefDsp(setmodVo, rol, "D", "NOD" + CR + "VOD");
+
         }
         String act = rec.getRcvactExtkey();
         Act rcvact = null;

isc-funds-business/src/main/java/com/brilliance/isc/funds/crtcri/service/CrtcriTransactionServiceImpl.java

@@ -146,6 +146,7 @@ public class CrtcriTransactionServiceImpl extends AbstractTransactionService<Crt
 
     @Override
     protected void txnSave(CrtcriStoreBo transactionVo) {
+        defaultCrdgrpRecNamN1000(transactionVo);
         ruleMtabutSavN500(transactionVo);
     }
 
@@ -219,6 +220,10 @@ public class CrtcriTransactionServiceImpl extends AbstractTransactionService<Crt
         bizInfoVo.setRcvobjtyp(rec.getRcvobjtyp());
         Cpd cpd = transactionVo.getCpdgrp().getRec();
         bizInfoVo.setValdat(cpd.getValdat());
+
+        bizInfoVo.setBranchInr(rec.getBranchinr());
+        bizInfoVo.setBchkeyinr(rec.getBchkeyinr());
+        bizInfoVo.setOwnref(rec.getOwnref());
         return bizInfoVo;
     }
 

isc-funds-entity/src/main/java/com/brilliance/isc/funds/vo/funds/CrtcriStoreVo.java

@@ -4,9 +4,9 @@ import com.brilliance.isc.bo.Smh;
 import com.brilliance.isc.bo.SptVo;
 import com.brilliance.isc.common.nosmod.vo.NosmodVo;
 import com.brilliance.isc.common.transaction.vo.BaseTransactionVo;
+import com.brilliance.isc.common.vo.ActVo;
 import com.brilliance.isc.vo.funds.CrdgrpVo;
 import com.brilliance.isc.vo.funds.CrtpVo;
-import com.brilliance.isc.vo.manager.ActVo;
 import com.brilliance.isc.vo.model.*;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;