Merge branch 'master' of cy/ccnet-wx-mp3.0 into master

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

@@ -17,12 +17,14 @@ public class WxOrderDate implements Serializable {
 
     private String merchName;
 
+    private String thirdPartyMerchCode;
+
+    private String thirdPartyMerchName;
+
     private String shopId;
 
     private String shopName;
 
-    private String thirdPartyMerchCode;
-
     private Date placeOrderlTime;
 
     private String buyerRegNo;
@@ -129,6 +131,14 @@ public class WxOrderDate implements Serializable {
         this.thirdPartyMerchCode = thirdPartyMerchCode;
     }
 
+    public String getThirdPartyMerchName() {
+        return thirdPartyMerchName;
+    }
+
+    public void setThirdPartyMerchName(String thirdPartyMerchName) {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
     public Date getPlaceOrderlTime() {
         return placeOrderlTime;
     }

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

@@ -260,7 +260,7 @@ public class CusWaybillServiceImpl implements CusWaybillService {
             cusWaybill.setPlatSn(merchant.getPlatSn());
             cusWaybill.setPlatName(merchant.getPlatName());
             cusWaybill.setThirdPartyMerchCode(wxOrder.getThirdPartyMerchCode());
-//        cusWaybill.setThirdPartyMerchName(wayBill.getSellerName());
+            cusWaybill.setThirdPartyMerchName(wxOrder.getThirdPartyMerchName());
             cusWaybill.setPlaceOrderlTime(wxOrder.getCreateTime());
 
             // 订购人

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

@@ -7,8 +7,9 @@
     <result column="id" property="wxOrderId" jdbcType="VARCHAR" />
     <result column="merch_sn" property="merchSn" jdbcType="VARCHAR" />
     <result column="merch_name" property="merchName" jdbcType="VARCHAR" />
+    <result column="third_party_merch_code" property="thirdPartyMerchCode" jdbcType="VARCHAR" />
+    <result column="third_party_merch_name" property="thirdPartyMerchName" jdbcType="VARCHAR" />
     <result column="store_number" property="shopId" jdbcType="VARCHAR" />
-    <result column="store_id" property="thirdPartyMerchCode" jdbcType="VARCHAR" />
     <result column="add_time" property="placeOrderlTime" jdbcType="TIMESTAMP" />
     <result column="user_id" property="buyerRegNo" jdbcType="VARCHAR" />
     <result column="buyer_bill_time" property="buyerBillTime" jdbcType="TIMESTAMP" />
@@ -51,7 +52,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,mo.store_id,mo.add_time,mo.user_id,mo.add_time AS buyer_bill_time,mu.id_no,mu.username,
+    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
     FROM mall_order mo