Skip to content

I
isc-core
Commit 61659e50 by niewei
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 19d05be6 b2de60d1
Showing with 232 additions and 60 deletions
isc-common-core/src/main/java/com/brilliance/isc/bo/Cpd.java
package com.brilliance.isc.bo;
import com.brilliance.mda.runtime.mda.util.Decimals;
import com.brilliance.isc.common.vo.AbstractCommonVo;
import com.brilliance.mda.runtime.mda.util.Decimals;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
......@@ -77,22 +77,22 @@ public class Cpd extends AbstractCommonVo {
private String oriref = NULLSTR;
//Value Date
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date valdat = NULLDATE;
//Date of Payment
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date opndat = NULLDATE;
//Date Closed
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date clsdat = NULLDATE;
//Our Charges to
private String chato = NULLSTR;
//Creation Date
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date credat = NULLDATE;
//Responsible User
......@@ -129,7 +129,7 @@ public class Cpd extends AbstractCommonVo {
private String feecur = NULLSTR;
//国外�'�用金额
private BigDecimal feeamt = Decimals.ZERO_SCALE3;
private BigDecimal feeamt = Decimals.ZERO_SCALE3;
//汇款性�'�
private String trntyp = NULLSTR;
......@@ -138,7 +138,7 @@ public class Cpd extends AbstractCommonVo {
private String paytype = NULLSTR;
//付款日期
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date paydat = NULLDATE;
//客户类型
......@@ -154,13 +154,13 @@ public class Cpd extends AbstractCommonVo {
private String cur71f = NULLSTR;
//发报行扣�'�金额
private BigDecimal amt71f = Decimals.ZERO_SCALE3;
private BigDecimal amt71f = Decimals.ZERO_SCALE3;
//原始金额
private BigDecimal amtf33b = Decimals.ZERO_SCALE3;
private BigDecimal amtf33b = Decimals.ZERO_SCALE3;
//汇率
private BigDecimal f36 = Decimals.ZERO_SCALE6;
private BigDecimal f36 = Decimals.ZERO_SCALE6;
//指令代码
private String f23e = NULLSTR;
......@@ -205,7 +205,7 @@ public class Cpd extends AbstractCommonVo {
private String tsnflg = NULLSTR;
//PRECHKDAT
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date prechkdat = NULLDATE;
//是否需要核验
......@@ -238,4 +238,7 @@ public class Cpd extends AbstractCommonVo {
private String channel = NULLSTR;
//渠道业务编号
private String chnref = NULLSTR;
//前端业务编号(发起端)
private String iniref = NULLSTR;
}
isc-common-core/src/main/java/com/brilliance/isc/bo/Cpdret.java 0 → 100644
package com.brilliance.isc.bo;
import com.brilliance.isc.common.vo.AbstractCommonVo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import java.util.Date;
import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class Cpdret extends AbstractCommonVo {
private String inr = NULLSTR;
//新汇出汇款业务参号
private String chownref = NULLSTR;
//Object Type of Associated Contract Optional
private String objtyp = NULLSTR;
//Object INR of Associated Contract Optional
private String objinr = NULLSTR;
//部分退汇
private String bfth = NULLSTR;
// 关联业务编号
private String objref = NULLSTR;
// 前端业务编号
private String iniref = NULLSTR;
// 创建时间
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date credat = NULLDATE;
// 退汇或止付原因
private String rejcod = NULLSTR;
// 详情(附言)
private String remark = NULLSTR;
// smhinr
private String smhinr = NULLSTR;
// 正确清分机构
private String rightunit = NULLSTR;
// 经办柜员
private String iniusr = NULLSTR;
private String clsm = NULLSTR;
}
isc-common-core/src/main/java/com/brilliance/isc/bo/model/Cpdgrp.java
package com.brilliance.isc.bo.model;
import com.brilliance.mda.runtime.mda.IStream;
import com.brilliance.mda.runtime.mda.impl.StreamImpl;
import com.brilliance.mda.runtime.mda.util.Decimals;
import com.brilliance.isc.bo.Cpd;
import com.brilliance.isc.bo.Cpdret;
import com.brilliance.isc.bo.Cpt;
import com.brilliance.isc.common.json.IStreamDeserializer;
import com.brilliance.isc.common.trnmod.bo.SwiaddBo;
import com.brilliance.isc.common.vo.AbstractCommonVo;
import com.brilliance.isc.common.vo.PtsptaVo;
import com.brilliance.mda.runtime.mda.IStream;
import com.brilliance.mda.runtime.mda.impl.StreamImpl;
import com.brilliance.mda.runtime.mda.util.Decimals;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.Data;
......@@ -56,11 +57,11 @@ public class Cpdgrp extends AbstractCommonVo {
// 标识当前交易的来报报文类型
private String msgtyp;
// 购汇金额
private BigDecimal lcyamt = Decimals.ZERO_SCALE3;
private BigDecimal lcyamt = Decimals.ZERO_SCALE3;
//人民币帐号/银行卡号
private String lcyacc;
//现汇金额
private BigDecimal fcyamt = Decimals.ZERO_SCALE3;
private BigDecimal fcyamt = Decimals.ZERO_SCALE3;
//外汇帐号/银行卡号
private String fcyacc;
// T22来报中的54-acc
......@@ -72,6 +73,8 @@ public class Cpdgrp extends AbstractCommonVo {
private SwiaddBo swiadd;
private Cpdret cpdret;
@Override
public void reset() {
if (rec == null) {
......@@ -116,5 +119,10 @@ public class Cpdgrp extends AbstractCommonVo {
res = new PtsptaVo();
}
res.reset();
if (cpdret == null) {
cpdret = new Cpdret();
}
cpdret.reset();
}
}
isc-common-core/src/main/java/com/brilliance/isc/mda/dao/CfasigMapper.java deleted 100644 → 0
package com.brilliance.isc.mda.dao;
import com.brilliance.isc.bo.Cct;
import com.brilliance.isc.bo.Cfasig;
import org.apache.ibatis.annotations.Mapper;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@Mapper
public interface CfasigMapper {
int insert(Cfasig record);
}
isc-common-core/src/main/java/com/brilliance/isc/mda/dao/CpdMapper.java
......@@ -5,6 +5,7 @@ import com.brilliance.isc.vo.remit.CpdWithPtsCbbResponseVo;
import com.brilliance.isc.vo.remit.CptselQueryVo;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface CpdMapper {
......@@ -35,4 +36,10 @@ public interface CpdMapper {
Cpd selectByInr(@Param("inr") String inr);
Cpd selectByIniref(@Param("iniref") String iniref);
void updateClsdatByinr(@Param("inr") String inr, @Param("clsdat") Date clsdat);
int selectByHnglbh(@Param("hnglbh") String hnglbh, @Param("ownextkey") String ownextkey);
}
isc-common-core/src/main/java/com/brilliance/isc/mda/dao/CpdretMapper.java 0 → 100644
package com.brilliance.isc.mda.dao;
import com.brilliance.isc.bo.Cpdret;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface CpdretMapper {
Cpdret selectCpdretByChownref(@Param("chownref") String chownref);
Cpdret selectByObjtypAndObjinr(@Param("objtyp") String objtyp, @Param("objinr") String objinr);
Cpdret selectByObjinr(String objinr);
}
isc-common-core/src/main/java/com/brilliance/isc/vo/remit/CpdBizInfoVo.java
package com.brilliance.isc.vo.remit;
import com.brilliance.mda.runtime.mda.util.Decimals;
import com.brilliance.isc.common.json.BigDecimalSerialize;
import com.brilliance.isc.common.vo.BizInfoVo;
import com.brilliance.isc.common.vo.PtsptaVo;
import com.brilliance.mda.runtime.mda.util.Decimals;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;
import lombok.Setter;
......@@ -139,13 +137,13 @@ public class CpdBizInfoVo extends BizInfoVo {
//部分购汇部分现汇
//人民币金额
private BigDecimal lcyamt = Decimals.ZERO_SCALE3;
private BigDecimal lcyamt = Decimals.ZERO_SCALE3;
//人民币帐号/银行卡号
private String lcyacc = NULLSTR;
//来报报文类型 这里用于判断T24报文（海运费）
private String msgtyp = NULLSTR;
//现汇金额
private BigDecimal fcyamt = Decimals.ZERO_SCALE3;
private BigDecimal fcyamt = Decimals.ZERO_SCALE3;
//外汇帐号/银行卡号
private String fcyacc = NULLSTR;
//结售汇代码
......@@ -157,11 +155,16 @@ public class CpdBizInfoVo extends BizInfoVo {
// T22来报中的54-adr
private String adr54 = NULLSTR;
private String operation;
//等值CNY勾选框 Y-勾选 N-不勾选
private String calflg = NULLSTR;
private BigDecimal cnyamt = Decimals.ZERO_SCALE2;
//付款人客户类型
private String custyp;
// 用于区分是前手进入还是挂账后进入, ""表示先手，"Y"表示挂账后的后手
private String bacflg;
}
isc-common-core/src/main/java/com/brilliance/isc/vo/remit/CptselQueryVo.java
......@@ -39,11 +39,13 @@ public class CptselQueryVo extends CommonResult {
/**
* 汇款开始日期
*/
private String opndatfrom;
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
private Date opndatfrom;
/**
* 汇款截止日期
*/
private String opndatto;
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
private Date opndatto;
/**
* 客户号/名称
......
isc-common-core/src/main/resources/ini/cbsconf.ini
......@@ -338,6 +338,28 @@ OPR1=+NOMSUM
NOMSUM=+
[CPD-NOMAMT-COL]
COD1=NOMSUM
[CPD-GZ1AMT]
OPR1=+GZ1AMT
[CPD-JF1AMT]
OPR1=-GZ1AMT
OPR2=+JF1AMT
[CPD-TH1AMT]
OPR1=-JF1AMT
OPR2=+TH1AMT
[CPD-TH2AMT]
OPR1=-GZ1AMT
OPR2=+TH2AMT
[CPD-GZ1AMT-OPR]
GZ1AMT=+
[CPD-JF1AMT-OPR]
GZ1AMT=-
JF1AMT=+
[CPD-TH1AMT-OPR]
JF1AMT=-
TH1AMT=+
[CPD-TH2AMT-OPR]
GZ1AMT=-
TH2AMT=+
[DED-CCVIN]
OPR1=+CCVSUM
[DED-CCVIN-OPR]
......
isc-common-core/src/main/resources/mapper/cpdretmapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.brilliance.isc.mda.dao.CpdretMapper">
<resultMap id="BaseResultMap" type="com.brilliance.isc.bo.Cpdret">
<result column="INR" property="inr" jdbcType="CHAR"/>
<result column="CHOWNREF" property="chownref" jdbcType="VARCHAR"/>
<result column="OBJTYP" property="objtyp" jdbcType="VARCHAR"/>
<result column="OBJINR" property="objinr" jdbcType="VARCHAR"/>
<result column="BFTH" property="bfth" jdbcType="VARCHAR"/>
<result column="REJCOD" property="rejcod" jdbcType="VARCHAR"/>
<result column="REMARK" property="remark" jdbcType="VARCHAR"/>
<result column="SMHINR" property="smhinr" jdbcType="VARCHAR"/>
<result column="OBJREF" property="objref" jdbcType="VARCHAR"/>
<result column="INIREF" property="iniref" jdbcType="VARCHAR"/>
<result column="CREDAT" property="credat" jdbcType="DATE"/>
<result column="RIGHTUNIT" property="rightunit" jdbcType="VARCHAR"/>
<result column="INIUSR" property="iniusr" jdbcType="VARCHAR"/>
<result column="INIFRM" property="inifrm" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
chownref,
objtyp,
objinr,
bfth,
rejcod,
remark,
smhinr,
objref,
iniref,
credat,
rightunit,
iniusr,
inifrm
</sql>
<select id="selectCpdretByChownref" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from cpdret
where chownref = #{chownref,jdbcType=VARCHAR}
</select>
<select id="selectByObjtypAndObjinr" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from cpdret
where objtyp = #{objtyp,jdbcType=VARCHAR} and objinr = #{objinr,jdbcType=VARCHAR}
order by inr desc and rownum = 1
</select>
<select id="selectByObjinr" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from cpdret
where objinr = #{objinr,jdbcType=VARCHAR}
</select>
</mapper>
\ No newline at end of file
isc-common-core/src/main/resources/mapper/ptsmapper.xml
......@@ -175,7 +175,7 @@
<if test="ptyinr != null">ptyinr = #{ptyinr,jdbcType=VARCHAR},</if>
<if test="extkey != null">extkey = #{extkey,jdbcType=VARCHAR},</if>
<if test="adrblk != null">adrblk = #{adrblk,jdbcType=VARCHAR},</if>
<if test="ref != null">ref = #{ref,jdbcType=VARCHAR},</if>
<if test="ref != null">"REF" = #{ref,jdbcType=VARCHAR},</if>
<if test="nam != null">nam = #{nam,jdbcType=VARCHAR},</if>
<if test="ownref != null">ownref = #{ownref,jdbcType=VARCHAR},</if>
<if test="dftcur != null">dftcur = #{dftcur,jdbcType=VARCHAR},</if>
......@@ -213,7 +213,7 @@
ptyinr = #{ptyinr,jdbcType=VARCHAR},
extkey = #{extkey,jdbcType=VARCHAR},
adrblk = #{adrblk,jdbcType=VARCHAR},
ref = #{ref,jdbcType=VARCHAR},
"REF" = #{ref,jdbcType=VARCHAR},
nam = #{nam,jdbcType=VARCHAR},
ownref = #{ownref,jdbcType=VARCHAR},
dftcur = #{dftcur,jdbcType=VARCHAR},
......@@ -258,7 +258,7 @@
<if test="module.ptyinr != null">ptyinr = #{module.ptyinr,jdbcType=VARCHAR},</if>
<if test="module.extkey != null">extkey = #{module.extkey,jdbcType=VARCHAR},</if>
<if test="module.adrblk != null">adrblk = #{module.adrblk,jdbcType=VARCHAR},</if>
<if test="module.ref != null">ref = #{module.ref,jdbcType=VARCHAR},</if>
<if test="module.ref != null">"REF" = #{module.ref,jdbcType=VARCHAR},</if>
<if test="module.nam != null">nam = #{module.nam,jdbcType=VARCHAR},</if>
<if test="module.ownref != null">ownref = #{module.ownref,jdbcType=VARCHAR},</if>
<if test="module.dftcur != null">dftcur = #{module.dftcur,jdbcType=VARCHAR},</if>
......@@ -357,7 +357,7 @@
ptyinr = #{item.ptyinr,jdbcType=VARCHAR},
extkey = #{item.extkey,jdbcType=VARCHAR},
adrblk = #{item.adrblk,jdbcType=VARCHAR},
ref = #{item.ref,jdbcType=VARCHAR},
"REF" = #{item.ref,jdbcType=VARCHAR},
nam = #{item.nam,jdbcType=VARCHAR},
ownref = #{item.ownref,jdbcType=VARCHAR},
dftcur = #{item.dftcur,jdbcType=VARCHAR},
......
isc-common-esb/pom.xml
......@@ -16,12 +16,12 @@
<name>isc-common-esb</name>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<!-- <dependency>-->
<!-- <groupId>javax.servlet</groupId>-->
<!-- <artifactId>javax.servlet-api</artifactId>-->
<!-- <scope>provided</scope>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
......
isc-common-service/src/main/java/com/brilliance/isc/common/sysmod/SysmodService.java
......@@ -25,6 +25,7 @@ public interface SysmodService {
void getxxdfields(String xxd, String infileds, String inr, String flg, Argument<String> fields);
boolean sptIsAnyLoaded(String sta);
/**
* 判断 “EXE” 是否包含 入参sta
**/
......@@ -34,7 +35,7 @@ public interface SysmodService {
boolean sptIsIncLoaded(String sptState);
boolean sptIsLoaded(String arg,String sptState);
boolean sptIsLoaded(String arg, String sptState);
void sptSaveEntry(Spt argSpt, Object rec, String argSta, Object storeObj, String objName);
......@@ -56,7 +57,7 @@ public interface SysmodService {
void sdbUndeleteWithLog(Object obj);
void sdbSlgWrite(Object logMod,String fct);
void sdbSlgWrite(Object logMod, String fct);
Pty getPtyobj(String rol, List<PtsptaVo> ptsList);
......@@ -64,7 +65,7 @@ public interface SysmodService {
void sweSaveEntry(Trn trn, Spt spt, String argSta, String sptinr, String trninr);
void msgSaveEntry(Trn trn, Spt spt,String argSta, String sptinr, String trninr);
void msgSaveEntry(Trn trn, Spt spt, String argSta, String sptinr, String trninr);
void sptUpdateInDb(Spt spt, String sta);
......@@ -94,7 +95,7 @@ public interface SysmodService {
<T> T streamGetNameInSubDir(Class<T> clazz, String argInr);
<T> T streamGetDataFromDir(Class<T> clazz, String prefix,String argInr);
<T> T streamGetDataFromDir(Class<T> clazz, String prefix, String argInr);
boolean existSptFile(String argDir, String argFil);
......@@ -106,20 +107,20 @@ public interface SysmodService {
void streamSaveInDir(Object storeObj, String argDir, String argFil);
void saveObjectJson(String argDir,String filePath, String json);
void saveObjectJson(String argDir, String filePath, String json);
String loadObjectJson(String argDir,String fileName);
String loadObjectJson(String argDir, String fileName);
void saveSprData(Spt spt, BaseTransactionVo storeObj);
boolean isCenterTaken();
boolean isSdhBusiness();
boolean isSdhBusiness();
boolean isSdhBusiness(String inifrm);
boolean isSdhBusiness(String inifrm);
boolean isSdhBusiness(String inifrm,String branch);
boolean isSdhBusiness(String inifrm, String branch);
String getChannelFromSta(String sta);
......@@ -137,7 +138,7 @@ public interface SysmodService {
String getNextFrame(String inifrm);
String getPreFrame(String inifrm,String branch);
String getPreFrame(String inifrm, String branch);
String midObjinr(String objInr);
......@@ -154,4 +155,8 @@ public interface SysmodService {
String buildElcMsgDownloadPath(String instg, String msgId);
boolean isShangYun(String tbl);
boolean sptIsPenLoaded(String sptState);
boolean sptIsCorLoaded(String sptState);
}
isc-common-service/src/main/java/com/brilliance/isc/common/sysmod/impl/SysmodServiceImpl.java
......@@ -253,6 +253,7 @@ public class SysmodServiceImpl implements SysmodService {
}
@Override
public boolean sptIsCorLoaded(String sptState) {
//! function to check whether a correction spt-item is loaded on entry of the transaction.
//! returns true if an corrected spt-item is loaded.
......@@ -1657,4 +1658,10 @@ public class SysmodServiceImpl implements SysmodService {
}
return "Y".equals(valReturn) ? true : false;
}
@Override
public boolean sptIsPenLoaded(String sptState) {
return sptIsLoaded("PEN", sptState);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment