Fttfmt修改+fttsel修改

isc-funds-business/src/main/java/com/brilliance/isc/funds/basesel/trncod/service/impl/TrncodServiceImpl.java

@@ -10,6 +10,7 @@ import com.brilliance.isc.mda.dao.BusbtnMapper;
 import com.brilliance.isc.mda.dao.TrnMapper;
 import com.brilliance.isc.vo.TrnCodeQueryVo;
 import com.brilliance.isc.vo.TrncodVo;
+import com.brilliance.mda.runtime.mda.util.Strings;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Service;
 
@@ -37,19 +38,31 @@ public class TrncodServiceImpl implements TrncodService {
 
     @Override
     public List<TrncodVo> dealWithByInr(TrnCodeQueryVo trnCodeQueryVo) {
+        String type = Strings.toUpper(trnCodeQueryVo.getType());
+        String inr = trnCodeQueryVo.getInr();
         List<TrncodVo> result = Lists.newArrayList();
         //获取模型数据
         Ftdgrp ftdgrp = ftToolComponent.getFtdgrpByInr(trnCodeQueryVo.getInr());
         String isAllowed = "";
-        String[] fxTraArray = {"FTTFMT", "FTTFCN","FTTPCN"};
-        String[] fxButArray = {"资金拆借到期", "资金拆借销账","头寸调拨销账"};
+        if ("ZJCJ".equals(type)){
+             String[] fxTraArray = {"FTTFMT", "FTTFCN"};
+             String[] fxButArray = {"资金拆借到期", "资金拆借销账"};
+             for (int i = 0; i < fxTraArray.length; i++) {
+                TrncodVo trncodVo = new TrncodVo(fxTraArray[i],fxButArray[i],isAllowed,"Y","");
+                ftToolComponent.isFTTrnAllowed(ftdgrp,trncodVo);
+                result.add(trncodVo);
+                }
 
-        for (int i = 0; i < fxTraArray.length; i++) {
-
-            TrncodVo trncodVo = new TrncodVo(fxTraArray[i],fxButArray[i],isAllowed,"Y","");
-            ftToolComponent.isFTTrnAllowed(ftdgrp,trncodVo);
-            result.add(trncodVo);
+        }else {
+             String[] fxTraArray = {"FTTPCN"};
+             String[] fxButArray = {"头寸调拨销账"};
+             for (int i = 0; i < fxTraArray.length; i++) {
+                 TrncodVo trncodVo = new TrncodVo(fxTraArray[i],fxButArray[i],isAllowed,"Y","");
+                 ftToolComponent.isFTTrnAllowed(ftdgrp,trncodVo);
+                 result.add(trncodVo);
+             }
         }
+
         return result;
     }
 

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

@@ -123,6 +123,9 @@ public class FttfmtSettleRegister implements ISettleRegister {
                                                         ftdgrp.getCbs().getIns().getAmt(), "","FBD","C","","");
                 cdtKey = setglgService.setglgAddAmount(setglgVo,"TRN","TRO",setmodVo.getDoccur(),setmodVo.getSetamt().negate(),"",
                                                            "FBD","C","","");
+                //dbtKey = this.getSetmod().getSetglg().setglgAddAmount ( "TRN", "OWN", this.getSetmod().getDoccur(), this.getFtdgrp().getCbs().getMax().getAmt(), "", dsp, "C", acc1, "" );
+                //dbtKey2 = this.getSetmod().getSetglg().setglgAddAmount ( "TRN", "TRO", this.getSetmod().getDoccur(), this.getIntamt(), "", "FID", "C", "", "" );
+                //cdtKey = this.getSetmod().getSetglg().setglgAddAmount ( "TRN", "TRO", this.getSetmod().getDoccur(), this.getSetmod().getSetamt().negate(), "", "PAC", "C", "", "" );
                 setmodVo.setFeeclirol("TRO");
                 break;
         }

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

 package com.brilliance.isc.funds.fttfmt.service;
 
-import com.brilliance.isc.bo.Ftd;import com.brilliance.isc.bo.Fxd;
-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.Smh;
-import com.brilliance.isc.bo.Pty;
+import com.brilliance.isc.bo.Ftd;
+import com.brilliance.isc.bo.model.Ftdgrp;
 import com.brilliance.isc.common.api.bch.service.BchService;
 import com.brilliance.isc.common.cache.pta.PtaCacheService;
 import com.brilliance.isc.common.cbsmod.service.CbsmodService;
@@ -18,17 +16,14 @@ import com.brilliance.isc.common.transaction.help.TransactionHelpService;
 import com.brilliance.isc.common.transaction.help.TransactionServiceSet;
 import com.brilliance.isc.common.trnmod.service.TrnmodService;
 import com.brilliance.isc.common.trnmod.vo.TrnmodVo;
-import com.brilliance.isc.common.util.I18nUtil;
 import com.brilliance.isc.common.vo.BizAmdInfoVo;
 import com.brilliance.isc.common.vo.BizInfoVo;
-import com.brilliance.isc.funds.bo.funds.FttfmtStoreBo;import com.brilliance.isc.funds.bo.funds.FxtfcnStoreBo;
-import com.brilliance.isc.funds.common.component.FtToolComponent;import com.brilliance.isc.funds.common.component.FxToolComponent;
-import com.brilliance.isc.funds.fttfmt.check.FttfmtValidator;import com.brilliance.isc.funds.fxtfcn.check.FxtfcnValidator;
-import com.brilliance.isc.funds.fxtlop.service.FxtpService;
-import com.brilliance.isc.funds.vo.funds.FxtfcnStoreVo;
+import com.brilliance.isc.funds.bo.funds.FttfmtStoreBo;
+import com.brilliance.isc.funds.common.component.FtToolComponent;
+import com.brilliance.isc.funds.fttfmt.check.FttfmtValidator;
 import com.brilliance.isc.mda.dao.PtyratMapper;
 import com.brilliance.isc.mda.dao.SmhMapper;
-import com.brilliance.isc.vo.funds.FtdBizInfoVo;import com.brilliance.isc.vo.funds.FxdBizInfoVo;
+import com.brilliance.isc.vo.funds.FtdBizInfoVo;
 import com.brilliance.mda.runtime.mda.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,10 +34,7 @@ import com.brilliance.isc.common.component.PtsptaToolComponent;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;import static com.brilliance.mda.runtime.mda.Constants.*;
+import java.util.Map;
 
 
 @Service("fttfmt.transaction")
@@ -211,11 +203,11 @@ public class FttfmtTransactionServiceImpl extends AbstractTransactionService<Ftt
         cbsmodService.cbsTrnSetNew("TRN",trninr);
 
         if (MdaUtils.compareTo(transactionVo.getFtdgrp().getRec().getFttyp(),"LO") == 0|| MdaUtils.compareTo(transactionVo.getFtdgrp().getRec().getFttyp(),"DO") == 0 ){
-                trnmodService.cbsTrnStore("OPNAMT","AMT1",Dates.today(),transactionVo.getSetmod().getDoccur(),transactionVo.getSetmod().getSetamt(),"Settling a Funds Transfer",transactionVo.getFtdgrp(),trninr);
+                trnmodService.cbsTrnStore("OPNAMT","AMT1",Dates.today(),transactionVo.getSetmod().getDoccur(),transactionVo.getSetmod().getSetamt(),"Settling a Funds Transfer",transactionVo.getFtdgrp().getRec(),trninr);
         }
 
-        trnmodService.cbsTrnStore("UTLAMT","AMT1",Dates.today(),transactionVo.getFtdgrp().getCbs().getOpn1().getCur(),transactionVo.getFtdgrp().getCbs().getOpn1().getAmt(), "Settling a Funds Transfer",transactionVo.getFtdgrp(),trninr);
-        trnmodService.cbsTrnStore("INSAMT","AMT1",Dates.today(),transactionVo.getFtdgrp().getCbs().getIns().getCur(),transactionVo.getFtdgrp().getCbs().getIns().getAmt(), "Settling a Funds Transfer",transactionVo.getFtdgrp(),trninr);
+        trnmodService.cbsTrnStore("UTLAMT","AMT1",Dates.today(),transactionVo.getFtdgrp().getCbs().getOpn1().getCur(),transactionVo.getFtdgrp().getCbs().getOpn1().getAmt(), "Settling a Funds Transfer",transactionVo.getFtdgrp().getRec(),trninr);
+        trnmodService.cbsTrnStore("INSAMT","AMT1",Dates.today(),transactionVo.getFtdgrp().getCbs().getIns().getCur(),transactionVo.getFtdgrp().getCbs().getIns().getAmt(), "Settling a Funds Transfer",transactionVo.getFtdgrp().getRec(),trninr);
         cbsmodService.cbsTrnCommit();
 
     }

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttpcn/register/diasav/FttpcnDiasavRegister.java

@@ -3,14 +3,37 @@ package com.brilliance.isc.funds.fttpcn.register.diasav;
 
 
 import com.brilliance.isc.common.register.diasav.IDiasavRegister;
+import com.brilliance.isc.common.register.diasav.common.DftcreDiasavRegister;
+import com.brilliance.isc.common.register.diasav.common.LiaallDiasavRegister;
+import com.brilliance.isc.common.register.diasav.common.LiaallDiasavZZZRegister;
+import com.brilliance.isc.common.register.diasav.common.TrtcreDiasavRegister;
+import com.brilliance.isc.common.trndia.service.TrndiaService;
 import com.brilliance.isc.common.trndia.vo.TrndiaVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 
 @Component("fttpcn.diasavRegister")
 public class FttpcnDiasavRegister implements IDiasavRegister {
-
+    @Autowired
+    private TrndiaService trndiaService;
+    @Autowired
+    private LiaallDiasavRegister liaallDiasavRegister;
+    @Autowired
+    private LiaallDiasavZZZRegister liaallDiasavZZZRegister;
+    @Autowired
+    private TrtcreDiasavRegister trtcreDiasavRegister;
+    @Autowired
+    private DftcreDiasavRegister dftcreDiasavRegister;
     @Override
     public void diasav(TrndiaVo trndia) {
+         trnDiasav(trndia);
+         liaallDiasavRegister.diasav(trndia);
+         liaallDiasavZZZRegister.diasav(trndia);
+         trtcreDiasavRegister.diasav(trndia);
+         dftcreDiasavRegister.diasav(trndia);
+    }
+    private void trnDiasav(TrndiaVo trndiaVo) {
 
-    }}
+    }
+}

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttpcn/register/liaall/FttpcnLiaallRegister.java

+package com.brilliance.isc.funds.fttpcn.register.liaall;
+
+import com.brilliance.isc.common.liaall.vo.LiaallVo;
+import com.brilliance.isc.common.register.liaall.ILiaallRegister;
+import com.brilliance.isc.common.register.liaall.common.LiaallRegister;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+@Component("fttpcn.liaallSetTransaction")
+public class FttpcnLiaallRegister implements ILiaallRegister {
+
+    @Autowired
+    private LiaallRegister liaallRegister;
+
+    @Override
+    public void liaallSetTransaction(LiaallVo liaallVo) {
+        liaallRegister.liaallSetTransaction(liaallVo);
+    }
+
+}

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttpcn/register/settle/FttpcnSettleRegister.java

@@ -2,7 +2,10 @@ package com.brilliance.isc.funds.fttpcn.register.settle;
 
 
 import com.brilliance.isc.bo.model.Ftdgrp;import com.brilliance.isc.common.register.settle.DefaultSettleRegister;import com.brilliance.isc.common.register.settle.ISettleRegister;
-import com.brilliance.isc.common.setglg.service.SetglgService;import com.brilliance.isc.common.setmod.service.SetmodService;import com.brilliance.isc.common.setmod.vo.SetmodVo;
+import com.brilliance.isc.common.setglg.service.SetglgService;
+import com.brilliance.isc.common.setglg.vo.SetglgVo;
+import com.brilliance.isc.common.setmod.service.SetmodService;
+import com.brilliance.isc.common.setmod.vo.SetmodVo;
 import com.brilliance.isc.funds.common.component.FtToolComponent;import com.brilliance.isc.vo.funds.FtdBizInfoVo;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Component;
 
 
@@ -27,12 +30,14 @@ public class FttpcnSettleRegister implements ISettleRegister{
 
        FtdBizInfoVo rec = (FtdBizInfoVo) setmodVo.getRec();
        Ftdgrp ftdgrp = ftToolComponent.getFtdgrpByInr(rec.getObjinr());
-       setmodVo.setDocamt(ftdgrp.getCbs().getOpn2().getAmt());
-       setglgService.setglgClrAmount ( setmodVo.getSetglg(),"TRN" );
-       String dbtKey = setglgService.setglgAddAmount(setmodVo.getSetglg(),"TRN","TRI",
+       setmodVo.setDocamt(rec.getCanamt());
+       setmodVo.setDoccur(ftdgrp.getCbs().getMax().getCur());
+       SetglgVo setglg = setmodVo.getSetglg();
+       setglgService.setglgClrAmount ( setglg,"TRN" );
+       String dbtKey = setglgService.setglgAddAmount(setglg,"TRN","TRI",
                          setmodVo.getDoccur(),rec.getCanamt(),"", "DBD","C","","");
 
-       String cdtKey = setglgService.setglgAddAmount(setmodVo.getSetglg(),"TRN","OWN",
+       String cdtKey = setglgService.setglgAddAmount(setglg,"TRN","OWN",
                          setmodVo.getDoccur(),setmodVo.getDocamt(),"","FTC","C","","");
      }
 

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

 package com.brilliance.isc.funds.fttpcn.service;
 
-import com.brilliance.isc.bo.Ftd;
-import com.brilliance.isc.bo.Pty;import com.brilliance.isc.bo.Smh;import com.brilliance.isc.bo.model.Ftacbs;
+import com.brilliance.isc.bo.*;
+import com.brilliance.isc.bo.model.Ftacbs;
 import com.brilliance.isc.bo.model.Ftdgrp;
-import com.brilliance.isc.bo.model.Fttp;
+import com.brilliance.isc.common.api.bch.service.BchService;
+import com.brilliance.isc.common.cache.pta.PtaCacheService;
 import com.brilliance.isc.common.cbsmod.service.CbsmodService;
 import com.brilliance.isc.common.component.PtsptaToolComponent;
 import com.brilliance.isc.common.component.SptDataComponent;
-import com.brilliance.isc.common.contants.CommonContants;import com.brilliance.isc.common.context.SettleContext;
+import com.brilliance.isc.common.contants.CommonContants;
+import com.brilliance.isc.common.context.SettleContext;
+import com.brilliance.isc.common.setmod.vo.SetmodVo;
 import com.brilliance.isc.common.sysmod.SysmodService;
 import com.brilliance.isc.common.transaction.AbstractTransactionService;
 import com.brilliance.isc.common.transaction.help.TransactionHelpService;
 import com.brilliance.isc.common.transaction.help.TransactionServiceSet;
 import com.brilliance.isc.common.trnmod.service.TrnmodService;
 import com.brilliance.isc.common.trnmod.vo.TrnmodVo;
-import com.brilliance.isc.common.vo.BizAmdInfoVo;import com.brilliance.isc.common.vo.BizInfoVo;
-import com.brilliance.isc.funds.bo.funds.FttpcmStoreBo;import com.brilliance.isc.funds.bo.funds.FttpcnStoreBo;
+import com.brilliance.isc.common.util.StringUtils;
+import com.brilliance.isc.common.vo.BizAmdInfoVo;
+import com.brilliance.isc.common.vo.BizInfoVo;
+import com.brilliance.isc.common.vo.PtsptaVo;
+import com.brilliance.isc.funds.bo.funds.FttpcnStoreBo;
 import com.brilliance.isc.funds.common.component.FtToolComponent;
 import com.brilliance.isc.funds.fttpcn.check.FttpcnValidator;
-import com.brilliance.isc.mda.dao.PtyMapper;import com.brilliance.isc.mda.dao.SmhMapper;import com.brilliance.isc.vo.funds.FtdBizInfoVo;
+import com.brilliance.isc.funds.transfer.transaction.FttpcnStructMapper;
+import com.brilliance.isc.funds.vo.funds.FttpcnStoreVo;
+import com.brilliance.isc.mda.dao.PtyMapper;
+import com.brilliance.isc.mda.dao.SmhMapper;
+import com.brilliance.isc.vo.funds.FtdBizInfoVo;
 import com.brilliance.mda.runtime.mda.util.Dates;
-import com.brilliance.mda.runtime.mda.util.Decimals;import com.brilliance.mda.runtime.mda.util.MdaUtils;import com.brilliance.mda.runtime.mda.util.Strings;import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Map;import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;import static com.brilliance.mda.runtime.mda.Constants.PanStaShow;
+import java.util.Map;
 
 
 @Service("fttpcn.transaction")
@@ -52,6 +61,13 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
     private SmhMapper smhMapper;
     @Resource
     private PtyMapper ptyMapper;
+    @Autowired
+    private FttpcnStructMapper fttpcnStructMapper;
+    @Resource
+    private BchService bchService;
+    @Autowired
+    private PtaCacheService ptaCacheService;
+
 
     @PostConstruct
     public void regisertService() {
@@ -73,6 +89,29 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
         cbsSav(fttpcnStoreBo, trnmodVo);
 
     }
+     public String getRef(FttpcnStoreVo fttpcnStorevo) {
+            FttpcnStoreBo fttpcnStoreBo= fttpcnStructMapper.voTransferToBo(fttpcnStorevo);
+            return getRef(fttpcnStoreBo);
+        }
+
+        public String getRef(FttpcnStoreBo fttpcnStoreBo) {
+            fttpcnStoreBo.reset();
+            PtsptaVo ptsptaVo = fttpcnStoreBo.getFtdgrp().getTro();
+
+            if (ptsptaVo == null || StringUtils.isEmpty(ptsptaVo.getPtainr())) {
+                SettleContext.getUserSession().setWrkbch(SettleContext.getUserSession().getBch());
+            }else{
+                Pta pta = ptaCacheService.getPtaByInr(ptsptaVo.getPtainr());
+                Bch wrkbch = new Bch();
+                wrkbch.setInr(pta.getBranchinr());
+                wrkbch = bchService.selectByPrimaryKey(wrkbch);
+                SettleContext.getUserSession().setWrkbch(wrkbch);
+            }
+
+            Ftdgrp ftdgrp = fttpcnStoreBo.getFtdgrp();
+            ftToolComponent.getref(ftdgrp);
+            return ftdgrp.getRec().getOwnref();
+        }
     @Override
     protected Map<String, String> txnCheck(FttpcnStoreBo transactionVo) {
         return fttpcnValidator.validate(transactionVo);
@@ -89,8 +128,8 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
                    bizInfoVo.setRat(rec.getRat());
                    bizInfoVo.setBranchInr(rec.getBranchinr());
                    bizInfoVo.setEtyextkey(rec.getEtyextkey());
-                   bizInfoVo.setBranchInr(rec.getBranchinr());
                    bizInfoVo.setValdat(rec.getValdat());
+                   bizInfoVo.setCanamt(transactionVo.getCanamt());
                    return bizInfoVo;
     }
 
@@ -112,15 +151,15 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
          transactionServiceSet.setBlk(ftdgrp.getBlk());
          transactionServiceSet.setTransactionVo(transactionVo);
 
-         ftToolComponent.collectCbsMap(transactionServiceSet, "", ftdgrp.getCbs(), "max");
+         ftToolComponent.collectCbsMap(transactionServiceSet, "", ftdgrp.getCbs(), "max", "ins", "opn1", "opn2");
          ftToolComponent.collectPtsList(transactionServiceSet, ftdgrp, null);
          settleContext.loadSettleSession(transactionVo.getTransName(), transactionVo.getUserId(), buildBizInfo(transactionVo), transactionServiceSet.getPtsList());
     }
     public void cbsSav(FttpcnStoreBo transactionVo, TrnmodVo trnmodVo){
         String trninr = transactionHelpService.getTrninr();
+        SetmodVo setmodVo = transactionHelpService.getTransactionStoreSet().getSetmodVo();
         cbsmodService.cbsTrnSetNew("TRN",trninr);
-        Ftacbs cbs = transactionVo.getFtdgrp().getCbs();
-        trnmodService.cbsTrnStore("OPNAMT","AMT1",Dates.today(),cbs.getOpn2().getCur(),
+        trnmodService.cbsTrnStore("OPNAMT","AMT1",Dates.today(),setmodVo.getDoccur(),
                                         transactionVo.getCanamt().negate(),"Position Transfer",transactionVo.getFtdgrp().getRec(), trninr);
 
         cbsmodService.cbsTrnCommit();
@@ -140,22 +179,17 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
         return fttpcnStoreBo;
     }
 
-    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());
+    private void init950(FttpcnStoreBo fttpcnStoreBo){
+        Ftdgrp ftdgrp = fttpcnStoreBo.getFtdgrp();
+
+        if (!fttpcnStoreBo.isModified("cancur")){
+            fttpcnStoreBo.setCancur(ftdgrp.getCbs().getMax().getCur());
         }
     }
 
     private void init1000(FttpcnStoreBo fttpcnStoreBo){
-        Fttp fttp = fttpcnStoreBo.getFttp();
         String extkey = SettleContext.getUserSession().getUsr().getExtkey();
         fttpcnStoreBo.getFtdgrp().getRec().setOwnusr(extkey);
-        fttp.setPansta(PanStaShow);
-
 
     }