Merge branch 'master' of zx/cuspay into master

src/main/java/com/emato/cuspay/notify/CusMerchantNotice.java

@@ -95,10 +95,13 @@ public class CusMerchantNotice implements MerchantNotice{
             noticeList.add(noti);
         });
 
-        //TODO try catch
-        int result = merchNotiMapper.updateBatch(noticeList);
-        if (result < 0) {
-            logger.error("更新商户通知数据失败"+noticeList);
+        try {
+            int result = merchNotiMapper.updateBatch(noticeList);
+            if (result < 0) {
+                logger.error("更新商户通知数据失败" + noticeList);
+            }
+        } catch (Exception e) {
+            logger.error("更新商户通知数据失败", e);
         }
     }
 

src/main/java/com/emato/cuspay/wx/common/MerchNotiBuilder.java

@@ -28,7 +28,7 @@ public class MerchNotiBuilder {
     }
 
     public MerchNotiBuilder wxCbPay(WxCbPayDoc wxCbPay) {
-        this.merchNoti.setAllPaySn(wxCbPay.getPlatNo());
+        this.merchNoti.setAllPaySn(wxCbPay.getMerchErpOrderSn());
         this.merchNoti.setMerchSn(wxCbPay.getMerchSn());
         this.merchNoti.setMerchName(wxCbPay.getMerchName());
         this.merchNoti.setPlatSn(wxCbPay.getPlatSn());

src/main/java/com/emato/cuspay/wx/controller/WxCusController.java

@@ -86,7 +86,7 @@ public class WxCusController {
         beVerified.put("transactionId","微信支付订单号");
         beVerified.put("customs","报送海关");
         beVerified.put("mchCustomsNo","商户海关备案号");
-        beVerified.put("platNo","接入平台内部编号");//merchErpSn 商户erp编号
+        beVerified.put("merchErpOrderSn","商户erp订单编号");
 
         ResponseMessage rst = Validator.isEmpty(beVerified, validate);
         if (ResponseStatus.ERROR.getItem().equals(rst.getCode())) {

src/main/java/com/emato/cuspay/wx/dao/entity/WxCbPayDoc.java

@@ -84,7 +84,7 @@ public class WxCbPayDoc implements Serializable {
 
     private String exField5;
 
-    private String platNo;
+    private String merchErpOrderSn;
 
     private static final long serialVersionUID = 1L;
 
@@ -92,12 +92,12 @@ public class WxCbPayDoc implements Serializable {
         super();
     }
 
-    public String getPlatNo() {
-        return platNo;
+    public String getMerchErpOrderSn() {
+        return merchErpOrderSn;
     }
 
-    public void setPlatNo(String platNo) {
-        this.platNo = platNo == null ? null : platNo.trim();
+    public void setMerchErpOrderSn(String merchErpOrderSn) {
+        this.merchErpOrderSn = merchErpOrderSn == null ? null : merchErpOrderSn.trim();
     }
 
     public String getWxPaySn() {

src/main/java/com/emato/cuspay/wx/dao/entity/WxPayError.java

@@ -188,7 +188,7 @@ public class WxPayError implements Serializable {
         this.createrSn = createrSn == null ? null : createrSn.trim();
     }
 
-    public String getCreateTime() {
+    public String getCreateTime(String format) {
         return createTime;
     }
 

src/main/java/com/emato/cuspay/wx/declare/WxCusDeclare.java

@@ -34,6 +34,8 @@ import org.springframework.stereotype.Component;
 import javax.xml.bind.JAXB;
 import java.io.IOException;
 import java.io.StringReader;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
@@ -50,6 +52,7 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
 
     private static final Logger logger = LoggerFactory.getLogger(WxCusDeclare.class);
 
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Value("${db.wx.declare.limit}")
     private Integer limit;
@@ -108,8 +111,6 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
         //待通知的用户
         List<MerchNoti> merchNotis = Lists.newArrayList();
 
-        //修改数支付单状态为申报中
-
         wxCbPayDocs.forEach(wxCbPayDoc -> {
 
             //获取商户信息 从缓存中去  缓存不存在 从数据库重取
@@ -338,8 +339,7 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
         wxPayError.setCustoms(wxCbPayDoc.getCustoms());
         wxPayError.setErrCode(wxCbPayDoc.getErrCode());
         wxPayError.setErrMsg(wxCbPayDoc.getReturnMsg());
-        //TODO:
-        wxPayError.getCreateTime();
+        wxPayError.getCreateTime(sdf.format(new Date()));
         return  wxPayError;
     }
 

src/main/resources/mybatis/mapper/wx/WxCbPayDocMapper.xml

@@ -42,10 +42,10 @@
     <result column="ex_field3" property="exField3" jdbcType="VARCHAR" />
     <result column="ex_field4" property="exField4" jdbcType="VARCHAR" />
     <result column="ex_field5" property="exField5" jdbcType="VARCHAR" />
-    <result column="plat_no" property="platNo" jdbcType="VARCHAR" />
+    <result column="merch_erp_order_sn" property="merchErpOrderSn" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    wx_pay_sn, merch_sn, merch_name, plat_no, plat_sn, plat_name, third_party_merch_code, third_party_merch_name,
+    wx_pay_sn, merch_sn, merch_name, merch_erp_order_sn, plat_sn, plat_name, third_party_merch_code, third_party_merch_name,
     appid, mch_id, out_trade_no, transaction_id, customs, mch_customs_no, duty, action_type,
     sub_order_no, fee_type, order_fee, transport_fee, product_fee, cert_type, cert_id, 
     name, doc_status, remark, return_code, return_msg, result_code, err_code, err_code_des,
@@ -76,8 +76,8 @@
       <if test="merchName != null" >
         merch_name,
       </if>
-      <if test="platNo != null" >
-        plat_no,
+      <if test="merchErpOrderSn != null" >
+        merch_erp_order_sn,
       </if>
       <if test="platSn != null" >
         plat_sn,
@@ -201,8 +201,8 @@
       <if test="merchName != null" >
         #{merchName,jdbcType=VARCHAR},
       </if>
-      <if test="platNo != null" >
-        #{platNo,jdbcType=VARCHAR},
+      <if test="merchErpOrderSn != null" >
+        #{merchErpOrderSn,jdbcType=VARCHAR},
       </if>
       <if test="platSn != null" >
         #{platSn,jdbcType=VARCHAR},
@@ -327,8 +327,8 @@
       <if test="merchName != null" >
         merch_name = #{merchName,jdbcType=VARCHAR},
       </if>
-      <if test="platNo != null" >
-        plat_no = #{platNo,jdbcType=VARCHAR},
+      <if test="merchErpOrderSn != null" >
+        merch_erp_order_sn = #{merchErpOrderSn,jdbcType=VARCHAR},
       </if>
       <if test="platSn != null" >
         plat_sn = #{platSn,jdbcType=VARCHAR},
@@ -459,7 +459,7 @@
       wx_pay_sn,
       merch_sn,
       merch_name,
-      plat_no,
+      merch_erp_order_sn,
       plat_sn,
       plat_name,
       third_party_merch_code,
@@ -503,7 +503,7 @@
           #{wxPaySn,jdbcType=VARCHAR},
           #{merchSn,jdbcType=VARCHAR},
           #{merchName,jdbcType=VARCHAR},
-          #{platNo,jdbcType=VARCHAR}
+          #{merchErpOrderSn,jdbcType=VARCHAR}
           #{platSn,jdbcType=VARCHAR},
           #{platName,jdbcType=VARCHAR},
           #{thirdPartyMerchCode,jdbcType=VARCHAR},
@@ -554,8 +554,8 @@
         <if test="item.merchName != null" >
           merch_name = #{item.merchName,jdbcType=VARCHAR},
         </if>
-        <if test="item.platNo != null" >
-          plat_no = #{item.platNo,jdbcType=VARCHAR},
+        <if test="item.merchErpOrderSn != null" >
+          merch_erp_order_sn = #{item.merchErpOrderSn,jdbcType=VARCHAR},
         </if>
         <if test="item.platSn != null" >
           plat_sn = #{item.platSn,jdbcType=VARCHAR},