头寸调拨销账修改+新增fttfmt交易

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttfmt/check/FttfmtValidator.java

+package com.brilliance.isc.funds.fttfmt.check;
+
+import com.brilliance.isc.common.transaction.newcheck.AbstractModuleValidator;
+import com.brilliance.isc.funds.bo.funds.FttfmtStoreBo;
+import org.springframework.stereotype.Component;
+
+
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@Component
+public class FttfmtValidator extends AbstractModuleValidator <FttfmtStoreBo>{
+
+    @Override
+    @PostConstruct
+    public void register(){
+        super.register();;
+    }
+
+    @Override
+    public Map<String, String> validate(FttfmtStoreBo vo) {
+        Map<String, String> maps = new HashMap<>();
+        maps.putAll(super.validate(vo));
+        return maps;
+    }
+
+
+
+
+}

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttfmt/document/FttfmtDocset.java

+package com.brilliance.isc.funds.fttfmt.document;
+
+
+import com.brilliance.isc.doc.handle.impl.AbstractTransactionDocSet;
+import com.brilliance.isc.funds.bo.funds.FttfmtStoreBo;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component("fttfmt.docset")
+public class FttfmtDocset extends AbstractTransactionDocSet<FttfmtStoreBo> {
+    /**
+     * 构建需要支持的面函组件
+     */
+    @PostConstruct
+    public void buildMember() {
+        //扫描Cortype支持，必须要执行
+        scanDocCortypSupport();
+    }
+}

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttfmt/register/dissav/FttfmtDiasavRegister.java

+package com.brilliance.isc.funds.fttfmt.register.dissav;
+
+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("fttfmt.diasavRegister")
+public class FttfmtDiasavRegister 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) {
+
+                //Sets all open diaries to closed
+                //this.getTrnmod().getTrndia().trnDiaSetDone ( this.getFtdgrp(), "FTDMAT" );
+    }
+}
\ No newline at end of file

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttfmt/register/doc/FttfmtDocumentRegister.java

+package com.brilliance.isc.funds.fttfmt.register.doc;
+
+import com.brilliance.isc.common.component.PtsptaToolComponent;
+import com.brilliance.isc.common.register.document.IDocumentRegister;
+import com.brilliance.isc.common.register.document.common.SetmodDocumentRegister;
+import com.brilliance.isc.common.trndoc.service.TrndocService;
+import com.brilliance.isc.common.trndoc.vo.TrndocVo;
+import com.brilliance.isc.common.vo.PtsptaVo;
+import com.brilliance.isc.vo.funds.FxdBizInfoVo;
+import com.brilliance.mda.runtime.mda.util.MdaUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+@Component("fttfmt.documentRegister")
+public class FttfmtDocumentRegister implements IDocumentRegister {
+
+    @Autowired
+    TrndocService trndocService;
+    @Resource
+    PtsptaToolComponent ptsptaToolComponent;
+    @Autowired
+    private SetmodDocumentRegister setmodDocumentRegister;
+
+    @Override
+    public void registerDocument(TrndocVo trndoc) {
+
+        doRegister(trndoc);
+        setmodDocumentRegister.registerDocument(trndoc);
+        //entmodDocumentRegister.registerDocument(trndoc);
+    }
+
+    public void doRegister(TrndocVo trndoc){
+
+    }
+}

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttfmt/register/fee/FttfmtFeeRegister.java

+package com.brilliance.isc.funds.fttfmt.register.fee;
+
+import com.brilliance.isc.common.register.fee.AbstractFeeRegister;
+import com.brilliance.isc.common.register.fee.common.DocumentFeeRegister;
+import com.brilliance.isc.common.register.fee.common.LiaallFeeRegister;
+import com.brilliance.isc.common.register.fee.common.SetmodFeeRegister;
+import com.brilliance.isc.common.setfeg.service.SetfegService;
+import com.brilliance.isc.common.setmod.vo.SetmodVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+
+@Component("fttfmt.feeRegister")
+public class FttfmtFeeRegister extends AbstractFeeRegister {
+
+    @Autowired
+    private SetfegService setfegService;
+    @Autowired
+    private DocumentFeeRegister documentFeeRegister;
+    @Autowired
+    private LiaallFeeRegister liaallFeeRegister;
+    @Autowired
+    private SetmodFeeRegister setmodFeeRegister;
+
+    @Override
+    public void registerSettlement(SetmodVo setmodVo) {
+        setmodFeeRegister.registerSettlement(setmodVo);
+        documentFeeRegister.registerSettlement(setmodVo);
+        liaallFeeRegister.registerSettlement(setmodVo);
+    }
+
+}

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

+package com.brilliance.isc.funds.fttfmt.register.settle;
+
+import com.brilliance.isc.bo.model.Ftdgrp;
+import com.brilliance.isc.common.cbsmod.service.XrtmodService;
+import com.brilliance.isc.common.glemod.service.GlemodService;
+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.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 com.brilliance.mda.runtime.mda.util.MdaUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import com.brilliance.isc.common.component.PtsptaToolComponent;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+@Component("fttfmt.settleRegister")
+public class FttfmtSettleRegister implements ISettleRegister {
+
+    @Autowired
+    private SetmodService setmodService;
+    @Autowired
+    private SetglgService setglgService;
+    @Autowired
+    private DefaultSettleRegister defaultSettleRegister;
+    @Autowired
+    private GlemodService glemodService;
+    @Resource
+    private XrtmodService xrtmodService;
+    @Resource
+    private FtToolComponent ftToolComponent;
+    @Resource
+    private PtsptaToolComponent ptsptaToolComponent;
+
+    @Override
+    public void registerSettlement(SetmodVo setmodVo) {
+        transRegister(setmodVo);
+        defaultSettleRegister.registerSettlement(setmodVo);
+    }
+
+    private void transRegister(SetmodVo setmodVo) {
+        setmodVo.setDocamt(setmodVo.getCbsMap().get("MAX").getAmt());
+        setmodVo.setDoccur(setmodVo.getCbsMap().get("MAX").getCur());
+        SetglgVo setglgVo = setmodVo.getSetglg();
+        setglgService.setglgClrAmount(setglgVo, "TRN");
+        String acctyp1 = "";
+        // LI资金拆入   LO资金拆出      DI 定存吸存     DO定存存出       PT头寸调拨
+        String dacc = NULLSTR;
+        String dbtKey = NULLSTR;
+        String dsp = NULLSTR;
+        String acc = NULLSTR;
+        String cdtKey = NULLSTR;
+        String cdtKey2 = NULLSTR;
+        String acc1 = NULLSTR;
+        String dbtKey2 = NULLSTR;
+         FtdBizInfoVo rec = (FtdBizInfoVo) setmodVo.getRec();
+         Ftdgrp ftdgrp = ftToolComponent.getFtdgrpByInr(rec.getObjinr());
+        switch (ftdgrp.getRec().getFttyp()){
+            case "DO":
+            case "LO":
+                dacc = glemodService.getAvailAcc("FT-FXR",setmodVo.getDoccur(),"",ftdgrp.getCbs().getMax().getAmt().negate());
+            //借记
+                dbtKey = setglgService.setglgAddAmount(setglgVo,"TRN","TRI",
+                        setmodVo.getDoccur(),setmodVo.getSetamt(),"","FTD","C",dacc,"");
+                if (MdaUtils.compareTo(ftdgrp.getRec().getFttyp(),"LO")==0){
+                    if (MdaUtils.compareTo(ftdgrp.getRec().getBnktyp(),"9") == 0){
+                        acctyp1 = "FL-FOG";
+                    }else {
+                        acctyp1 = "FL-DO" + ftdgrp.getRec().getBnktyp();
+                    }
+                    dsp = "FLC";
+
+                }else {
+                    if (MdaUtils.compareTo(ftdgrp.getRec().getBnktyp(),"9") == 0){
+                        acctyp1 = "DB-FOG";
+                    }else {
+                        acctyp1 = "DB-CLR";
+                    }
+                    dsp = "DBC";
+                }
+
+                if (MdaUtils.compareTo(ftdgrp.getRec().getFttyp(),"LO") == 0){
+                    acc = glemodService.getAvailAcc(acctyp1,setmodVo.getDoccur(),"",ftdgrp.getCbs().getMax().getAmt().negate());
+                }else {
+                    acc = glemodService.getAvailAcc(acctyp1,setmodVo.getDoccur(),ftdgrp.getTri().getPts().getPtyinr(),ftdgrp.getCbs().getMax().getAmt().negate());
+                }
+            //贷记
+            //贷记利息收入    ftdgrp.getCbs().getIns().getAmt() => this.getIntamt().negate()
+                cdtKey2 = setglgService.setglgAddAmount(setglgVo,"TRN","OWN",setmodVo.getDoccur(),
+                                                        ftdgrp.getCbs().getIns().getAmt().negate(), "","FIC","C","","");
+                setmodVo.setFeeclirol("TRI");
+                break;
+
+            case "DI":
+            case "LI":
+                if (MdaUtils.compareTo(ftdgrp.getRec().getFttyp(),"DI") == 0){
+                    if (MdaUtils.compareTo(ftdgrp.getRec().getBnktyp(),"9") == 0){
+                        acctyp1 = "VO-FOG";
+                    }else {
+                        acctyp1 = "VO-BO" + ftdgrp.getRec().getBnktyp();
+                    }
+                    dsp = "VOD";
+                }else {
+                    if (MdaUtils.compareTo(ftdgrp.getRec().getBnktyp(),"9") == 0){
+                        acctyp1 = "FB-FOG";
+                    }else {
+                        acctyp1 = "FB-DO" + ftdgrp.getRec().getBnktyp();
+                    }
+                    dsp = "FBD";
+                }
+                acc1 = glemodService.getAvailAcc(acctyp1,setmodVo.getDoccur(),"",ftdgrp.getCbs().getMax().getAmt().negate());
+                dbtKey = setglgService.setglgAddAmount(setglgVo,"TRN","OWN",setmodVo.getDoccur(),ftdgrp.getCbs().getMax().getAmt(),"",
+                                                        dsp,"C",acc1,"");
+                // ftdgrp.getCbs().getIns().getAmt() => getIntamt()
+                dbtKey2 = setglgService.setglgAddAmount(setglgVo,"TRN","TRO",setmodVo.getDoccur(),
+                                                        ftdgrp.getCbs().getIns().getAmt(), "","FID","C","","");
+                cdtKey = setglgService.setglgAddAmount(setglgVo,"TRN","TRO",setmodVo.getDoccur(),setmodVo.getSetamt().negate(),"",
+                                                           "PAC","C","","");
+                setmodVo.setFeeclirol("TRO");
+                break;
+        }
+    }
+}

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttfmt/resource/FttfmtResource.java

+package com.brilliance.isc.funds.fttfmt.resource;
+
+import com.brilliance.isc.common.transaction.controller.AbstractTransactionController;
+import com.brilliance.isc.funds.transfer.transaction.FttfmtStructMapper;
+import com.brilliance.isc.funds.vo.funds.FttfmtStoreVo;
+import com.brilliance.isc.transfer.IStructMapper;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+
+@RestController
+@RequestMapping("/fttfmt")
+public class FttfmtResource extends AbstractTransactionController<FttfmtStoreVo> {
+
+    @Resource
+    private FttfmtStructMapper fttfmtStructMapper;
+
+    public IStructMapper getStructMapper() {
+        return fttfmtStructMapper;
+    }
+}

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.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.cbsmod.service.XrtmodService;
+import com.brilliance.isc.common.contants.CommonContants;
+import com.brilliance.isc.common.context.SettleContext;
+import com.brilliance.isc.common.liaall.service.LiaallService;
+import com.brilliance.isc.common.setmod.service.SetmodService;
+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.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.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.mda.runtime.mda.util.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.brilliance.isc.mda.dao.ActMapper;
+import com.brilliance.isc.mda.dao.PtyMapper;
+import com.brilliance.isc.common.component.SptDataComponent;
+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.*;
+
+
+@Service("fttfmt.transaction")
+public class FttfmtTransactionServiceImpl extends AbstractTransactionService<FttfmtStoreBo> {
+    @Resource
+    private FttfmtValidator fttfmtValidator;
+//    @Autowired
+//    private FxtfcnService fxtfcnService;
+    @Resource
+    private TrnmodService trnmodService;
+    @Resource
+    private XrtmodService xrtmodService;
+    @Resource
+    private FtToolComponent ftToolComponent;
+    @Resource
+    private TransactionHelpService transactionHelpService;
+    @Resource
+    private CbsmodService cbsmodService;
+    @Resource
+    private LiaallService liaallService;
+    @Resource
+    private SettleContext settleContext;
+    @Autowired
+    private PtaCacheService ptaCacheService;
+
+    @Resource
+    private BchService bchService;
+
+    @Resource
+    private PtyratMapper ptyratMapper;
+
+    @Resource
+    private SmhMapper smhMapper;
+
+    @Resource
+    private ActMapper actMapper;
+
+    @Resource
+    private PtyMapper ptyMapper;
+
+    @Resource
+    private SetmodService setmodService;
+
+    @Resource
+    private SysmodService sysmodService;
+
+    @Autowired
+    SptDataComponent sptDataComponent;
+
+    @Autowired
+    PtsptaToolComponent ptsptaToolComponent;
+
+    @PostConstruct
+    public void regisertService() {
+        serviceRegisterMaps.put(CommonContants.SETMOD_SERVICE, "Y");
+        serviceRegisterMaps.put(CommonContants.TRNDOC_SERVICE, "Y");
+        serviceRegisterMaps.put(CommonContants.GLEMOD_SERVICE, "Y");
+        serviceRegisterMaps.put(CommonContants.TRNDIA_SERVICE, "Y");
+        serviceRegisterMaps.put(CommonContants.TRNMOD_SERVICE, "Y");
+
+//        serviceRegisterMaps.put(CommonContants.UMDMOD_SERVICE, "N");
+//        serviceRegisterMaps.put(CommonContants.LIMMOD_SERVICE, "Y");
+//        serviceRegisterMaps.put(CommonContants.BOPSET_RMB_SERVICE, "Y");
+//        serviceRegisterMaps.put(CommonContants.BOPSET_SZSB_BOPREM_SERVICE, "Y");
+//        serviceRegisterMaps.put(CommonContants.BOPSET_CFABOP_SERVICE, "Y");
+//        serviceRegisterMaps.put(CommonContants.FANXIQIAN_SERVICE, "Y");
+    }
+
+    @Override
+    protected void txnSave(FttfmtStoreBo transactionVo) {
+        ruleMtabutSavN500(transactionVo);
+    }
+
+    @Override
+    protected Map<String, String> txnCheck(FttfmtStoreBo transactionVo) {
+        return fttfmtValidator.validate(transactionVo);
+    }
+
+    @Override
+    protected BizInfoVo buildBizInfo(FttfmtStoreBo transactionVo) {
+         FtdBizInfoVo bizInfoVo = new FtdBizInfoVo();
+         bizInfoVo.setObjtyp("FTD");
+         Ftd rec = transactionVo.getFtdgrp().getRec();
+         bizInfoVo.setObjinr(rec.getInr());
+         bizInfoVo.setOwnref(rec.getOwnref());
+         bizInfoVo.setFttyp(rec.getFttyp());
+         bizInfoVo.setRat(rec.getRat());
+         bizInfoVo.setBranchInr(rec.getBranchinr());
+         bizInfoVo.setEtyextkey(rec.getEtyextkey());
+         bizInfoVo.setBranchInr(rec.getBranchinr());
+         bizInfoVo.setValdat(rec.getValdat());
+
+        return bizInfoVo;
+    }
+
+    @Override
+    protected BizAmdInfoVo buildBizAmdInfo(FttfmtStoreBo transactionVo) {
+        return null;
+    }
+
+    @Override
+    public FttfmtStoreBo init(FttfmtStoreBo fttfmtStoreBo) {
+        fttfmtStoreBo.reset();
+        String ftdinr = fttfmtStoreBo.getFtdgrp().getRec().getInr();
+        if (sptDataComponent.needMergeSptData(fttfmtStoreBo)) {
+            ftdinr = fttfmtStoreBo.getSpt().getObjinr();
+        }
+
+        Ftdgrp ftdgrpVo = ftToolComponent.getFtdgrpByInr(ftdinr);
+        fttfmtStoreBo.setFtdgrp(ftdgrpVo);
+
+        init950(fttfmtStoreBo);
+        init1000(fttfmtStoreBo);
+        return fttfmtStoreBo;
+    }
+
+    private void init950(FttfmtStoreBo fttfmtStoreBo) {
+
+
+    }
+
+    private void init1000(FttfmtStoreBo fttfmtStoreBo) {
+        String extkey = SettleContext.getUserSession().getUsr().getExtkey();
+        fttfmtStoreBo.getFtdgrp().getRec().setOwnusr(extkey);
+
+    }
+
+    @Override
+    public void beforeSave(FttfmtStoreBo transactionVo) {
+        transactionVo.reset();
+        Ftdgrp ftdgrp = transactionVo.getFtdgrp();
+
+        TransactionServiceSet transactionServiceSet = transactionHelpService.getTransactionStoreSet();
+        transactionServiceSet.setRec(ftdgrp.getRec());
+        transactionServiceSet.setBlk(ftdgrp.getBlk());
+        transactionServiceSet.setTransactionVo(transactionVo);
+        ftToolComponent.collectCbsMap(transactionServiceSet, "", ftdgrp.getCbs(), "max", "ins", "opn1", "opn2");
+        ftToolComponent.collectPtsList(transactionServiceSet, ftdgrp, null);
+        settleContext.loadSettleSession(transactionVo.getTransName(), transactionVo.getUserId(), buildBizInfo(transactionVo), transactionServiceSet.getPtsList());
+    }
+
+    @Override
+    protected void updateBizInfoVo(BizInfoVo bizInfoVo, FttfmtStoreBo transactionVo) {
+        bizInfoVo.setObjinr(transactionVo.getFtdgrp().getRec().getInr());
+    }
+
+    public void ruleMtabutSavN500(FttfmtStoreBo bo) {
+        TrnmodVo trnmodVo = transactionHelpService.getTransactionStoreSet().getTrnmodVo();
+        // 1. Create (rsp. update) Contract (incl. Texts)
+        ftToolComponent.getref(bo.getFtdgrp());
+        bo.getFtdgrp().getRec().setCnfdat(Dates.today());
+        ftToolComponent.sav(bo.getFtdgrp());
+        // 2. Build Transaction from FTDGRP
+        trnmodService.trnSetFromContract(trnmodVo);
+        // Store CBS-Info
+        cbsSav(bo,trnmodVo);
+        // Store CBS of Nostro
+        //transactionVo.getNosmod().savNostro();
+
+    }
+
+    public void cbsSav(FttfmtStoreBo transactionVo, TrnmodVo trnmodVo) {
+        String trninr = transactionHelpService.getTrninr();
+        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("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);
+        cbsmodService.cbsTrnCommit();
+
+    }
+
+
+    public boolean defaultFtdgrpRecGznoN1000(FttfmtStoreBo fttfmtStoreBo){
+        switch( fttfmtStoreBo.getFtdgrp().getRec().getFttyp())
+    			{
+    			  case "LI":
+    			  case "DI":
+    			  case "LO":
+    			  case "DO":
+    		//	  Systems.setEnabled(this.getFtdgrp().getRec(),"gzno");
+    			  /**
+    			    #做资金拆出时，国结系统中挂账编号没有存储，需手工输入，故把拆出的业务也把此栏位放开
+    			    case "LO", "DO"
+    			    Disable( FTDGRP\\REC\\GZNO )
+    			    **/
+    			  break;
+    			}
+    			return true;
+            }
+
+
+
+}

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

@@ -85,6 +85,7 @@ public class FttpcmTransactionServiceImpl extends AbstractTransactionService<Ftt
        // 2. Build Transaction from FTDGRP
        trnmodService.trnSetFromContract(trnmodVo);
        cbsSav(bo, trnmodVo);
+       //transactionVo.getNosmod().savNostro();
     }
      /**
      *   source:fttpcm.0003.script

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

@@ -129,6 +129,12 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
     @Override
     public FttpcnStoreBo init(FttpcnStoreBo fttpcnStoreBo){
         fttpcnStoreBo.reset();
+        String fttinr = fttpcnStoreBo.getFtdgrp().getRec().getInr();
+        if (sptDataComponent.needMergeSptData(fttpcnStoreBo)){
+            fttinr = fttpcnStoreBo.getSpt().getObjinr();
+        }
+        Ftdgrp ftdgrp = ftToolComponent.getFtdgrpByInr(fttinr);
+        fttpcnStoreBo.setFtdgrp(ftdgrp);
         init950(fttpcnStoreBo);
         init1000(fttpcnStoreBo);
         return fttpcnStoreBo;
@@ -153,6 +159,4 @@ public class FttpcnTransactionServiceImpl extends AbstractTransactionService<Ftt
 
     }
 
-
-
 }

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

+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.setmod.vo.SetmodVo;import com.brilliance.isc.common.transaction.vo.BaseTransactionVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FttfmtStoreBo extends BaseTransactionVo{
+
+      private Ftdgrp ftdgrp;
+
+      private Fttp fttp;
+
+      private SetmodVo setmodVo;
+        @Override
+        public void reset() {
+            super.reset();
+            if (ftdgrp == null) {
+                ftdgrp = new Ftdgrp();
+            }
+            ftdgrp.reset();
+
+            if (fttp == null) {
+                fttp = new Fttp();
+            }
+            fttp.reset();
+            if (setmodVo == null){
+                setmodVo = new SetmodVo();
+            }
+            setmodVo.reset();
+        }
+
+
+}

isc-funds-entity/src/main/java/com/brilliance/isc/funds/transfer/transaction/FttfmtStructMapper.java

+package com.brilliance.isc.funds.transfer.transaction;
+import com.brilliance.isc.funds.bo.funds.FttfmtStoreBo;
+import com.brilliance.isc.funds.vo.funds.FttfmtStoreVo;
+import com.brilliance.isc.transfer.IBaseStructMapper;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+
+
+@Mapper(componentModel = "spring")
+public interface FttfmtStructMapper extends IBaseStructMapper<FttfmtStoreBo, FttfmtStoreVo>{
+     /**
+         * 此行语句一定要写，StructMapper需要
+         */
+        FttfmtStructMapper INSTANCE = Mappers.getMapper(FttfmtStructMapper.class);
+
+        /**
+         * Vo转为Bo
+         *
+         * @param vo
+         * @return 返回业务Bo
+         */
+        @Override
+        FttfmtStoreBo voTransferToBo(FttfmtStoreVo vo);
+
+        /**
+         * Vo追加更新至Bo
+         *
+         * @param vo
+         * @param bo
+         */
+        @Override
+        @Mappings({
+
+        })
+        void voUpdateToBo(FttfmtStoreVo vo, @MappingTarget FttfmtStoreBo bo);
+
+        /**
+         * Bo转为Vo
+         *
+         * @param bo
+         * @return 返回Vo
+         */
+        @Override
+        FttfmtStoreVo boTransferToVo(FttfmtStoreBo bo);
+
+        /**
+         * bo追加更新至Bo
+         *
+         * @param bo
+         * @param vo
+         */
+        @Override
+        void boUpdateToVo(FttfmtStoreBo bo, @MappingTarget FttfmtStoreVo vo);
+
+}

isc-funds-entity/src/main/java/com/brilliance/isc/funds/transfer/transaction/FttpcmStructMapper.java

@@ -2,9 +2,7 @@ package com.brilliance.isc.funds.transfer.transaction;
 
 
 import com.brilliance.isc.funds.bo.funds.FttpcmStoreBo;
-import com.brilliance.isc.funds.bo.funds.FxtfcmStoreBo;
 import com.brilliance.isc.funds.vo.funds.FttpcmStoreVo;
-import com.brilliance.isc.funds.vo.funds.FxtfcmStoreVo;
 import com.brilliance.isc.transfer.IBaseStructMapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;

isc-funds-entity/src/main/java/com/brilliance/isc/funds/transfer/transaction/FttpcnStructMapper.java

 package com.brilliance.isc.funds.transfer.transaction;
 
 
-import com.brilliance.isc.funds.bo.funds.FttpcmStoreBo;import com.brilliance.isc.funds.bo.funds.FttpcnStoreBo;
-import com.brilliance.isc.funds.vo.funds.FttpcmStoreVo;import com.brilliance.isc.funds.vo.funds.FttpcnStoreVo;
+;import com.brilliance.isc.funds.bo.funds.FttpcnStoreBo;
+import com.brilliance.isc.funds.vo.funds.FttpcnStoreVo;
 import com.brilliance.isc.transfer.IBaseStructMapper;
 import org.mapstruct.Mapper;import org.mapstruct.MappingTarget;import org.mapstruct.Mappings;import org.mapstruct.factory.Mappers;
 
@@ -13,7 +13,7 @@ public interface FttpcnStructMapper extends IBaseStructMapper<FttpcnStoreBo, Ftt
       /**
          * 此行语句一定要写，StructMapper需要
          */
-        FxtfcmStructMapper INSTANCE = Mappers.getMapper(FxtfcmStructMapper.class);
+        FttpcnStructMapper INSTANCE = Mappers.getMapper(FttpcnStructMapper.class);
 
         /**
          * Vo转为Bo

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

+package com.brilliance.isc.funds.vo.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.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FttfmtStoreVo extends BaseTransactionVo{
+      private Ftdgrp ftdgrp;
+
+      private Fttp fttp;
+
+        @Override
+        public void reset() {
+            super.reset();
+            if (ftdgrp == null) {
+                ftdgrp = new Ftdgrp();
+            }
+            ftdgrp.reset();
+
+            if (fttp == null) {
+                fttp = new Fttp();
+            }
+            fttp.reset();
+        }
+
+}