Fttpcn修改

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttpcm/register/settle/FttpcmSettleRegister.java

@@ -44,7 +44,7 @@ public class FttpcmSettleRegister implements ISettleRegister {
         String dbtKey = NULLSTR;
 		String cdtKey = NULLSTR;
 
-        dbtKey = setglgService.setglgAddAmount(setglg,"TRN","OWN",setmodVo.getDoccur(),setmodVo.getDocamt(),"","FTD","D","","");
+        dbtKey = setglgService.setglgAddAmount(setglg,"TRN","OWN",setmodVo.getDoccur(),setmodVo.getDocamt(),"","FTD","C","","");
         cdtKey = setglgService.setglgAddAmount(setglg,"TRN","TRO",setmodVo.getDoccur(),setmodVo.getDocamt(),"","FTD","C","","");
 
              setmodVo.setFeeclirol("TRO");

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

@@ -81,7 +81,7 @@ public class FttpcmTransactionServiceImpl extends AbstractTransactionService<Ftt
        TrnmodVo trnmodVo = transactionHelpService.getTransactionStoreSet().getTrnmodVo();
        ftToolComponent.getref(bo.getFtdgrp());
        bo.getFtdgrp().getRec().setCnfdat(Dates.today());
-       ftToolComponent.sav(bo.getFtdgrp(),BigDecimal.ZERO);
+       ftToolComponent.sav(bo.getFtdgrp());
        // 2. Build Transaction from FTDGRP
        trnmodService.trnSetFromContract(trnmodVo);
        cbsSav(bo, trnmodVo);
@@ -130,8 +130,8 @@ public class FttpcmTransactionServiceImpl extends AbstractTransactionService<Ftt
            bizInfoVo.setRat(rec.getRat());
            bizInfoVo.setBranchInr(rec.getBranchinr());
            bizInfoVo.setEtyextkey(rec.getEtyextkey());
-           bizInfoVo.setAmt(rec.getAmt());
            bizInfoVo.setBranchInr(rec.getBranchinr());
+           bizInfoVo.setValdat(rec.getValdat());
            return bizInfoVo;
     }
     @Override
@@ -180,9 +180,6 @@ public class FttpcmTransactionServiceImpl extends AbstractTransactionService<Ftt
             return fttpcmStoreBo;
         }
 
-        /**
-         * source:fxtfop.0001.script
-         */
         public void init1000(FttpcmStoreBo bo) {
 
            // bo.getFtdgrp().getCbs().getMax().setCur(xrtmodService.sysiso());

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttpcn/service/FttpcnTransactionServiceImpl.java

@@ -68,7 +68,7 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
     public void ruleMtabutSavN500(FttpcnStoreBo fttpcnStoreBo){
         TrnmodVo trnmodVo = transactionHelpService.getTransactionStoreSet().getTrnmodVo();
         ftToolComponent.getref(fttpcnStoreBo.getFtdgrp());
-        ftToolComponent.sav(fttpcnStoreBo.getFtdgrp(),BigDecimal.ZERO);
+        ftToolComponent.sav(fttpcnStoreBo.getFtdgrp());
         trnmodService.trnSetFromContract(trnmodVo);
         cbsSav(fttpcnStoreBo, trnmodVo);
 
@@ -89,8 +89,8 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
                    bizInfoVo.setRat(rec.getRat());
                    bizInfoVo.setBranchInr(rec.getBranchinr());
                    bizInfoVo.setEtyextkey(rec.getEtyextkey());
-                   bizInfoVo.setAmt(rec.getAmt());
                    bizInfoVo.setBranchInr(rec.getBranchinr());
+                   bizInfoVo.setValdat(rec.getValdat());
                    return bizInfoVo;
     }
 
@@ -129,13 +129,6 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
     @Override
     public FttpcnStoreBo init(FttpcnStoreBo fttpcnStoreBo){
         fttpcnStoreBo.reset();
-        String ftdInr = fttpcnStoreBo.getFtdgrp().getRec().getInr();
-        if(sptDataComponent.needMergeSptData(fttpcnStoreBo)){
-            ftdInr = fttpcnStoreBo.getSpt().getObjinr();
-        }
-        Ftdgrp ftdgrp = ftToolComponent.getFtdgrpByInr(ftdInr);
-        fttpcnStoreBo.setFtdgrp(ftdgrp);
-
         init950(fttpcnStoreBo);
         init1000(fttpcnStoreBo);
         return fttpcnStoreBo;
@@ -143,12 +136,12 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
 
     private void init950(FttpcnStoreBo fttpcmStoreBo){
         Ftdgrp ftdgrp = fttpcmStoreBo.getFtdgrp();
-//        if(!fttpcmStoreBo.isModified("canamt")){
-//            fttpcmStoreBo.setCanamt(ftdgrp.getCbs().getMax().getAmt());
-//        }
-//        if (!fttpcmStoreBo.isModified("cancur")){
-//            fttpcmStoreBo.setCancur(ftdgrp.getCbs().getMax().getCur());
-//        }
+        if(!fttpcmStoreBo.isModified("canamt")){
+            fttpcmStoreBo.setCanamt(ftdgrp.getCbs().getMax().getAmt());
+        }
+        if (!fttpcmStoreBo.isModified("cancur")){
+            fttpcmStoreBo.setCancur(ftdgrp.getCbs().getMax().getCur());
+        }
     }
 
     private void init1000(FttpcnStoreBo fttpcnStoreBo){