diff --git a/WebContent/WEB-INF/etc/simplelog.properties b/WebContent/WEB-INF/etc/simplelog.properties index 42fe5a656..7b4f71c8d 100644 --- a/WebContent/WEB-INF/etc/simplelog.properties +++ b/WebContent/WEB-INF/etc/simplelog.properties @@ -3,21 +3,22 @@ ############################################################ com.amarsoft.are.log.SimpleLog.level=all #handlers Can be com.amarsoft.are.log.impl.ConsoleHandler,com.amarsoft.are.log.impl.FileHandler -com.amarsoft.are.log.SimpleLog.handlers=com.amarsoft.are.log.impl.ConsoleHandler,com.amarsoft.are.log.impl.FileHandler,com.amarsoft.are.log.impl.simple.WarnFileHandler +#,com.amarsoft.are.log.impl.FileHandler,com.amarsoft.are.log.impl.simple.WarnFileHandler +com.amarsoft.are.log.SimpleLog.handlers=com.amarsoft.are.log.impl.ConsoleHandler -com.amarsoft.are.log.impl.simple.WarnFileHandler.level = error; +#com.amarsoft.are.log.impl.simple.WarnFileHandler.level = error; +# +#com.amarsoft.are.log.impl.simple.WarnFileHandler.pattern = /Users/lichaojie/apzl/tmp/log/a3web_warn_%g.log +# +#com.amarsoft.are.log.impl.simple.WarnFileHandler.limit = 1024000 +# +#com.amarsoft.are.log.impl.FileHandler.level = info#com.amarsoft.are.log.impl.FileHandler.pattern = {$ARE.APP_HOME}/log/a3web_%D_%g.log +# +#com.amarsoft.are.log.impl.FileHandler.pattern = /Users/lichaojie/apzl/tmp/log/a3web_%D_%g.log +# +#com.amarsoft.are.log.impl.FileHandler.limit = 10240000 +#com.amarsoft.are.log.impl.FileHandler.count = 10 +#com.amarsoft.are.log.impl.FileHandler.append = true +#com.amarsoft.are.log.impl.FileHandler.formatter = com.amarsoft.are.log.impl.simple.SimpleFormatter -com.amarsoft.are.log.impl.simple.WarnFileHandler.pattern = /tmp/log/a3web_warn_%g.log - -com.amarsoft.are.log.impl.simple.WarnFileHandler.limit = 1024000 - -com.amarsoft.are.log.impl.FileHandler.level = info#com.amarsoft.are.log.impl.FileHandler.pattern = {$ARE.APP_HOME}/log/a3web_%D_%g.log - -com.amarsoft.are.log.impl.FileHandler.pattern = /tmp/log/a3web_%D_%g.log - -com.amarsoft.are.log.impl.FileHandler.limit = 10240000 -com.amarsoft.are.log.impl.FileHandler.count = 10 -com.amarsoft.are.log.impl.FileHandler.append = true -com.amarsoft.are.log.impl.FileHandler.formatter = com.amarsoft.are.log.impl.simple.SimpleFormatter - -com.amarsoft.are.log.impl.ConsoleHandler.level = info \ No newline at end of file +com.amarsoft.are.log.impl.ConsoleHandler.level = all \ No newline at end of file diff --git a/WebContent/WEB-INF/lib/jackson-annotations-2.15.2.jar b/WebContent/WEB-INF/lib/jackson-annotations-2.15.2.jar new file mode 100644 index 000000000..f8799c3fe Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-annotations-2.15.2.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-core-2.15.2.jar b/WebContent/WEB-INF/lib/jackson-core-2.15.2.jar new file mode 100644 index 000000000..a0e748650 Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-core-2.15.2.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-databind-2.15.2.jar b/WebContent/WEB-INF/lib/jackson-databind-2.15.2.jar new file mode 100644 index 000000000..86f9a8669 Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-databind-2.15.2.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-dataformat-xml-2.15.2.jar b/WebContent/WEB-INF/lib/jackson-dataformat-xml-2.15.2.jar new file mode 100644 index 000000000..480f6eae6 Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-dataformat-xml-2.15.2.jar differ diff --git a/WebContent/WEB-INF/lib/stax2-api-4.2.1.jar b/WebContent/WEB-INF/lib/stax2-api-4.2.1.jar new file mode 100644 index 000000000..28c6a08f4 Binary files /dev/null and b/WebContent/WEB-INF/lib/stax2-api-4.2.1.jar differ diff --git a/WebContent/WEB-INF/lib/woodstox-core-6.5.1.jar b/WebContent/WEB-INF/lib/woodstox-core-6.5.1.jar new file mode 100644 index 000000000..b22b38469 Binary files /dev/null and b/WebContent/WEB-INF/lib/woodstox-core-6.5.1.jar differ diff --git a/WebContent/WEB-INF/lib/wstx-asl-3.2.0.jar b/WebContent/WEB-INF/lib/wstx-asl-3.2.0.jar deleted file mode 100644 index 24c895ca7..000000000 Binary files a/WebContent/WEB-INF/lib/wstx-asl-3.2.0.jar and /dev/null differ diff --git a/config/cgb.properties b/config/cgb.properties index 54ed59eb2..953a5bf1a 100644 --- a/config/cgb.properties +++ b/config/cgb.properties @@ -5,4 +5,9 @@ entUserId=100001 #操作密码 password=1q2w3e4r #前置机地址 -cgbUrl=http://114.242.219.170:63312/CGBClient/BankAction \ No newline at end of file +cgbUrl=http://114.242.219.170:63312/CGBClient/BankAction + +#本方账号 +ownAccBank=广发银行 +ownAccName=安鹏融资租赁（天津）有限公司 +ownAccNumber=9550880217136700372 \ No newline at end of file diff --git a/src_cmb/com/tenwa/cgb/conf/CGBconfProperties.java b/src_cmb/com/tenwa/cgb/conf/CGBconfProperties.java index 91ba0a429..e32f4c966 100644 --- a/src_cmb/com/tenwa/cgb/conf/CGBconfProperties.java +++ b/src_cmb/com/tenwa/cgb/conf/CGBconfProperties.java @@ -16,6 +16,9 @@ public class CGBconfProperties { public static final String ENTUSERID; public static final String PASSWORD; public static final String CGBURL; + public static final String OWNACCBANK; + public static final String OWNACCNAME; + public static final String OWNACCNUMBER; static { Properties prop = new Properties(); @@ -28,5 +31,8 @@ public class CGBconfProperties { ENTUSERID = prop.getProperty("entUserId"); PASSWORD = prop.getProperty("password"); CGBURL = prop.getProperty("cgbUrl"); + OWNACCBANK = prop.getProperty("ownAccBank"); + OWNACCNAME = prop.getProperty("ownAccName"); + OWNACCNUMBER = prop.getProperty("ownAccNumber"); } } diff --git a/src_jbo/com/tenwa/insurance/LB_CONTRACT_INSURANCE_INFO.java b/src_jbo/com/tenwa/insurance/LB_CONTRACT_INSURANCE_INFO.java index c2d8d4ec4..809835f49 100644 --- a/src_jbo/com/tenwa/insurance/LB_CONTRACT_INSURANCE_INFO.java +++ b/src_jbo/com/tenwa/insurance/LB_CONTRACT_INSURANCE_INFO.java @@ -134,13 +134,11 @@ public interface LB_CONTRACT_INSURANCE_INFO{ */ public static final String UPDATETIME = "UPDATETIME"; /** - * 被保险人姓名 - */ + * 被保险人姓名 STRING(32)
+ */ public static final String insurance_username = "insurance_username"; /** - * 被保险人身份证号 - */ + * 被保险人身份证号 STRING(32)
+ */ public static final String insurance_cert_id = "insurance_cert_id"; - - } \ No newline at end of file diff --git a/src_jbo/jbo/app/VI_VOUCHER_V8.java b/src_jbo/jbo/app/VI_VOUCHER_V8.java index 7e2732f85..36489dfc4 100644 --- a/src_jbo/jbo/app/VI_VOUCHER_V8.java +++ b/src_jbo/jbo/app/VI_VOUCHER_V8.java @@ -133,4 +133,12 @@ public interface VI_VOUCHER_V8{ * NC传输成功日期 STRING(20)
*/ public static final String CREATE_TIME = "CREATE_TIME"; + /** + * 会计年 STRING(20)
+ */ + public static final String f51 = "f51"; + /** + * 会计月 STRING(20)
+ */ + public static final String f52 = "f52"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LB_ACTUAL_PAYMENT_INFO.java b/src_jbo/jbo/app/tenwa/calc/LB_ACTUAL_PAYMENT_INFO.java index 62a20adc7..2af6528ef 100644 --- a/src_jbo/jbo/app/tenwa/calc/LB_ACTUAL_PAYMENT_INFO.java +++ b/src_jbo/jbo/app/tenwa/calc/LB_ACTUAL_PAYMENT_INFO.java @@ -53,4 +53,20 @@ public interface LB_ACTUAL_PAYMENT_INFO{ * UPDATETIME STRING(32)
*/ public static final String UPDATETIME = "UPDATETIME"; + /** + * 本方银行 STRING(200)
+ */ + public static final String bank = "bank"; + /** + * 本方账户 STRING(200)
+ */ + public static final String account = "account"; + /** + * 本方帐号 STRING(200)
+ */ + public static final String acc_number = "acc_number"; + /** + * 付款方式 STRING(10)
+ */ + public static final String pay_mode = "pay_mode"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LB_ACTUAL_PAYMENT_INFO_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LB_ACTUAL_PAYMENT_INFO_TEMP.java index e37392dfd..b0af7b0f4 100644 --- a/src_jbo/jbo/app/tenwa/calc/LB_ACTUAL_PAYMENT_INFO_TEMP.java +++ b/src_jbo/jbo/app/tenwa/calc/LB_ACTUAL_PAYMENT_INFO_TEMP.java @@ -57,4 +57,20 @@ public interface LB_ACTUAL_PAYMENT_INFO_TEMP{ * FLOWUNID STRING(32)
*/ public static final String FLOWUNID = "FLOWUNID"; + /** + * 本方银行 STRING(200)
+ */ + public static final String bank = "bank"; + /** + * 本方账户 STRING(200)
+ */ + public static final String account = "account"; + /** + * 本方帐号 STRING(200)
+ */ + public static final String acc_number = "acc_number"; + /** + * 付款方式 STRING(10)
+ */ + public static final String pay_mode = "pay_mode"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION.java index 8215899cd..23b2b251a 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION.java @@ -606,20 +606,23 @@ public interface LC_CALC_CONDITION{ */ public static final String STRATEGY_ROA = "STRATEGY_ROA"; /** - * 是否灵活分润
- */ + * 是否灵活分润 STRING(20)
+ */ public static final String SPLIT_TYPE = "SPLIT_TYPE"; /** - * 个人意外险
- */ + * 个人意外险 DOUBLE(22)
+ */ public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE"; /** - * 贴息
- */ + * 贴息 DOUBLE(22)
+ */ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; - /** - * 综合利率
- */ + * 分段配置 STRING(32)
+ */ + public static final String SUBSECTION_CONDIG = "SUBSECTION_CONDIG"; + /** + * 综合利率 STRING(32)
+ */ public static final String COMPREHENSIVE_RATE = "COMPREHENSIVE_RATE"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_HIS.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_HIS.java index 71a6e9af7..b8de85b36 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_HIS.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_HIS.java @@ -606,19 +606,23 @@ public interface LC_CALC_CONDITION_HIS{ */ public static final String STRATEGY_ROA = "STRATEGY_ROA"; /** - * 是否灵活分润
- */ + * 是否灵活分润 STRING(20)
+ */ public static final String SPLIT_TYPE = "SPLIT_TYPE"; /** - * 个人意外险
- */ + * 个人意外险 DOUBLE(22)
+ */ public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE"; /** - * 贴息
- */ + * 贴息 DOUBLE(22)
+ */ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; /** - * 综合利率
- */ + * 分段配置 STRING(32)
+ */ + public static final String SUBSECTION_CONDIG = "SUBSECTION_CONDIG"; + /** + * 综合利率 STRING(32)
+ */ public static final String COMPREHENSIVE_RATE = "COMPREHENSIVE_RATE"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_TEMP.java index 8b018dbe4..f4c323ef2 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_TEMP.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_TEMP.java @@ -606,19 +606,23 @@ public interface LC_CALC_CONDITION_TEMP{ */ public static final String STRATEGY_ROA = "STRATEGY_ROA"; /** - * 是否灵活分润
- */ + * 是否灵活分润 STRING(20)
+ */ public static final String SPLIT_TYPE = "SPLIT_TYPE"; /** - * 个人意外险
- */ + * 个人意外险 DOUBLE(22)
+ */ public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE"; /** - * 贴息
- */ + * 贴息 DOUBLE(22)
+ */ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; /** - * 综合利率
- */ + * 分段配置 STRING(32)
+ */ + public static final String SUBSECTION_CONDIG = "SUBSECTION_CONDIG"; + /** + * 综合利率 STRING(32)
+ */ public static final String COMPREHENSIVE_RATE = "COMPREHENSIVE_RATE"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java index f2141980c..92773db77 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java @@ -130,23 +130,23 @@ public interface LC_CALC_SUBSECTION_INFO{ */ public static final String MINIMUM_DISCOUNT = "MINIMUM_DISCOUNT"; /** - * 贴息后利率是否固定 STRING(10)
- */ + * 贴息后利率是否固定 STRING(10)
+ */ public static final String IS_FIXED_DISCOUNT_RATE = "IS_FIXED_DISCOUNT_RATE"; /** - * 最大期次 STRING(32)
- */ + * 最大期次 STRING(32)
+ */ public static final String MAX_INCOME_NUMBER = "MAX_INCOME_NUMBER"; /** - * 最小期次 STRING(32)
- */ + * 最小期次 STRING(32)
+ */ public static final String MIN_INCOME_NUMBER = "MIN_INCOME_NUMBER"; /** - * 融资金额最小值 STRING(10)
- */ + * 融资金额最小值 STRING(32)
+ */ public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY"; /** - * 贴息金额 - */ + * 贴息金额 DOUBLE(18)
+ */ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java index fdce07460..b9a0327f7 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java @@ -130,24 +130,23 @@ public interface LC_CALC_SUBSECTION_INFO_HIS{ */ public static final String MINIMUM_DISCOUNT = "MINIMUM_DISCOUNT"; /** - * 贴息后利率是否固定 STRING(10)
- */ + * 贴息后利率是否固定 STRING(10)
+ */ public static final String IS_FIXED_DISCOUNT_RATE = "IS_FIXED_DISCOUNT_RATE"; - /** - * 最大期次 STRING(32)
- */ + * 最大期次 STRING(32)
+ */ public static final String MAX_INCOME_NUMBER = "MAX_INCOME_NUMBER"; /** - * 最小期次 STRING(32)
- */ + * 最小期次 STRING(32)
+ */ public static final String MIN_INCOME_NUMBER = "MIN_INCOME_NUMBER"; /** - * 融资金额最小值 STRING(32
- */ + * 融资金额最小值 STRING(32)
+ */ public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY"; /** - * 贴息金额 - */ + * 贴息金额 DOUBLE(18)
+ */ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_TEMP.java index dd39e5808..8ee59a716 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_TEMP.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_TEMP.java @@ -134,23 +134,23 @@ public interface LC_CALC_SUBSECTION_INFO_TEMP{ */ public static final String MINIMUM_DISCOUNT = "MINIMUM_DISCOUNT"; /** - * 贴息后利率是否固定 STRING(10)
- */ + * 贴息后利率是否固定 STRING(10)
+ */ public static final String IS_FIXED_DISCOUNT_RATE = "IS_FIXED_DISCOUNT_RATE"; /** - * 最大期次 STRING(32)
- */ + * 最大期次 STRING(32)
+ */ public static final String MAX_INCOME_NUMBER = "MAX_INCOME_NUMBER"; /** - * 最小期次 STRING(32)
- */ + * 最小期次 STRING(32)
+ */ public static final String MIN_INCOME_NUMBER = "MIN_INCOME_NUMBER"; /** - * 融资金额最小值 STRING(32
- */ + * 融资金额最小值 STRING(32)
+ */ public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY"; /** - * 贴息金额 - */ + * 贴息金额 DOUBLE(18)
+ */ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CARD_TLSIGN.java b/src_jbo/jbo/app/tenwa/calc/LC_CARD_TLSIGN.java index a595eaa9e..dfa20eef9 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_CARD_TLSIGN.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_CARD_TLSIGN.java @@ -42,11 +42,11 @@ public interface LC_CARD_TLSIGN{ */ public static final String CUSTOMER_LAUNCH_TIME = "CUSTOMER_LAUNCH_TIME"; /** - * 协议号 STRING(100)
- */ + * 协议号 STRING(100)
+ */ public static final String AGRMNO = "AGRMNO"; /** - * 签约类型 STRING(10)
- */ + * 签约类型 STRING(10)
+ */ public static final String sign_type = "sign_type"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_COLLECT_MANUAL_INFO.java b/src_jbo/jbo/app/tenwa/calc/LC_COLLECT_MANUAL_INFO.java index 2ddf92993..7502dd0af 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_COLLECT_MANUAL_INFO.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_COLLECT_MANUAL_INFO.java @@ -26,6 +26,10 @@ public interface LC_COLLECT_MANUAL_INFO{ */ public static final String plan_id = "plan_id"; /** + * 期次 STRING(20)
+ */ + public static final String plan_list = "plan_list"; + /** * 卡扣金额 STRING(20)
*/ public static final String money = "money"; diff --git a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java index 17c41bc9d..a37501f5f 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java @@ -66,7 +66,7 @@ public interface LC_DORMANT_RENT_ADJUST{ */ public static final String UPDATETIME = "UPDATETIME"; /** - * 休眠变更前IRR STRING(32)
- */ + * 休眠变更前IRR DOUBLE(22)
+ */ public static final String IRR_OLD = "IRR_OLD"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java index 835ab8fb4..0e5a02c7c 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java @@ -70,7 +70,7 @@ public interface LC_DORMANT_RENT_ADJUST_TEMP{ */ public static final String UPDATETIME = "UPDATETIME"; /** - * 休眠变更前IRR STRING(32)
- */ + * 休眠变更前IRR DOUBLE(22)
+ */ public static final String IRR_OLD = "IRR_OLD"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_RENT_PLAN.java b/src_jbo/jbo/app/tenwa/calc/LC_RENT_PLAN.java index 2dc13f6e4..547cbde84 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_RENT_PLAN.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_RENT_PLAN.java @@ -185,4 +185,8 @@ public interface LC_RENT_PLAN{ * 分润支付状态 STRING(2)
*/ public static final String SPLITTING_STATUS = "SPLITTING_STATUS"; + /** + * 扣款方式 STRING(10)
+ */ + public static final String CHARGE_WAY = "CHARGE_WAY"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_PLAN.java b/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_PLAN.java index 8ecedbae2..a249424cc 100644 --- a/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_PLAN.java +++ b/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_PLAN.java @@ -125,9 +125,8 @@ public interface VI_LC_RENT_PLAN{ * 回笼状态 STRING(20)
*/ public static final String planstatus = "planstatus"; - /** - * 项目id STRING(20)
- */ + * 项目id STRING(20)
+ */ public static final String project_id = "project_id"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/customer/CUSTOMER_ACCOUNT_HIS.java b/src_jbo/jbo/app/tenwa/customer/CUSTOMER_ACCOUNT_HIS.java index 6d2246b1c..179a34cee 100644 --- a/src_jbo/jbo/app/tenwa/customer/CUSTOMER_ACCOUNT_HIS.java +++ b/src_jbo/jbo/app/tenwa/customer/CUSTOMER_ACCOUNT_HIS.java @@ -109,4 +109,16 @@ public interface CUSTOMER_ACCOUNT_HIS{ * 客户类型 STRING(40)
*/ public static final String CUSTTYPE = "CUSTTYPE"; + /** + * 扣款类型 STRING(20)
+ */ + public static final String collect_type = "collect_type"; + /** + * 银行编号 STRING(20)
+ */ + public static final String bank_code = "bank_code"; + /** + * 银行名称 STRING(20)
+ */ + public static final String bank_type = "bank_type"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH.java b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH.java index e97f7654d..b252e6f00 100644 --- a/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH.java +++ b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH.java @@ -7,7 +7,7 @@ import java.lang.String; * Note: This file is generated by ADE tools, dont modify it.
*/ -public interface VI_LB_IDENTITY_CHECK_CREDITAUTH { +public interface VI_LB_IDENTITY_CHECK_CREDITAUTH{ /** * 身份校验视图表

* 代表本类映射的BizObjectClass @@ -33,11 +33,12 @@ public interface VI_LB_IDENTITY_CHECK_CREDITAUTH { * 电话号 STRING(20)
*/ public static final String phone = "phone"; - /** - * 电话号 STRING(20)
- */ + * 授权模板名称 STRING(20)
+ */ public static final String creditauth = "creditauth"; - + /** + * 授权模板类型 STRING(20)
+ */ public static final String credittype = "credittype"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java index 41c5219d0..15b66d269 100644 --- a/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java +++ b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java @@ -7,7 +7,7 @@ import java.lang.String; * Note: This file is generated by ADE tools, dont modify it.
*/ -public interface VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN { +public interface VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN{ /** * 身份校验视图表

* 代表本类映射的BizObjectClass @@ -33,11 +33,12 @@ public interface VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN { * 电话号 STRING(20)
*/ public static final String phone = "phone"; - /** - * 电话号 STRING(20)
- */ + * 授权模板名称 STRING(20)
+ */ public static final String creditauth = "creditauth"; - + /** + * 授权模板类型 STRING(20)
+ */ public static final String credittype = "credittype"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java index d3b7cccbd..fd32e0968 100644 --- a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java +++ b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java @@ -97,28 +97,24 @@ public interface LB_INVOICE_INFO{ * 更新时间 STRING(100)
*/ public static final String updatetime = "updatetime"; - - /** - * 税率 STRING(100)
- */ + * 税率 STRING(20)
+ */ public static final String tax_rate = "tax_rate"; /** - * 税率_挂车 STRING(100)
- */ + * 税率_挂车 STRING(20)
+ */ public static final String tax_rate_bak = "tax_rate_bak"; /** - * 税金合计 STRING(100)
- */ + * 税金合计 STRING(32)
+ */ public static final String tax_due_total = "tax_due_total"; /** - * 开票金额合计 STRING(100)
- */ + * 开票金额合计 STRING(32)
+ */ public static final String Invoice_money_total = "Invoice_money_total"; - /** - * 车辆信息id STRING(32)
- */ + * 车辆信息id STRING(32)
+ */ public static final String equipment_id = "equipment_id"; - } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java index ca1e5b839..aefb35489 100644 --- a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java +++ b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java @@ -14,7 +14,7 @@ public interface LB_INVOICE_INFO_TEMP{ */ public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.invoice.LB_INVOICE_INFO_TEMP"; /** - * 唯一标识 STRING(32 )
+ * 唯一标识 STRING(32)
*/ public static final String id = "id"; /** @@ -101,26 +101,24 @@ public interface LB_INVOICE_INFO_TEMP{ * 更新时间 STRING(100)
*/ public static final String updatetime = "updatetime"; - /** - * 税率 STRING(100)
- */ + * 税率 STRING(20)
+ */ public static final String tax_rate = "tax_rate"; /** - * 税率_挂车 STRING(100)
- */ + * 税率_挂车 STRING(20)
+ */ public static final String tax_rate_bak = "tax_rate_bak"; /** - * 税金合计 STRING(100)
- */ + * 税金合计 STRING(32)
+ */ public static final String tax_due_total = "tax_due_total"; /** - * 开票金额合计 STRING(100)
- */ + * 开票金额合计 STRING(32)
+ */ public static final String Invoice_money_total = "Invoice_money_total"; - /** - * 车辆信息id STRING(32)
- */ + * 车辆信息id STRING(32)
+ */ public static final String equipment_id = "equipment_id"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_BUCKLE_LOG.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_BUCKLE_LOG.java index 46a70a34a..7998d01e3 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_BUCKLE_LOG.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_BUCKLE_LOG.java @@ -46,8 +46,8 @@ public interface LB_BUCKLE_LOG{ */ public static final String cut_money = "cut_money"; /** - * 卡扣类型 STRING(10)
- */ + * 卡扣类型 STRING(10)
+ */ public static final String deduction_type = "deduction_type"; /** * 登记人 STRING(32)
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LC_FUND_INCOME_CALLBACK_DETAIL_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LC_FUND_INCOME_CALLBACK_DETAIL_TEMP.java index 6394de038..629b7de31 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LC_FUND_INCOME_CALLBACK_DETAIL_TEMP.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LC_FUND_INCOME_CALLBACK_DETAIL_TEMP.java @@ -22,7 +22,7 @@ public interface LC_FUND_INCOME_CALLBACK_DETAIL_TEMP{ */ public static final String CMB_PAY_NO = "CMB_PAY_NO"; /** - * 付款日志 STRING(32)
+ * 付款日志(未使用字段,暂存广发批次号) STRING(32)
*/ public static final String CMB_PAY_LOG = "CMB_PAY_LOG"; /** @@ -38,7 +38,7 @@ public interface LC_FUND_INCOME_CALLBACK_DETAIL_TEMP{ */ public static final String FLOWUNID = "FLOWUNID"; /** - * 流水号 STRING(10)
+ * 流水号 STRING(50)
*/ public static final String SQRNBR = "SQRNBR"; /** diff --git a/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_QUERY.java b/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_QUERY.java index 720010c53..cc584b2c8 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_QUERY.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_QUERY.java @@ -3,99 +3,98 @@ package jbo.com.tenwa.lease.comm; import java.lang.String; /** - * - JBO命名常量类

- * Note: This file is generated by ADE tools, dont modify it.
+* - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
- */ +*/ public interface VI_BUSINESS_QUERY{ /** - *

- * 代表本类映射的BizObjectClass - */ + *

+ * 代表本类映射的BizObjectClass + */ public static final String CLASS_NAME = "jbo.com.tenwa.lease.comm.VI_BUSINESS_QUERY"; /** - * 上一流水号 STRING(20)
- */ + * 上一流水号 STRING(20)
+ */ public static final String relativeserialno = "relativeserialno"; /** - * 流水号 STRING(20)
- */ + * 流水号 STRING(20)
+ */ public static final String serialno = "serialno"; /** - * 合同编号 STRING(20)
- */ + * 合同编号 STRING(20)
+ */ public static final String contract_id = "contract_id"; /** - * 项目编号 STRING(20)
- */ + * 项目编号 STRING(20)
+ */ public static final String proj_id = "proj_id"; /** - * 产品名称 STRING(20)
- */ + * 产品名称 STRING(20)
+ */ public static final String product_name = "product_name"; /** - * 流程编号 STRING(20)
- */ + * 流程编号 STRING(20)
+ */ public static final String flow_unid = "flow_unid"; /** - * 当前阶段号 STRING(20)
- */ + * 当前阶段号 STRING(20)
+ */ public static final String phaseno = "phaseno"; /** - * 当前流程名称 STRING(20)
- */ - + * 当前流程名称 STRING(20)
+ */ public static final String flowname = "flowname"; /** - * 申请类型 STRING(20)
- */ + * 申请类型 STRING(20)
+ */ public static final String applytype = "applytype"; /** - * 阶段类型 STRING(20)
- */ + * 阶段类型 STRING(20)
+ */ public static final String phasetype = "phasetype"; /** - * 对象编号 STRING(20)
- */ + * 对象编号 STRING(20)
+ */ public static final String objectno = "objectno"; /** - * 对象类型 STRING(20)
- */ + * 对象类型 STRING(20)
+ */ public static final String objecttype = "objecttype"; /** - * 承办人编号 STRING(20)
- */ + * 承办人编号 STRING(20)
+ */ public static final String USERID = "USERID"; /** - * 当前流程号 STRING(20)
- */ + * 当前流程号 STRING(20)
+ */ public static final String flowno = "flowno"; /** - * 项目/合同号 STRING(20)
- */ + * 项目/合同号 STRING(20)
+ */ public static final String flow_key = "flow_key"; /** - * 承租人名称 STRING(20)
- */ + * 承租人名称 STRING(20)
+ */ public static final String CUSTOMER_NAME = "CUSTOMER_NAME"; /** - * 经销商名称 STRING(20)
- */ + * 经销商名称 STRING(20)
+ */ public static final String DISTRIBUTOR_NAME = "DISTRIBUTOR_NAME"; /** - * 当前任务名称 STRING(20)
- */ + * 当前任务名称 STRING(20)
+ */ public static final String PHASENAME = "PHASENAME"; /** - * 当前处理人 STRING(20)
- */ + * 当前处理人 STRING(20)
+ */ public static final String USERNAME = "USERNAME"; /** - * 任务开始时间 STRING(20)
- */ + * 任务开始时间 STRING(20)
+ */ public static final String BEGINTIME = "BEGINTIME"; /** - * 任务结束时间 STRING(20)
- */ + * 任务结束时间 STRING(20)
+ */ public static final String ENDTIME = "ENDTIME"; } \ No newline at end of file diff --git a/src_jbo/jbo/loan/VI_YC_RENT_COLLECT.java b/src_jbo/jbo/loan/VI_YC_RENT_COLLECT.java index f9c47f944..23f241697 100644 --- a/src_jbo/jbo/loan/VI_YC_RENT_COLLECT.java +++ b/src_jbo/jbo/loan/VI_YC_RENT_COLLECT.java @@ -22,6 +22,10 @@ public interface VI_YC_RENT_COLLECT{ */ public static final String distributor_id = "distributor_id"; /** + * 合同主键ID STRING(32)
+ */ + public static final String contract_id = "contract_id"; + /** * payment_number STRING(32)
*/ public static final String payment_number = "payment_number"; diff --git a/src_jbo/jbo/oti/FC_FILE_PUSH.java b/src_jbo/jbo/oti/FC_FILE_PUSH.java index 4291167c1..d6ed021ec 100644 --- a/src_jbo/jbo/oti/FC_FILE_PUSH.java +++ b/src_jbo/jbo/oti/FC_FILE_PUSH.java @@ -1,13 +1,15 @@ package jbo.oti; +import java.lang.String; + /** -* 接口资料表 - JBO命名常量类

+* 对账文件信息 - JBO命名常量类

* Note: This file is generated by ADE tools, dont modify it.
*/ -public interface FC_FILE_PUSH { +public interface FC_FILE_PUSH{ /** - * 接口资料表

+ * 对账文件信息

* 代表本类映射的BizObjectClass */ public static final String CLASS_NAME = "jbo.oti.FC_FILE_PUSH"; @@ -16,7 +18,7 @@ public interface FC_FILE_PUSH { */ public static final String ID = "ID"; /** - * 渠道编号 STRING(32)
+ * 渠道编码 STRING(32)
*/ public static final String CHANNEL_NO = "CHANNEL_NO"; /** @@ -28,28 +30,28 @@ public interface FC_FILE_PUSH { */ public static final String FC_FILE_PUSH_NAME = "FC_FILE_PUSH_NAME"; /** - * 文件类型 STRING(32)
- */ + * 文件类型 STRING(32)
+ */ public static final String FILE_TYPE = "FILE_TYPE"; /** - * 文件名称 STRING(32)
- */ + * 文件名称 STRING(32)
+ */ public static final String FILE_NAME = "FILE_NAME"; /** - * 文件路径 STRING(32)
- */ + * 文件路径 STRING(32)
+ */ public static final String FILE_PATH = "FILE_PATH"; /** - * 文件状态 STRING(32)
- */ + * 文件状态：0,下载失败，1、解析失败，2、解析成功，3、拷贝成功 STRING(32)
+ */ public static final String FILE_STS = "FILE_STS"; /** - * 文件状态描述 STRING(32)
- */ + * 文件状态描述 STRING(32)
+ */ public static final String FILE_STS_DESC = "FILE_STS_DESC"; /** - * 包含订单数量 STRING(32)
- */ + * 文件包含订单数量 STRING(32)
+ */ public static final String ORDER_COUNT = "ORDER_COUNT"; /** * 创建时间 STRING(32)
@@ -59,6 +61,4 @@ public interface FC_FILE_PUSH { * 修改时间 STRING(32)
*/ public static final String UPDATE_TIME = "UPDATE_TIME"; - - } \ No newline at end of file diff --git a/src_jbo/jbo/oti/FC_REQUEST.java b/src_jbo/jbo/oti/FC_REQUEST.java index cbc61e7c3..604405743 100644 --- a/src_jbo/jbo/oti/FC_REQUEST.java +++ b/src_jbo/jbo/oti/FC_REQUEST.java @@ -30,12 +30,12 @@ public interface FC_REQUEST{ */ public static final String CHANNEL_NAME = "CHANNEL_NAME"; /** - * 资金渠道产品ID STRING(32)
- */ + * 资金渠道产品编号 STRING(32)
+ */ public static final String CHANNEL_PRODUCT_ID = "CHANNEL_PRODUCT_ID"; /** - * 资金渠道产品名称 STRING(32)
- */ + * 资金渠道产品描述 STRING(32)
+ */ public static final String CHANNEL_PRODUCT_DESC = "CHANNEL_PRODUCT_DESC"; /** * 项目ID STRING(32)
@@ -77,29 +77,29 @@ public interface FC_REQUEST{ * 客户名称 STRING(32)
*/ public static final String CUSTOMER_NAME = "CUSTOMER_NAME"; - /** - * 当前状态 STRING(32)
- */ - public static final String FC_STATUS = "FC_STATUS"; /** * 当前订单状态：0信审中，1信审通过，2合通签署成功，3放款成功 STRING(32)
*/ public static final String FC_STAGE = "FC_STAGE"; /** + * 当前状态 STRING(32)
+ */ + public static final String FC_STATUS = "FC_STATUS"; + /** * 返回状态描述 STRING(32)
*/ public static final String FC_REMARK = "FC_REMARK"; /** - * 是否需要补充资料清单 STRING(32)
- */ + * 是否需要补充资料清单 STRING(32)
+ */ public static final String SUPPLEMENT_STS = "SUPPLEMENT_STS"; /** - * 通知需要补充资料清单描述 STRING(32)
- */ + * 通知需要补充资料清单描述 STRING(32)
+ */ public static final String SUPPLEMENT_DESC = "SUPPLEMENT_DESC"; /** - * 资料补充时间 STRING(32)
- */ + * 资料补充时间 STRING(32)
+ */ public static final String SUPPLEMENT_TIME = "SUPPLEMENT_TIME"; /** * 创建时间 STRING(32)
diff --git a/src_jbo/jbo/oti/FC_REQUEST_FILE.java b/src_jbo/jbo/oti/FC_REQUEST_FILE.java index 3f7e85fc4..8a1063e8b 100644 --- a/src_jbo/jbo/oti/FC_REQUEST_FILE.java +++ b/src_jbo/jbo/oti/FC_REQUEST_FILE.java @@ -42,8 +42,8 @@ public interface FC_REQUEST_FILE{ */ public static final String FC_FILE_TYPE = "FC_FILE_TYPE"; /** - * 资方：文件类型：JPG,PNG,FDP等 STRING(32)
- */ + * 例如：image/jpeg等 STRING(32)
+ */ public static final String FILE_TYPE = "FILE_TYPE"; /** * 文件名称 STRING(32)
@@ -62,8 +62,8 @@ public interface FC_REQUEST_FILE{ */ public static final String FC_FILE_STS_DESC = "FC_FILE_STS_DESC"; /** - * 邮储返回状态 STRING(32)
- */ + * 邮储返回状态 STRING(32)
+ */ public static final String FC_RES_VALUE = "FC_RES_VALUE"; /** * 创建时间 STRING(32)
@@ -78,11 +78,11 @@ public interface FC_REQUEST_FILE{ */ public static final String DEL_FLAG = "DEL_FLAG"; /** - * 上传时间 STRING(32)
- */ + * 上传时间 STRING(32)
+ */ public static final String INPUTTIME = "INPUTTIME"; /** - * 上传人 STRING(32)
- */ + * 上传人 STRING(32)
+ */ public static final String INPUTUSER = "INPUTUSER"; } \ No newline at end of file diff --git a/src_jbo/jbo/oti/FC_YC_FILE_REPAY_PLAN.java b/src_jbo/jbo/oti/FC_YC_FILE_REPAY_PLAN.java index 9658ac934..c60ac3c8b 100644 --- a/src_jbo/jbo/oti/FC_YC_FILE_REPAY_PLAN.java +++ b/src_jbo/jbo/oti/FC_YC_FILE_REPAY_PLAN.java @@ -1,13 +1,15 @@ package jbo.oti; +import java.lang.String; + /** -* 接口资料表 - JBO命名常量类

+* 资方租金计划信息 - JBO命名常量类

* Note: This file is generated by ADE tools, dont modify it.
*/ -public interface FC_YC_FILE_REPAY_PLAN { +public interface FC_YC_FILE_REPAY_PLAN{ /** - * 接口资料表

+ * 资方租金计划信息

* 代表本类映射的BizObjectClass */ public static final String CLASS_NAME = "jbo.oti.FC_YC_FILE_REPAY_PLAN"; @@ -16,15 +18,15 @@ public interface FC_YC_FILE_REPAY_PLAN { */ public static final String ID = "ID"; /** - * 文件ID STRING(32)
- */ + * 资金渠道申请ID STRING(32)
+ */ public static final String FC_FILE_ID = "FC_FILE_ID"; /** * 资金渠道申请ID STRING(32)
*/ public static final String FC_REQUEST_ID = "FC_REQUEST_ID"; /** - * 放款请求编号 STRING(32)
+ * 放款申请编号 STRING(32)
*/ public static final String LOAN_NO = "LOAN_NO"; /** @@ -32,20 +34,20 @@ public interface FC_YC_FILE_REPAY_PLAN { */ public static final String LEND_TERM = "LEND_TERM"; /** - * 还款日期 STRING(32)
- */ + * 还款日期 STRING(32)
+ */ public static final String ANS_REPAYMENT_DATE = "ANS_REPAYMENT_DATE"; /** - * 本金 STRING(32)
- */ + * 本金 STRING(32)
+ */ public static final String ANS_PRINCIPAL = "ANS_PRINCIPAL"; /** - * 利息 STRING(32)
- */ + * 利息 STRING(32)
+ */ public static final String ANS_INTEREST = "ANS_INTEREST"; /** - * 租金 STRING(32)
- */ + * 租金 STRING(32)
+ */ public static final String ANS_REPAYMENT_MONEY = "ANS_REPAYMENT_MONEY"; /** * 创建时间 STRING(32)
@@ -55,5 +57,4 @@ public interface FC_YC_FILE_REPAY_PLAN { * 修改时间 STRING(32)
*/ public static final String UPDATE_TIME = "UPDATE_TIME"; - } \ No newline at end of file diff --git a/src_jbo/jbo/oti/LC_PROFIT_PLAN.java b/src_jbo/jbo/oti/LC_PROFIT_PLAN.java index afb276500..711218611 100644 --- a/src_jbo/jbo/oti/LC_PROFIT_PLAN.java +++ b/src_jbo/jbo/oti/LC_PROFIT_PLAN.java @@ -1,13 +1,15 @@ package jbo.oti; +import java.lang.String; + /** -* 接口资料表 - JBO命名常量类

+* 资方分润计划信息 - JBO命名常量类

* Note: This file is generated by ADE tools, dont modify it.
*/ -public interface LC_PROFIT_PLAN { +public interface LC_PROFIT_PLAN{ /** - * 接口资料表

+ * 资方分润计划信息

* 代表本类映射的BizObjectClass */ public static final String CLASS_NAME = "jbo.oti.LC_PROFIT_PLAN"; @@ -16,12 +18,12 @@ public interface LC_PROFIT_PLAN { */ public static final String ID = "ID"; /** - * 对应租金计划ID STRING(32)
- */ + * 对应租金计划id STRING(32)
+ */ public static final String RENT_PLAN_ID = "RENT_PLAN_ID"; /** - * 资方利率 STRING(32)
- */ + * 资方利率 STRING(32)
+ */ public static final String CORPUS_RATE = "CORPUS_RATE"; /** * 分润金额 STRING(32)
@@ -31,6 +33,4 @@ public interface LC_PROFIT_PLAN { * 创建时间 STRING(32)
*/ public static final String INPUTTIME = "INPUTTIME"; - - } \ No newline at end of file diff --git a/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java b/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java index b87060eda..3995d98dc 100644 --- a/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java +++ b/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java @@ -22,8 +22,8 @@ public interface LB_PRODUCT_CORPUS_SOURCE{ */ public static final String PRODUCT_ID = "PRODUCT_ID"; /** - * 对应邮储产品 STRING(32)
- */ + * 对应渠道产品 STRING(32)
+ */ public static final String CHANNEL_PRODUCT_ID = "CHANNEL_PRODUCT_ID"; /** * 资金来源 STRING(32)
diff --git a/src_jbo/jbo/sys/USER_AUTHORITY_CHECK.java b/src_jbo/jbo/sys/USER_AUTHORITY_CHECK.java index 2155ab065..1e0698871 100644 --- a/src_jbo/jbo/sys/USER_AUTHORITY_CHECK.java +++ b/src_jbo/jbo/sys/USER_AUTHORITY_CHECK.java @@ -1,23 +1,24 @@ package jbo.sys; +import java.lang.String; + /** * 经销商管理人员角色权限表 - JBO命名常量类

* Note: This file is generated by ADE tools, dont modify it.
*/ -public interface USER_AUTHORITY_CHECK { +public interface USER_AUTHORITY_CHECK{ /** * 经销商管理人员角色权限表

* 代表本类映射的BizObjectClass */ public static final String CLASS_NAME = "jbo.sys.USER_AUTHORITY_CHECK"; /** - * ID编号 STRING(32)
+ * 编号 INT(32)
*/ public static final String ID = "ID"; /** - * 用户登录名 STRING(80)
+ * 用户登录名 STRING(32)
*/ public static final String LOGINID = "LOGINID"; - } \ No newline at end of file diff --git a/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ReqBody.java b/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ReqBody.java new file mode 100644 index 000000000..fe8abe12e --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ReqBody.java @@ -0,0 +1,115 @@ +package com.tenwa.cgbbank.dto; + +/** + * 名称 变量名称 类型长度 缺省值 备注 + * 账号 account 32 被查询账号，必填 + * 开始日期 beginDate 8 日期格式(YYYYMMDD)，必填 + * 结束日期 endDate 8 日期格式(YYYYMMDD)，必填 + * 查询类型 queryType 1 0：全部、1：付款、2：收款。暂只支持“0：全部” + * 起始记录交易日期 beginRecTranDate 8 第一次查询为空，非第一次查询为查询的第一条记录的交易日期，由上页查询获得，日期格式(YYYYMMDD) + * 起始记录交易代号 beginRecTranCode 5 1.第一次查询为空；2.非第一次查询为查询的第一条记录的交易代号，由上页查询获得 + * 起始记录CBS交易流水号 beginRecTranSeq 12 第一次查询为空；非第一次查询为查询的第一条记录的CBS交易流水号，由上页查询获得 + * 查询笔数 queryNumber 6 必填，（大于0并且小于或等于1000） + * 保留字段1 reserve1 50 预留字段，暂时未使用 + * 保留字段2 reserve2 50 预留字段，暂时未使用 + */ + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-07 09:40 + */ +public class CGB0032ReqBody { + + String account; + String beginDate; + String endDate; + Integer queryType; + String beginRecTranDate; + String beginRecTranCode; + String beginRecTranSeq; + Integer queryNumber; + String reserve1; + String reserve2; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getBeginDate() { + return beginDate; + } + + public void setBeginDate(String beginDate) { + this.beginDate = beginDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public Integer getQueryType() { + return queryType; + } + + public void setQueryType(Integer queryType) { + this.queryType = queryType; + } + + public String getBeginRecTranDate() { + return beginRecTranDate; + } + + public void setBeginRecTranDate(String beginRecTranDate) { + this.beginRecTranDate = beginRecTranDate; + } + + public String getBeginRecTranCode() { + return beginRecTranCode; + } + + public void setBeginRecTranCode(String beginRecTranCode) { + this.beginRecTranCode = beginRecTranCode; + } + + public String getBeginRecTranSeq() { + return beginRecTranSeq; + } + + public void setBeginRecTranSeq(String beginRecTranSeq) { + this.beginRecTranSeq = beginRecTranSeq; + } + + public Integer getQueryNumber() { + return queryNumber; + } + + public void setQueryNumber(Integer queryNumber) { + this.queryNumber = queryNumber; + } + + public String getReserve1() { + return reserve1; + } + + public void setReserve1(String reserve1) { + this.reserve1 = reserve1; + } + + public String getReserve2() { + return reserve2; + } + + public void setReserve2(String reserve2) { + this.reserve2 = reserve2; + } +} diff --git a/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBody.java b/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBody.java new file mode 100644 index 000000000..ec4182540 --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBody.java @@ -0,0 +1,107 @@ +package com.tenwa.cgbbank.dto; + +import java.util.List; + +/** + * 名称 变量名称 类型长度 缺省值 备注 + * 账号 Account 32 + * 返回交易笔数 totalNum 15 + * 页标识 pageFlag 1 0：不存在下一页，1：存在下一页 + * 下页交易日期 nextRecTranDate 8 当“页标识”为1时，此域不为空，日期格式(YYYYMMDD) + * 下页CBS交易流水号 nextRecTranSeq 12 当“页标识”为1时，此域不为空 + * 下页交易代号 nextRecTranCode 5 当“页标识”为1时，此域不为空 + * 保留字段1 reserve1 50 预留字段，暂时未使用 + * 保留字段2 reserve2 50 预留字段，暂时未使用 + * 流水列表 records + */ + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-07 09:40 + */ +public class CGB0032ResBody { + + String account; + Integer totalNum; + Integer pageFlag; + String nextRecTranDate; + String nextRecTranSeq; + String nextRecTranCode; + String reserve1; + String reserve2; + List records; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public Integer getTotalNum() { + return totalNum; + } + + public void setTotalNum(Integer totalNum) { + this.totalNum = totalNum; + } + + public Integer getPageFlag() { + return pageFlag; + } + + public void setPageFlag(Integer pageFlag) { + this.pageFlag = pageFlag; + } + + public String getNextRecTranDate() { + return nextRecTranDate; + } + + public void setNextRecTranDate(String nextRecTranDate) { + this.nextRecTranDate = nextRecTranDate; + } + + public String getNextRecTranSeq() { + return nextRecTranSeq; + } + + public void setNextRecTranSeq(String nextRecTranSeq) { + this.nextRecTranSeq = nextRecTranSeq; + } + + public String getNextRecTranCode() { + return nextRecTranCode; + } + + public void setNextRecTranCode(String nextRecTranCode) { + this.nextRecTranCode = nextRecTranCode; + } + + public String getReserve1() { + return reserve1; + } + + public void setReserve1(String reserve1) { + this.reserve1 = reserve1; + } + + public String getReserve2() { + return reserve2; + } + + public void setReserve2(String reserve2) { + this.reserve2 = reserve2; + } + + public List getRecords() { + return records; + } + + public void setRecords(List records) { + this.records = records; + } +} diff --git a/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBodyRecord.java b/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBodyRecord.java new file mode 100644 index 000000000..03019a7cc --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBodyRecord.java @@ -0,0 +1,285 @@ +package com.tenwa.cgbbank.dto; + + +/** + * 名称 变量名称 类型长度 缺省值 备注 + * 交易序号 serialNo 20 循环域 + * 交易日期 dealDate 8 循环域，日期格式(YYYYMMDD) + * 借贷标志 loanSign 1 循环域 +/- + * 交易金额 dealMoney 20 循环域，实际数字是（19，2）小数点占一位，整数部分占17位 + * 正负标志 financingSymbol 1 循环域 +/- + * 可用余额 usableMoney 20 循环域，实际数字是（19，2）小数点占一位，整数部分占17位 + * 业务描述 Abstract 32 循环域，如：资金上拔、资金下划 + * 交易行所 dealBranch 40 循环域 + * 凭证号码 upBill 16 循环域 + * 对方账号 oppoAccno 32 循环域 + * 对方户名 Name 82 循环域 + * 对手方行号 rcvBankId 14 循环域，行内交易显示行所号，行外交易显示联行号 + * 交易时间 dealTime 6 循环域，时间格式(HHMMSS) + * 附加信息 abstractContent 30 循环域 + * 交易渠道 dealChannel 20 循环域 + * 备注 summary 22 循环域 + * 附言 postScript 102 循环域 + * 对手账号类型 oppAccountType 1 循环域，1-对公 0-对私 空-非我行账号 + * 唯一标识码 uniqueCode 32 循环域，可全行标识交易唯一性 + * CBS交易序号 cbsTranSeq 5 循环域 + * 会计日期 reserve1 50 循环域 + * 企业财务流水号 reserve2 50 循环域，批量转账交易为客户批次流水号 + */ + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.tenwa.cgb.conf.CGBconfProperties; +import com.tenwa.util.GlobalConst; +import com.tenwa.util.SerialNumberUtil; +import jbo.app.tenwa.calc.LC_EBANK; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-07 09:40 + */ +public class CGB0032ResBodyRecord { + String serialNo; + String dealDate; + String loanSign; + String dealMoney; + String financingSymbol; + String usableMoney; + String Abstract; + String dealBranch; + String upBill; + String oppoAccno; + String name; + String rcvBankId; + String dealTime; + String abstractContent; + String dealChannel; + String summary; + String postScript; + String oppAccountType; + String uniqueCode; + String cbsTranSeq; + String reserve1; + String reserve2; + + public String getSerialNo() { + return serialNo; + } + + public void setSerialNo(String serialNo) { + this.serialNo = serialNo; + } + + public String getDealDate() { + return dealDate; + } + + public void setDealDate(String dealDate) { + this.dealDate = dealDate; + } + + public String getLoanSign() { + return loanSign; + } + + public void setLoanSign(String loanSign) { + this.loanSign = loanSign; + } + + public String getDealMoney() { + return dealMoney; + } + + public void setDealMoney(String dealMoney) { + this.dealMoney = dealMoney; + } + + public String getFinancingSymbol() { + return financingSymbol; + } + + public void setFinancingSymbol(String financingSymbol) { + this.financingSymbol = financingSymbol; + } + + public String getUsableMoney() { + return usableMoney; + } + + public void setUsableMoney(String usableMoney) { + this.usableMoney = usableMoney; + } + + public String getAbstract() { + return Abstract; + } + + public void setAbstract(String anAbstract) { + Abstract = anAbstract; + } + + public String getDealBranch() { + return dealBranch; + } + + public void setDealBranch(String dealBranch) { + this.dealBranch = dealBranch; + } + + public String getUpBill() { + return upBill; + } + + public void setUpBill(String upBill) { + this.upBill = upBill; + } + + public String getOppoAccno() { + return oppoAccno; + } + + public void setOppoAccno(String oppoAccno) { + this.oppoAccno = oppoAccno; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getRcvBankId() { + return rcvBankId; + } + + public void setRcvBankId(String rcvBankId) { + this.rcvBankId = rcvBankId; + } + + public String getDealTime() { + return dealTime; + } + + public void setDealTime(String dealTime) { + this.dealTime = dealTime; + } + + public String getAbstractContent() { + return abstractContent; + } + + public void setAbstractContent(String abstractContent) { + this.abstractContent = abstractContent; + } + + public String getDealChannel() { + return dealChannel; + } + + public void setDealChannel(String dealChannel) { + this.dealChannel = dealChannel; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getPostScript() { + return postScript; + } + + public void setPostScript(String postScript) { + this.postScript = postScript; + } + + public String getOppAccountType() { + return oppAccountType; + } + + public void setOppAccountType(String oppAccountType) { + this.oppAccountType = oppAccountType; + } + + public String getUniqueCode() { + return uniqueCode; + } + + public void setUniqueCode(String uniqueCode) { + this.uniqueCode = uniqueCode; + } + + public String getCbsTranSeq() { + return cbsTranSeq; + } + + public void setCbsTranSeq(String cbsTranSeq) { + this.cbsTranSeq = cbsTranSeq; + } + + public String getReserve1() { + return reserve1; + } + + public void setReserve1(String reserve1) { + this.reserve1 = reserve1; + } + + public String getReserve2() { + return reserve2; + } + + public void setReserve2(String reserve2) { + this.reserve2 = reserve2; + } + + + + public BizObject convertToEbank(BizObjectManager manager, String userId, String orgId) throws JBOException { + String nowDateTime = LocalDateTime.now().format(GlobalConst.dateTimeFormatter); + + BizObject bizObject = manager.newObject(); + bizObject.setAttributeValue(LC_EBANK.ID, ""); +// bizObject.setAttributeValue(LC_EBANK.EBANK_NUMBER, ); + bizObject.setAttributeValue(LC_EBANK.EBANK_SN, this.cbsTranSeq); + bizObject.setAttributeValue(LC_EBANK.MONEY_TYPE, "currency_type1"); + bizObject.setAttributeValue(LC_EBANK.FACT_MONEY, this.dealMoney); + bizObject.setAttributeValue(LC_EBANK.FACT_DATE, this.dealDate); + bizObject.setAttributeValue(LC_EBANK.NOWITH_MONEY, 0); + bizObject.setAttributeValue(LC_EBANK.RATE, 0); + bizObject.setAttributeValue(LC_EBANK.OWN_BANK, CGBconfProperties.OWNACCBANK); + bizObject.setAttributeValue(LC_EBANK.OWN_ACCOUNT, CGBconfProperties.OWNACCNAME); + bizObject.setAttributeValue(LC_EBANK.OWNACC_NUMBER, CGBconfProperties.OWNACCNUMBER); + bizObject.setAttributeValue(LC_EBANK.CLIENT_NAME, this.name); + bizObject.setAttributeValue(LC_EBANK.CLIENT_BANK, "银行"); + bizObject.setAttributeValue(LC_EBANK.CLIENT_ACCOUNT, this.name); + bizObject.setAttributeValue(LC_EBANK.CLIENT_ACC_NUMBER, this.oppoAccno); + bizObject.setAttributeValue(LC_EBANK.HAD_MONEY, this.dealMoney); + bizObject.setAttributeValue(LC_EBANK.MAYOPE_MONEY, this.dealMoney); +// bizObject.setAttributeValue(LC_EBANK.FUND_MONEY, ); + bizObject.setAttributeValue(LC_EBANK.INVALID, "N"); + bizObject.setAttributeValue(LC_EBANK.SUMMARY, this.summary); + bizObject.setAttributeValue(LC_EBANK.INPUTUSERID, userId); + bizObject.setAttributeValue(LC_EBANK.INPUTORGID, orgId); + bizObject.setAttributeValue(LC_EBANK.INPUTTIME, nowDateTime); + bizObject.setAttributeValue(LC_EBANK.UPDATEUSERID, userId); + bizObject.setAttributeValue(LC_EBANK.UPDATEORGID, orgId); + bizObject.setAttributeValue(LC_EBANK.UPDATETIME, nowDateTime); + bizObject.setAttributeValue(LC_EBANK.DEBIT_MONEY, this.dealMoney); + bizObject.setAttributeValue(LC_EBANK.BUSINESS_TYPE, "汽车"); + bizObject.setAttributeValue(LC_EBANK.CUSTOMER_TYPE, "外部客商"); + return bizObject; + } +} diff --git a/src_tenwa/com/tenwa/cgbbank/dto/CGBBEDC.java b/src_tenwa/com/tenwa/cgbbank/dto/CGBBEDC.java new file mode 100644 index 000000000..f0999d9ef --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/dto/CGBBEDC.java @@ -0,0 +1,25 @@ +package com.tenwa.cgbbank.dto; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-07 10:42 + */ +@JacksonXmlRootElement(localName = "BEDC") +public class CGBBEDC { + + @JacksonXmlProperty(localName = "Message") + CGBMessage message; + + public CGBMessage getMessage() { + return message; + } + + public void setMessage(CGBMessage message) { + this.message = message; + } +} diff --git a/src_tenwa/com/tenwa/cgbbank/dto/CGBMessage.java b/src_tenwa/com/tenwa/cgbbank/dto/CGBMessage.java new file mode 100644 index 000000000..dd44555ee --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/dto/CGBMessage.java @@ -0,0 +1,33 @@ +package com.tenwa.cgbbank.dto; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-07 09:38 + */ +public class CGBMessage { + + CGBMessageHead commHead; + + @JacksonXmlProperty(localName = "Body") + T body; + + public CGBMessageHead getCommHead() { + return commHead; + } + + public void setCommHead(CGBMessageHead commHead) { + this.commHead = commHead; + } + + public T getBody() { + return body; + } + + public void setBody(T body) { + this.body = body; + } +} diff --git a/src_tenwa/com/tenwa/cgbbank/dto/CGBMessageHead.java b/src_tenwa/com/tenwa/cgbbank/dto/CGBMessageHead.java new file mode 100644 index 000000000..a4852aaaf --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/dto/CGBMessageHead.java @@ -0,0 +1,125 @@ +package com.tenwa.cgbbank.dto; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData; + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-07 09:40 + */ +public class CGBMessageHead { + + /** + * 交易码 + * @description: 交易代码（必填字段） + */ + String tranCode; + + /** + * 客户号 + * @description: 标识企业身份，为银企直联的客户号（必填字段） + */ + String cifMaster; + + /** + * 企业财务系统流水号 + * @description: 企业财务系统自己产生的流水号。每天唯一（转账类交易每天必须唯一,查询类交易可不唯一,必填字段） + */ + String entSeqNo; + + /** + * 日期 + * @description: 企业财务系统日期格式：YYYYMMDD(必填字段) + */ + String tranDate; + + /** + * 时间 + * @description: 企业财务系统时间格式：HHMMSS(必填字段) + */ + String tranTime; + + /** + * 返回码 + * @description: 企业上送报文留空（填空格），银行默认返回000 + */ + String retCode; + + /** + * 操作员 + * @description: 银企直联的操作员（当设置了查询、转账交易必须校验操作员用户名密码，此字段必填） + */ + String entUserId; + + /** + * 操作密码 + * @description: 银企直联操作员登录密码（当设置了查询、转账交易必须校验操作员用户名密码，此字段必填） + */ + @JacksonXmlCData + String password; + + public String getTranCode() { + return tranCode; + } + + public void setTranCode(String tranCode) { + this.tranCode = tranCode; + } + + public String getCifMaster() { + return cifMaster; + } + + public void setCifMaster(String cifMaster) { + this.cifMaster = cifMaster; + } + + public String getEntSeqNo() { + return entSeqNo; + } + + public void setEntSeqNo(String entSeqNo) { + this.entSeqNo = entSeqNo; + } + + public String getTranDate() { + return tranDate; + } + + public void setTranDate(String tranDate) { + this.tranDate = tranDate; + } + + public String getTranTime() { + return tranTime; + } + + public void setTranTime(String tranTime) { + this.tranTime = tranTime; + } + + public String getRetCode() { + return retCode; + } + + public void setRetCode(String retCode) { + this.retCode = retCode; + } + + public String getEntUserId() { + return entUserId; + } + + public void setEntUserId(String entUserId) { + this.entUserId = entUserId; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/cgbbank/enums/CGBInterfaceEnum.java b/src_tenwa/com/tenwa/cgbbank/enums/CGBInterfaceEnum.java new file mode 100644 index 000000000..4d00aacb6 --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/enums/CGBInterfaceEnum.java @@ -0,0 +1,28 @@ +package com.tenwa.cgbbank.enums; + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-07 15:09 + */ +public enum CGBInterfaceEnum { + + I0032("0032","交易明细查询-分页模式"); + + private String code; + private String name; + + CGBInterfaceEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public String getCode() { + return code; + } + + public String getName() { + return name; + } +} diff --git a/src_tenwa/com/tenwa/cgbbank/helper/CGBBankInterfaceHelper.java b/src_tenwa/com/tenwa/cgbbank/helper/CGBBankInterfaceHelper.java new file mode 100644 index 000000000..9de1b391f --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/helper/CGBBankInterfaceHelper.java @@ -0,0 +1,112 @@ +package com.tenwa.cgbbank.helper; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.fasterxml.jackson.dataformat.xml.ser.XmlSerializerProvider; +import com.fasterxml.jackson.dataformat.xml.util.XmlRootNameLookup; +import com.google.common.collect.ImmutableMap; +import com.tenwa.cgb.conf.CGBconfProperties; +import com.tenwa.cgb.util.CGBLogAssistant; +import com.tenwa.cgb.util.HttpAssistant; +import com.tenwa.cgbbank.dto.*; +import com.tenwa.cgbbank.enums.CGBInterfaceEnum; +import com.tenwa.cgbbank.xml.CustomNullSerializer; +import com.tenwa.comm.util.date.DateAssistant; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-06 17:39 + */ +public class CGBBankInterfaceHelper { + + private static Log log = LogFactory.getLog(CGBBankInterfaceHelper.class); + + private static CGBBankInterfaceHelper instance = new CGBBankInterfaceHelper(); + + private CGBBankInterfaceHelper() { + } + + public static CGBBankInterfaceHelper getInstance() { + return instance; + } + + private static XmlMapper xmlMapper = new XmlMapper(); + + static { + XmlSerializerProvider provider = new XmlSerializerProvider(new XmlRootNameLookup()); + provider.setNullValueSerializer(new CustomNullSerializer()); + xmlMapper.setSerializerProvider(provider); + } + + /** + * 0032-交易明细查询-分页模式 + * + * @param reqBody + * @return + * @throws Exception + */ + public CGBBEDC queryTransactionDetails(CGB0032ReqBody reqBody) throws Exception { + return request(CGBInterfaceEnum.I0032, reqBody, new TypeReference>() { + }); + } + + private CGBBEDC request(CGBInterfaceEnum interfaceEnum, REQ req, TypeReference> resTypeReference) throws Exception { + String customerBatchNo = "AP" + System.currentTimeMillis(); + String cgbbedcXml = buildReqXml(interfaceEnum, req); + log.info("CGB [" + customerBatchNo + "] 【" + interfaceEnum.getName() + "】请求参数: " + cgbbedcXml); + CGBLogAssistant.insertCGBlog(interfaceEnum.getName(), interfaceEnum.getCode(), customerBatchNo, null, cgbbedcXml); + String retMsg = HttpAssistant.post(CGBconfProperties.CGBURL, ImmutableMap.of("cgb_data", cgbbedcXml)); + + if (retMsg == null) { + //更新返回日志 + // TODO 记录异常状态 + CGBLogAssistant.updateCGBlog(customerBatchNo, null, retMsg); + throw new RuntimeException("连接前置机异常,请联系管理员!"); + } + //更新返回日志 + CGBLogAssistant.updateCGBlog(customerBatchNo, null, retMsg); + log.info("CGB [" + customerBatchNo + "] 【" + interfaceEnum.getName() + "】返回结果: " + retMsg); + + CGBBEDC tcgbbedc = xmlMapper.readValue(retMsg, resTypeReference); + return tcgbbedc; + } + + private String buildReqXml(CGBInterfaceEnum interfaceEnum, T reqBody) throws JsonProcessingException { + CGBMessageHead messageHead = new CGBMessageHead(); + messageHead.setTranCode(interfaceEnum.getCode()); + messageHead.setCifMaster(CGBconfProperties.CIFMASTER); + messageHead.setEntSeqNo("CGB" + System.currentTimeMillis()); + messageHead.setTranDate(DateAssistant.getFormatDate("yyyyMMdd")); + messageHead.setTranTime(DateAssistant.getFormatDate("HHmmss")); + messageHead.setEntUserId(CGBconfProperties.ENTUSERID); + messageHead.setPassword(CGBconfProperties.PASSWORD); + + CGBMessage message = new CGBMessage<>(); + message.setCommHead(messageHead); + message.setBody(reqBody); + + CGBBEDC cgbbedc = new CGBBEDC<>(); + cgbbedc.setMessage(message); + return "" + xmlMapper.writeValueAsString(cgbbedc); + } + + public static void main(String[] args) throws JsonProcessingException { + CGB0032ReqBody reqBody = new CGB0032ReqBody(); + reqBody.setAccount("23232326454534767987"); + reqBody.setBeginDate("20230614"); + reqBody.setEndDate("20230614"); + reqBody.setQueryType(0); + reqBody.setQueryNumber(20); + + + CGBBankInterfaceHelper instance1 = CGBBankInterfaceHelper.getInstance(); + String xml = instance1.buildReqXml(CGBInterfaceEnum.I0032, reqBody); + System.out.println(xml); + + } +} diff --git a/src_tenwa/com/tenwa/cgbbank/service/CGBBankService.java b/src_tenwa/com/tenwa/cgbbank/service/CGBBankService.java new file mode 100644 index 000000000..f5eb5e941 --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/service/CGBBankService.java @@ -0,0 +1,85 @@ +package com.tenwa.cgbbank.service; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.tenwa.cgbbank.dto.*; +import com.tenwa.cgbbank.helper.CGBBankInterfaceHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.List; + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-14 09:30 + */ +public class CGBBankService { + + private static Log log = LogFactory.getLog(CGBBankService.class); + + private static CGBBankService instance = new CGBBankService(); + + private CGBBankService() { + } + + public static CGBBankService getInstance() { + return instance; + } + + private static CGBBankInterfaceHelper cgbBankInterfaceHelper = CGBBankInterfaceHelper.getInstance(); + + // 默认操作人ID + private String defOperUserId = "admin"; + // 默认操作人部门ID + private String defOperOrgId = "8009001"; + + private static final Integer QUERY_PAGE_SIZE = 20; + + public void queryAndSaveTransactionDetailsToEbank(String account, String queryDate) throws JBOException { + + CGB0032ReqBody reqBody = new CGB0032ReqBody(); + reqBody.setAccount(account); + reqBody.setBeginDate(queryDate); + reqBody.setEndDate(queryDate); + reqBody.setQueryType(0); + reqBody.setQueryNumber(QUERY_PAGE_SIZE); + + boolean queryFlag = true; +// List ebankObjList = new ArrayList<>(); + BizObjectManager bizObjectManager = JBOFactory.getBizObjectManager("jbo.app.tenwa.calc.LC_EBANK"); + while (queryFlag) { + CGBBEDC cgb0032ResBodyCGBBEDC = null; + try { + cgb0032ResBodyCGBBEDC = cgbBankInterfaceHelper.queryTransactionDetails(reqBody); + } catch (Exception e) { + throw new RuntimeException(e); + } + CGBMessage message = cgb0032ResBodyCGBBEDC.getMessage(); + CGB0032ResBody resBody = message.getBody(); + + List records = resBody.getRecords(); + // 转换成网银流水 +// ebankObjList.clear(); + for (CGB0032ResBodyRecord record : records) { + if (record.getFinancingSymbol().equals("+")) { +// ebankObjList.add(); + BizObject bizObject = record.convertToEbank(bizObjectManager, defOperUserId, defOperOrgId); + bizObjectManager.saveObject(bizObject); + } + } + + if (resBody.getPageFlag() != 1) { + queryFlag = false; + } else { + reqBody.setBeginRecTranDate(resBody.getNextRecTranDate()); + reqBody.setBeginRecTranSeq(resBody.getNextRecTranSeq()); + reqBody.setBeginRecTranCode(resBody.getNextRecTranCode()); + } + } + } + +} diff --git a/src_tenwa/com/tenwa/cgbbank/xml/CustomNullSerializer.java b/src_tenwa/com/tenwa/cgbbank/xml/CustomNullSerializer.java new file mode 100644 index 000000000..c100478ed --- /dev/null +++ b/src_tenwa/com/tenwa/cgbbank/xml/CustomNullSerializer.java @@ -0,0 +1,16 @@ +package com.tenwa.cgbbank.xml; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + + +import java.io.IOException; + +public class CustomNullSerializer extends JsonSerializer { + + @Override + public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { + jsonGenerator.writeString(""); + } +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/util/GlobalConst.java b/src_tenwa/com/tenwa/util/GlobalConst.java new file mode 100644 index 000000000..0f40f5fc1 --- /dev/null +++ b/src_tenwa/com/tenwa/util/GlobalConst.java @@ -0,0 +1,20 @@ +package com.tenwa.util; + +import java.time.format.DateTimeFormatter; + +/** + * @program: apzl_leasing + * @description: + * @author: 李超杰 + * @create: 2023-06-08 16:50 + */ +public final class GlobalConst { + + public static final DateTimeFormatter dateFormatterNone = DateTimeFormatter.ofPattern("yyyyMMdd"); + public static final DateTimeFormatter dateFormatterSlash = DateTimeFormatter.ofPattern("yyyy/MM/dd"); + public static final DateTimeFormatter dateFormatterBar = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + public static final DateTimeFormatter dateFormatterCN = DateTimeFormatter.ofPattern("yyyy年MM月dd日"); + public static final DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss"); + public static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"); + +} diff --git a/src_tenwa/quartz/CGBOnlineBankingTransactionRecordsPullJob.java b/src_tenwa/quartz/CGBOnlineBankingTransactionRecordsPullJob.java new file mode 100644 index 000000000..a79274a4a --- /dev/null +++ b/src_tenwa/quartz/CGBOnlineBankingTransactionRecordsPullJob.java @@ -0,0 +1,36 @@ +package quartz; + +import com.tenwa.cgb.conf.CGBconfProperties; +import com.tenwa.cgbbank.service.CGBBankService; +import com.tenwa.util.GlobalConst; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +/** + * @program: apzl_leasing + * @description: 拉取广发银行网银流水 + * @author: 李超杰 + * @create: 2023-06-06 16:23 + */ +public class CGBOnlineBankingTransactionRecordsPullJob implements Job { + + private static Log log = LogFactory.getLog(CGBBankService.class); + + private static CGBBankService cgbBankService = CGBBankService.getInstance(); + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + String yesterday = LocalDate.now().minusDays(1).format(GlobalConst.dateFormatterNone); + try { + cgbBankService.queryAndSaveTransactionDetailsToEbank(CGBconfProperties.OWNACCNUMBER, yesterday); + } catch (Throwable e) { + log.error("定时任务拉取广发银行网银流水失败！拉取日期:" + yesterday + "，本方账号：" + CGBconfProperties.OWNACCNUMBER, e); + } + } +}