订单结果查询接口代码调整

core/src/main/java/com/chinapay/dto/HlsEbankCcbTransaction.java

@@ -80,6 +80,8 @@ public class HlsEbankCcbTransaction extends BaseDTO {
 
     private String txnTime;
 
+    private Date successDate;
+
     public Long getTransactionId() {
         return transactionId;
     }
@@ -279,4 +281,12 @@ public class HlsEbankCcbTransaction extends BaseDTO {
     public void setTxnTime(String txnTime) {
         this.txnTime = txnTime;
     }
+
+    public Date getSuccessDate() {
+        return successDate;
+    }
+
+    public void setSuccessDate(Date successDate) {
+        this.successDate = successDate;
+    }
 }
\ No newline at end of file

core/src/main/java/com/hand/app/cmb/dto/HlsEbankCmbTransqry.java

@@ -33,9 +33,9 @@ public class HlsEbankCmbTransqry {
 
     private String errDescription;
 
-    private Long txnAmt;
+    private String txnAmt;
 
-    private Long dscAmt;
+    private String dscAmt;
 
     private String currencyCode;
 
@@ -69,6 +69,10 @@ public class HlsEbankCmbTransqry {
 
     private Long lastUpdatedBy;
 
+    private String status;
+
+    private String queryCategory;
+
     public Long getTransqryId() {
         return transqryId;
     }
@@ -149,19 +153,19 @@ public class HlsEbankCmbTransqry {
         this.errDescription = errDescription;
     }
 
-    public Long getTxnAmt() {
+    public String getTxnAmt() {
         return txnAmt;
     }
 
-    public void setTxnAmt(Long txnAmt) {
+    public void setTxnAmt(String txnAmt) {
         this.txnAmt = txnAmt;
     }
 
-    public Long getDscAmt() {
+    public String getDscAmt() {
         return dscAmt;
     }
 
-    public void setDscAmt(Long dscAmt) {
+    public void setDscAmt(String dscAmt) {
         this.dscAmt = dscAmt;
     }
 
@@ -292,4 +296,21 @@ public class HlsEbankCmbTransqry {
     public void setLastUpdatedBy(Long lastUpdatedBy) {
         this.lastUpdatedBy = lastUpdatedBy;
     }
+
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getQueryCategory() {
+        return queryCategory;
+    }
+
+    public void setQueryCategory(String queryCategory) {
+        this.queryCategory = queryCategory;
+    }
 }

core/src/main/resources/app/cmb/mapper/HlsEbankCmbTransqryMapper.xml

@@ -4,9 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hand.app.cmb.mapper.HlsEbankCmbTransqryMapper">
     <resultMap id="baseMap" type="com.hand.app.cmb.dto.HlsEbankCmbTransqry">
-        <result column="TRANSQRY_ID" property="transqryId" jdbcType="NUMBER"/>
+        <result column="TRANSQRY_ID" property="transqryId" jdbcType="DECIMAL"/>
         <result column="TRANSQRY_NUMBER" property="transqryNumber" jdbcType="VARCHAR"/>
-        <result column="TRANSACTION_ID" property="transactionId" jdbcType="NUMBER"/>
+        <result column="TRANSACTION_ID" property="transactionId" jdbcType="DECIMAL"/>
         <result column="MER_ID" property="merId" jdbcType="VARCHAR"/>
         <result column="VERSION" property="version" jdbcType="VARCHAR"/>
         <result column="RETURN_CODE" property="returnCode" jdbcType="VARCHAR"/>
@@ -14,8 +14,8 @@
         <result column="CMB_ORDER_ID" property="cmbOrderId" jdbcType="VARCHAR"/>
         <result column="RESP_CODE" property="respCode" jdbcType="VARCHAR"/>
         <result column="ERR_DESCRIPTION" property="errDescription" jdbcType="VARCHAR"/>
-        <result column="TXN_AMT" property="txnAmt" jdbcType="NUMBER"/>
-        <result column="DSC_AMT" property="dscAmt" jdbcType="NUMBER"/>
+        <result column="TXN_AMT" property="txnAmt" jdbcType="DECIMAL"/>
+        <result column="DSC_AMT" property="dscAmt" jdbcType="DECIMAL"/>
         <result column="CURRENCY_CODE" property="currencyCode" jdbcType="VARCHAR"/>
         <result column="PAY_TYPE" property="payType" jdbcType="VARCHAR"/>
         <result column="OPEN_ID" property="openId" jdbcType="VARCHAR"/>
@@ -29,9 +29,9 @@
         <result column="ERR_CODE" property="errCode" jdbcType="VARCHAR"/>
         <result column="RESP_MSG" property="respMsg" jdbcType="VARCHAR"/>
         <result column="CREATION_DATE" property="creationDate" jdbcType="DATE"/>
-        <result column="CREATED_BY" property="createdBy" jdbcType="NUMBER"/>
+        <result column="CREATED_BY" property="createdBy" jdbcType="DECIMAL"/>
         <result column="LAST_UPDATE_DATE" property="lastUpdateDate" jdbcType="DATE"/>
-        <result column="LAST_UPDATED_BY" property="lastUpdatedBy" jdbcType="NUMBER"/>
+        <result column="LAST_UPDATED_BY" property="lastUpdatedBy" jdbcType="DECIMAL"/>
     </resultMap>
 
 </mapper>

core/src/main/resources/cmb.properties

-#招行获取二维码接口
+#收款码申请
 cmb.qrCodeapplyUrl=https://api.cmburl.cn:8065/polypay/v1.0/mchorders/qrcodeapply
 
-#招行查询订单状态接口
+#支付结果查询
 cmb.orderQueryUrl=https://api.cmburl.cn:8065/polypay/v1.0/mchorders/orderquery
 
-#招行关闭订单接口
-cmb.closeUrl=https://api.cmburl.cn:8065/polypay/v1.0/mchorders/qrcodeapply
+#关闭订单
+cmb.closeUrl=https://api.cmburl.cn:8065/polypay/v1.0/mchorders/close
 
-#uat环境商户国密私钥
+#uat 私钥
 cmb.privateKey=D5F2AFA24E6BA9071B54A8C9AD735F9A1DE9C4657FA386C09B592694BC118B38
-#uat环境招行国密公钥
+#uat 公钥
 cmb.publicKey=MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE6Q+fktsnY9OFP+LpSR5Udbxf5zHCFO0PmOKlFNTxDIGl8jsPbbB/9ET23NV+acSz4FEkzD74sW2iiNVHRLiKHg==
 
 cmb.appId=8ab74856-8772-45c9-96db-54cb30ab9f74

core/src/main/resources/config.properties

@@ -150,12 +150,4 @@ zdw.login.authCode=7b7-f08f197fe2e5
 cup.mer.id=000092112092486
 cup.upload.file.path=D:\\HCLC_FTP\\CUP_OUT\\
 cup.download.file.path=D:\\HCLC_FTP\\CUP_IN\\
-cup.init.file.path=F:\\work\\workspace\\IdeaProjects\\hls-support-rlwx\\key\\
-
-
-cmb.version=0.0.1
-cmb.encoding=UTF-8
-cmb.signMethod=02
-cmb.currencyCode=156
-cmb.user.id=N003574551
-cmb.mer.id=3089991701201D0
\ No newline at end of file
+cup.init.file.path=F:\\work\\workspace\\IdeaProjects\\hls-support-rlwx\\key\\
\ No newline at end of file