修改第三方接口

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfItemShippedEntity.java

@@ -18,40 +18,48 @@ public class TbCfItemShippedEntity implements Serializable {
     private String orderId;
 
     /**
-     * 发货时间
-     */
-    private Date deliveryTime;
-    /**
-     * 收货地址
+     * 快递单号
      */
-    private String deliveryAddress;
+    private String expressId;
     /**
      * 用户id
      */
     private String userId;
 
+    private String userInfo;
+
     /**
-     * 快递单号
+     * 发货时间
      */
-    private String expressId;
+    private Date deliveryTime;
 
     /**
-     * 商品ID
+     * 国家
      */
-    private String itemId;
+    private String country;
+
+    private String deliveryPhone;
     /**
-     * 商品ID
+     * 收货地址
      */
+    private String deliveryAddress;
+
+    private String itemId;
+
+    private String itemTitle;
+
     private String itemNum;
-    /**
-     * 国家
-     */
-    private String country;
+
+    private String itemSku;
+
+
     /**
      * 商品品名
      */
     private String descripitionId;
 
+    private String descripitionName;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -133,4 +141,44 @@ public class TbCfItemShippedEntity implements Serializable {
     public void setItemNum(String itemNum) {
         this.itemNum = itemNum;
     }
+
+    public String getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(String userInfo) {
+        this.userInfo = userInfo;
+    }
+
+    public String getDeliveryPhone() {
+        return deliveryPhone;
+    }
+
+    public void setDeliveryPhone(String deliveryPhone) {
+        this.deliveryPhone = deliveryPhone;
+    }
+
+    public String getItemTitle() {
+        return itemTitle;
+    }
+
+    public void setItemTitle(String itemTitle) {
+        this.itemTitle = itemTitle;
+    }
+
+    public String getItemSku() {
+        return itemSku;
+    }
+
+    public void setItemSku(String itemSku) {
+        this.itemSku = itemSku;
+    }
+
+    public String getDescripitionName() {
+        return descripitionName;
+    }
+
+    public void setDescripitionName(String descripitionName) {
+        this.descripitionName = descripitionName;
+    }
 }

src/main/resources/mapper/TbCfOrderDao.xml

@@ -338,21 +338,30 @@
 	<!--获取某段时间已发货订单数据-->
 	<select id="getDeliveryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemShippedEntity">
 				select
-		o.user_id,
-		r.order_item_id order_id,
+		DISTINCT
+		r.order_item_id orderId,
+		p.p_express_number expressId,
+		o.user_id userId,
+		CONCAT_WS("_",u.nick,u.user_no) userInfo,
 		p.create_time deliveryTime,
 		a.address_country_name countryName,
-		o.delivery_address,
-		p.p_express_number expressId,
+		o.delivery_name delivery,
+		o.delivery_phone deliveryPhone,
+		o.delivery_address deliveryAddress,
 		i.item_id itemId,
-		i.item_num,
-		p.descripition_id
+		i.item_title itemTitle,
+		i.item_num itemNum,
+		i.item_sku itemSku,
+		p.descripition_id descripitionId,
+		e.template_title descripitionName
 		from tb_cf_order o
-		left join tb_cf_item_order_r r on r.order_id=o.order_id
-		LEFT JOIN tb_cf_platform_order p on r.order_item_id=p.relative_id
-		LEFT JOIN tb_cf_item_detail i on r.item_id=i.item_id
-		LEFT JOIN tb_cf_address a on a.user_id=o.user_id
-		where r.delivery_flag=10 and r.enable_flag=1 and o.order_status=40
+		INNER JOIN  tb_cf_item_order_r r on r.order_id=o.order_id
+		INNER JOIN   tb_cf_platform_order p on r.order_item_id=p.relative_id
+		INNER JOIN   tb_cf_item_detail i on r.item_id=i.item_id
+		INNER JOIN   tb_cf_address a on a.user_id=o.user_id
+		INNER JOIN   tb_cf_user_info  u on u.user_id=o.user_id
+		INNER JOIN   tb_cf_express_template e on e.template_id=p.descripition_id
+		where r.delivery_flag=10 and r.enable_flag=1 and r.order_status=40
 		and p.create_time <![CDATA[ >= ]]> #{beginDate} and p.create_time <![CDATA[ < ]]> #{endDate}
 	</select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/TbCfUserInfoDao.xml

@@ -228,10 +228,8 @@
          u.nick user_name,
          u.phone,
          u.last_login_time,
-         a.address_id defaultAddressId,
-		 a.address_detail defaultAddressName,
 		u.enable_flag
-        from tb_cf_user_info u left join tb_cf_address a on u.user_id=a.user_id
+        from tb_cf_user_info u
         WHERE 1=1 and  u.user_id=#{userId}
     </select>
 </mapper>
\ No newline at end of file