Merge branch 'develop' of http://192.168.0.110:11080/isc-v3.1/isc-funds into develop

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttfmt/register/settle/FttfmtSettleRegister.java

@@ -120,9 +120,9 @@ public class FttfmtSettleRegister implements ISettleRegister {
                                                         dsp,"C",acc1,"");
                 // ftdgrp.getCbs().getIns().getAmt() => getIntamt()
                 dbtKey2 = setglgService.setglgAddAmount(setglgVo,"TRN","TRO",setmodVo.getDoccur(),
-                                                        ftdgrp.getCbs().getIns().getAmt(), "","FID","C","","");
+                                                        ftdgrp.getCbs().getIns().getAmt(), "","FBD","C","","");
                 cdtKey = setglgService.setglgAddAmount(setglgVo,"TRN","TRO",setmodVo.getDoccur(),setmodVo.getSetamt().negate(),"",
-                                                           "PAC","C","","");
+                                                           "FBD","C","","");
                 setmodVo.setFeeclirol("TRO");
                 break;
         }

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttfmt/service/FttfmtTransactionServiceImpl.java

@@ -118,6 +118,7 @@ public class FttfmtTransactionServiceImpl extends AbstractTransactionService<Ftt
 
     @Override
     protected Map<String, String> txnCheck(FttfmtStoreBo transactionVo) {
+        transactionVo.getFtdgrp().getCbs().getOpn2().setAmt(transactionVo.getFtdgrp().getCbs().getMax().getAmt().add(transactionVo.getFtdgrp().getCbs().getIns().getAmt()));
         return fttfmtValidator.validate(transactionVo);
     }
 
@@ -155,6 +156,7 @@ public class FttfmtTransactionServiceImpl extends AbstractTransactionService<Ftt
         fttfmtStoreBo.setFtdgrp(ftdgrpVo);
         fttfmtStoreBo.getFtdgrp().getRec().setRat(ftdgrpVo.getRec().getRat());
         fttfmtStoreBo.getFtdgrp().getRec().setMatdat(ftdgrpVo.getRec().getMatdat());
+        fttfmtStoreBo.getFtdgrp().getCbs().getIns().setAmt(fttfmtStoreBo.getFtdgrp().getCbs().getMax().getAmt().multiply(ftdgrpVo.getRec().getRat()));
         init950(fttfmtStoreBo);
         init1000(fttfmtStoreBo);
         return fttfmtStoreBo;
@@ -162,8 +164,6 @@ public class FttfmtTransactionServiceImpl extends AbstractTransactionService<Ftt
 
     private void init950(FttfmtStoreBo fttfmtStoreBo) {
 
-
-
     }
 
     private void init1000(FttfmtStoreBo fttfmtStoreBo) {

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttpcm/service/FttpcmTransactionServiceImpl.java

@@ -133,6 +133,8 @@ public class FttpcmTransactionServiceImpl extends AbstractTransactionService<Ftt
            bizInfoVo.setEtyextkey(rec.getEtyextkey());
            bizInfoVo.setBranchInr(rec.getBranchinr());
            bizInfoVo.setValdat(rec.getValdat());
+           bizInfoVo.setMsgtyp(transactionVo.getFttp().getMsgtyp());
+
            return bizInfoVo;
     }
     @Override
@@ -184,6 +186,9 @@ public class FttpcmTransactionServiceImpl extends AbstractTransactionService<Ftt
         public void init1000(FttpcmStoreBo bo) {
 
            // bo.getFtdgrp().getCbs().getMax().setCur(xrtmodService.sysiso());
+           if( ! sysmodService.sptIsAnyLoaded(bo.getSpt().getSta()) ){
+                bo.getFttp().setMsgtyp( "202");
+           }
 
             if (bo.getFtdgrp().getRec().getOpndat() ==null ){
                 bo.getFtdgrp().getRec().setOpndat(Dates.today());

isc-funds-entity/src/main/java/com/brilliance/isc/funds/bo/funds/FttpcmStoreBo.java

@@ -2,7 +2,7 @@ package com.brilliance.isc.funds.bo.funds;
 
 import com.brilliance.isc.bo.model.Ftdgrp;
 import com.brilliance.isc.bo.model.Fttp;
-import com.brilliance.isc.common.transaction.vo.BaseTransactionVo;
+import com.brilliance.isc.common.setmod.vo.SetmodVo;import com.brilliance.isc.common.transaction.vo.BaseTransactionVo;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
@@ -11,6 +11,7 @@ import lombok.Data;
 public class FttpcmStoreBo extends BaseTransactionVo {
     private Ftdgrp ftdgrp;
 
+    private SetmodVo setmodVo;
     private Fttp fttp;
     @Override
     public void reset(){
@@ -24,5 +25,9 @@ public class FttpcmStoreBo extends BaseTransactionVo {
             fttp = new Fttp();
         }
         fttp.reset();
+        if (setmodVo == null){
+            setmodVo = new SetmodVo();
+        }
+        setmodVo.reset();
     }
 }

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

@@ -4,7 +4,7 @@ import com.brilliance.isc.bo.model.Ftdgrp;
 import com.brilliance.isc.bo.model.Fttp;
 import com.brilliance.isc.bo.model.Fxdgrp;
 import com.brilliance.isc.bo.model.Fxtp;
-import com.brilliance.isc.common.transaction.vo.BaseTransactionVo;
+import com.brilliance.isc.common.setmod.vo.SetmodVo;import com.brilliance.isc.common.transaction.vo.BaseTransactionVo;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
@@ -15,7 +15,7 @@ public class FttpcmStoreVo extends BaseTransactionVo {
     private Ftdgrp ftdgrp;
 
     private Fttp fttp;
-
+    private SetmodVo setmodVo;
     @Override
     public void reset() {
         super.reset();
@@ -28,6 +28,10 @@ public class FttpcmStoreVo extends BaseTransactionVo {
             fttp = new Fttp();
         }
         fttp.reset();
+          if (setmodVo == null){
+             setmodVo = new SetmodVo();
+        }
+          setmodVo.reset();
     }