新增:读取银行回执，填写实际付款日期。

src/main/resources/application-dev.properties

@@ -51,6 +51,7 @@ mybatis.type-aliases-package=com.hywa.banktest.entity
 mybatis.mapper-locations=classpath:mappers/**/*.xml
 mybatis.check-config-location=true
 mybatis.executor-type=simple
+mybatis.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl 
 
 ###\u90ae\u50a8\u5bf9\u63a5app\u7c7b\u578b
 dlmaps.pub.app_type=1000
@@ -72,9 +73,11 @@ dlmaps.in.company_acc_type=1
 
 trans.post.url=http://222.85.230.169:9001/clearing/serApp
 ####\u672c\u5730\u8d44\u91d1\u6e05\u7b97\u6587\u4ef6\u5b58\u653e\u5730\u5740
-money.clear.file.base.dir=C:/bank
+#money.clear.file.base.dir=C:/bank
+money.clear.file.base.dir=D:/bank
 ####\u672c\u5730\u56de\u76d8\u6587\u4ef6\u5b58\u653e\u5730\u5740
-money.clear.file.base.retdir=C:/bank/ret
+#money.clear.file.base.retdir=C:/bank/ret
+money.clear.file.base.retdir=D:/bank/ret
 
 money.clear.ftp.dir=/home/gzth/upload
 money.clear.ftp.retDir=/home/gzth/download

src/main/resources/application-pro.properties

@@ -1,3 +1,4 @@
+
 #post serivce bank's  socket server address
 bank.post.socket.server.address=192.168.3.198
 #post serivce bank's socket server port
@@ -20,10 +21,15 @@ bank.post.ftp.password=gzth
 local.post.socket.port=8082
 
 
-###mysql\u6570\u636e\u5e93\u914d\u7f6e 111.230.187.252
-spring.datasource.url=jdbc:mysql://111.230.187.252:63342/carbon?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true
+###mysql\u6570\u636e\u5e93\u914d\u7f6e
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+# 121.36.158.171
+#spring.datasource.url=jdbc:mysql://129.28.174.150:7005/carbon-platform?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true
+
+spring.datasource.url=jdbc:mysql://cq-cdb-q6mwof09.sql.tencentcdb.com:63931/carbon-platform-gz?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true
 spring.datasource.username=root
-spring.datasource.password=fgwqhc506706
+#spring.datasource.password=fgwqhc506706
+spring.datasource.password=**gzth@@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.initialSize=1
 spring.datasource.minIdle=3
@@ -46,6 +52,7 @@ mybatis.type-aliases-package=com.hywa.banktest.entity
 mybatis.mapper-locations=classpath:mappers/**/*.xml
 mybatis.check-config-location=true
 mybatis.executor-type=simple
+mybatis.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl
 
 ###\u90ae\u50a8\u5bf9\u63a5app\u7c7b\u578b
 dlmaps.pub.app_type=1000
@@ -54,18 +61,25 @@ dlmaps.pub.bank_id=8
 ###\u90ae\u50a8\u5bf9\u63a5\u516c\u53f8\u4ee3\u7801
 dlmaps.pub.dpt_id=2001
 
+dlmaps.pub.jj.dpt_id=2002
+
 ###\u5355\u4f4d\u4ee3\u7801\uff08\u56fa\u5b9a\u59824000\uff09
 dlmaps.in.company_id=4000
 ###\u5bf9\u516c\u8d26\u6237(\u53d1\u6539\u59d4\u8d26\u53f7)
 dlmaps.in.company_acc=952002010004446675
+
+dlmaps.in.jj.company_acc=952004010004346691
 ###"\u8d26\u53f7\u7c7b\u578b"
 dlmaps.in.company_acc_type=1
 
+trans.post.url=http://222.85.230.169:9001/clearing/serApp
 ####\u672c\u5730\u8d44\u91d1\u6e05\u7b97\u6587\u4ef6\u5b58\u653e\u5730\u5740
 money.clear.file.base.dir=C:/bank
 ####\u672c\u5730\u56de\u76d8\u6587\u4ef6\u5b58\u653e\u5730\u5740
 money.clear.file.base.retdir=C:/bank/ret
 
-money.clear.ftp.dir=/home/gzth/upload
-money.clear.ftp.retDir=/home/gzth/download
+money.clear.ftp.dir=/home/gzth/gzthzj/upload
+money.clear.ftp.retDir=/home/gzth/gzthzj/download
+
+logging.level.root=INFO
 

src/main/resources/mappers/clearing/ClearingRecordDetailMapper.xml

@@ -135,10 +135,11 @@
       SET aa.bank_receipt_file =#{bean.bankReceiptFile},
       aa.bank_deal_state = #{bean.bankDealState},
       aa.clearing_state = #{bean.clearingState},
-      aa.bank_deal_msg = #{bean.bankDealMsg},
-      aa.payment_time = #{bean.clearingTimed}
-      WHERE
-      aa.id = #{bean.id}
+      aa.bank_deal_msg = #{bean.bankDealMsg}
+      <if test="bean.bankReceiptFile != null and bean.bankReceiptFile != ''">
+        ,aa.payment_time = DATE_FORMAT(SUBSTRING_INDEX(#{bean.bankReceiptFile},"res",1),"%Y-%m-%d %T")
+      </if>
+      WHERE aa.id = #{bean.id}
     </foreach>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.hywa.banktest.entity.ClearingRecordDetail">