查询小程序门店【快递协议类型】字段，新增到抓单表进行推单

README.md

@@ -0,0 +1 @@
+gradle clean buildDependents

src/main/java/com/emato/ccnet/wx/dao/entity/ccnet/CusWaybill.java

@@ -84,6 +84,8 @@ public class CusWaybill implements Serializable {
 
     private String exprCompId;
 
+    private String exprAgreementType;
+
     private BigDecimal declExprFee;
 
     private BigDecimal declPostTax;
@@ -124,6 +126,14 @@ public class CusWaybill implements Serializable {
         super();
     }
 
+    public String getExprAgreementType() {
+        return exprAgreementType;
+    }
+
+    public void setExprAgreementType(String exprAgreementType) {
+        this.exprAgreementType = exprAgreementType;
+    }
+
     public String getCusWaybillSn() {
         return cusWaybillSn;
     }

src/main/java/com/emato/ccnet/wx/dao/entity/ccnet/WxOrder.java

@@ -145,12 +145,22 @@ public class WxOrder implements Serializable {
 
     private String exField5;
 
+    private String exprAgreementType;
+
     private static final long serialVersionUID = 1L;
 
     public WxOrder() {
         super();
     }
 
+    public String getExprAgreementType() {
+        return exprAgreementType;
+    }
+
+    public void setExprAgreementType(String exprAgreementType) {
+        this.exprAgreementType = exprAgreementType;
+    }
+
     public String getWxOrderSn() {
         return wxOrderSn;
     }

src/main/java/com/emato/ccnet/wx/dao/entity/wx/WxOrderDate.java

@@ -67,6 +67,16 @@ public class WxOrderDate implements Serializable {
 
     private String buyerPayCheck;
 
+    private String exprAgreementType;
+
+    public String getExprAgreementType() {
+        return exprAgreementType;
+    }
+
+    public void setExprAgreementType(String exprAgreementType) {
+        this.exprAgreementType = exprAgreementType;
+    }
+
     public String getMerchOrderId() {
         return merchOrderId;
     }

src/main/java/com/emato/ccnet/wx/dto/ccnetdto/BondedStockMerchantOrder.java

@@ -158,7 +158,7 @@ public class BondedStockMerchantOrder implements Serializable {
         this.paySucceeded = "0";
         System.out.println(cusWaybill.getExField());
         this.buyerPayerCheck = cusWaybill.getBuyerPayCheck();
-        this.exprAgreementType = "00";
+        this.exprAgreementType = cusWaybill.getExprAgreementType();
         this.transMode = "20";
     }
 

src/main/java/com/emato/ccnet/wx/service/impl/CusOrderServiceImpl.java

@@ -305,6 +305,10 @@ public class CusOrderServiceImpl implements CusOrderService {
                 return null;
             }
 
+//            cusOrder.setEbpCode(merchant.getMerchantCustomsCode());//电商平台代码
+//            cusOrder.setEbpName(merchant.getMerchantCustomsName());//电商平台企业名称
+//            cusOrder.setEbcCode(merchant.getMerchantCustomsCode());//电商商户代码
+//            cusOrder.setEbcName(merchant.getMerchantCustomsName());//电商商户名称
             cusOrder.setEbpCode(merchantPlatform.getPlatCusCode());//电商平台代码
             cusOrder.setEbpName(merchantPlatform.getPlatCusName());//电商平台企业名称
             cusOrder.setEbcCode(merchantPlatform.getPlatCusCode());//电商商户代码

src/main/java/com/emato/ccnet/wx/service/impl/WxOrderServiceImpl.java

@@ -209,6 +209,7 @@ public class WxOrderServiceImpl implements WxOrderService {
         wxOrder.setProjectCheckStatus(CcnetContants.sendStatus.item_0.getItem());
         wxOrder.setPlayOrderStatus(CcnetContants.sendStatus.item_0.getItem());
         wxOrder.setCreateTime(new Date());
+        wxOrder.setExprAgreementType(wxOrderDate.getExprAgreementType());//第三方商户快递协议类型
         return wxOrder;
     }
 

src/main/resources/mybatis/mapper/ccnet/CusWaybillMapper.xml

@@ -41,6 +41,7 @@
     <result column="pay_time" property="payTime" jdbcType="TIMESTAMP" />
     <result column="expr_type" property="exprType" jdbcType="CHAR" />
     <result column="expr_comp_id" property="exprCompId" jdbcType="VARCHAR" />
+    <result column="expr_agreement_type" property="exprAgreementType" jdbcType="CHAR" />
     <result column="decl_expr_fee" property="declExprFee" jdbcType="DECIMAL" />
     <result column="decl_post_tax" property="declPostTax" jdbcType="DECIMAL" />
     <result column="shop_id" property="shopId" jdbcType="VARCHAR" />
@@ -67,7 +68,7 @@
     consignee_mob, consignee_tel, consignee_country_code, consignee_province_code, consignee_province, 
     consignee_city_code, consignee_city, consignee_district_code, consignee_district, 
     consignee_address, consignee_zip_code, payer_name, payer_id_type, payer_id_code, 
-    payer_mob, pay_ent_cus_code, pay_no, actural_paid, pay_time, expr_type, expr_comp_id, 
+    payer_mob, pay_ent_cus_code, pay_no, actural_paid, pay_time, expr_type, expr_comp_id, expr_agreement_type,
     decl_expr_fee, decl_post_tax, shop_id, extra_tag, buyer_pay_check, currency_code, ws_flag, remark,
     creater_sn, create_time, moder_sn, mod_time, tstm, ex_field, ex_field2, ex_field3, 
     ex_field4, ex_field5
@@ -202,6 +203,9 @@
       <if test="exprCompId != null" >
         expr_comp_id,
       </if>
+      <if test="exprAgreementType != null" >
+        expr_agreement_type,
+      </if>
       <if test="declExprFee != null" >
         decl_expr_fee,
       </if>
@@ -375,6 +379,9 @@
       <if test="exprCompId != null" >
         #{exprCompId,jdbcType=VARCHAR},
       </if>
+      <if test="exprAgreementType != null" >
+        #{exprAgreementType,jdbcType=CHAR},
+      </if>
       <if test="declExprFee != null" >
         #{declExprFee,jdbcType=DECIMAL},
       </if>
@@ -548,6 +555,9 @@
       <if test="exprCompId != null" >
         expr_comp_id = #{exprCompId,jdbcType=VARCHAR},
       </if>
+      <if test="exprAgreementType != null" >
+        expr_agreement_type = #{exprAgreementType,jdbcType=CHAR},
+      </if>
       <if test="declExprFee != null" >
         decl_expr_fee = #{declExprFee,jdbcType=DECIMAL},
       </if>

src/main/resources/mybatis/mapper/ccnet/WxOrderMapper.xml

@@ -48,6 +48,7 @@
     <result column="pay_time" property="payTime" jdbcType="TIMESTAMP" />
     <result column="expr_type" property="exprType" jdbcType="CHAR" />
     <result column="expr_comp_id" property="exprCompId" jdbcType="VARCHAR" />
+    <result column="expr_agreement_type" property="exprAgreementType" jdbcType="CHAR" />
     <result column="decl_expr_fee" property="declExprFee" jdbcType="DECIMAL" />
     <result column="batch_numbers" property="batchNumbers" jdbcType="VARCHAR" />
     <result column="decl_post_tax" property="declPostTax" jdbcType="DECIMAL" />
@@ -82,7 +83,7 @@
     consignee_city, consignee_district_code, consignee_district, consignee_address, consignee_zip_code, 
     payer_name, payer_id_type, payer_id_code, payer_mob, pay_ent_cus_code, pay_no, goods_value, 
     freight, discount, tax_total, actural_paid, pay_time, expr_type, expr_comp_id, decl_expr_fee, 
-    batch_numbers, decl_post_tax, shop_id, extra_tag, currency_code, ws_flag, buyer_pay_check, wx_order_detail, clec_order_status,
+    batch_numbers, decl_post_tax, shop_id, extra_tag, currency_code, ws_flag, buyer_pay_check, wx_order_detail, clec_order_status,expr_agreement_type,
     way_order_status, project_check_status, play_order_status, remark, creater_sn, create_time, 
     moder_sn, mod_time, tstm, ex_field, ex_field2, ex_field3, ex_field4, ex_field5
   </sql>
@@ -237,6 +238,9 @@
       <if test="exprCompId != null" >
         expr_comp_id,
       </if>
+      <if test="exprAgreementType != null" >
+        expr_agreement_type,
+      </if>
       <if test="declExprFee != null" >
         decl_expr_fee,
       </if>
@@ -449,6 +453,9 @@
       <if test="exprCompId != null" >
         #{exprCompId,jdbcType=VARCHAR},
       </if>
+      <if test="exprAgreementType != null" >
+        #{exprAgreementType,jdbcType=CHAR},
+      </if>
       <if test="declExprFee != null" >
         #{declExprFee,jdbcType=DECIMAL},
       </if>
@@ -661,6 +668,9 @@
       <if test="exprCompId != null" >
         expr_comp_id = #{exprCompId,jdbcType=VARCHAR},
       </if>
+      <if test="exprAgreementType != null" >
+        expr_agreement_type = #{exprAgreementType,jdbcType=CHAR},
+      </if>
       <if test="declExprFee != null" >
         decl_expr_fee = #{declExprFee,jdbcType=DECIMAL},
       </if>

src/main/resources/mybatis/mapper/ccnet/biz/WxOrderBizMapper.xml

@@ -56,6 +56,7 @@
         pay_time,
         expr_type,
         expr_comp_id,
+        expr_agreement_type,
         decl_expr_fee,
         batch_numbers,
         decl_post_tax,
@@ -130,6 +131,7 @@
           #{item.payTime,jdbcType=TIMESTAMP},
           #{item.exprType,jdbcType=CHAR},
           #{item.exprCompId,jdbcType=VARCHAR},
+          #{item.exprAgreementType,jdbcType=CHAR},
           #{item.declExprFee,jdbcType=DECIMAL},
           #{item.batchNumbers,jdbcType=VARCHAR},
           #{item.declPostTax,jdbcType=DECIMAL},
@@ -296,6 +298,9 @@
         <if test="item.exprCompId != null" >
           expr_comp_id = #{item.exprCompId,jdbcType=VARCHAR},
         </if>
+          <if test="item.exprAgreementType != null" >
+             expr_agreement_type = #{item.exprAgreementType,jdbcType=CHAR},
+          </if>
         <if test="item.declExprFee != null" >
           decl_expr_fee = #{item.declExprFee,jdbcType=DECIMAL},
         </if>

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

@@ -31,6 +31,7 @@
     <result column="pay_time" property="payTime" jdbcType="TIMESTAMP" />
     <result column="order_biz_type" property="wsFlag" jdbcType="CHAR" />
     <result column="buyer_pay_check" property="buyerPayCheck" jdbcType="CHAR" />
+    <result column="expr_agreement_type" property="exprAgreementType" />
   </resultMap>
 
   <resultMap id="wxOrderGoodsDate" type="com.emato.ccnet.wx.dao.entity.wx.WxOrderGoodsDate" >
@@ -54,7 +55,7 @@
   <select id="getWxOrderDate"  parameterType="hashMap" resultMap="wxOrderDate">
     SELECT mo.merch_order_sn,mo.order_sn,mo.id,ms.merch_sn,ms.merch_name, ms.store_number,ms.third_party_merch_code,ms.third_party_merch_name,mo.store_id,mo.add_time,mo.user_id,mo.add_time AS buyer_bill_time,mu.id_no,mu.username,
     mu.mobile AS buyer_tel,mo.consignee,mo.mobile,mo.province,mo.city,mo.district,mo.address,mo.pay_name,mo.pay_mobile,mo.pay_transaction_id,mo.actual_price,
-    mo.pay_time,mo.order_biz_type, mo.buyer_pay_check
+    mo.pay_time,mo.order_biz_type, mo.buyer_pay_check,ms.expr_agreement_type
     FROM mall_order mo
     LEFT OUTER JOIN mall_user mu ON mo.user_id = mu.id
     LEFT OUTER JOIN mall_store ms ON mo.store_id = ms.id