修改第三方物流接口

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

@@ -37,6 +37,29 @@ public class TbCfItemShippedEntity implements Serializable {
     private String expressId;
 
 
+    private String itemId;
+    private String descripitionName;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getDescripitionName() {
+        return descripitionName;
+    }
+
+    public void setDescripitionName(String descripitionName) {
+        this.descripitionName = descripitionName;
+    }
+
     /**
      * 设置：订单id
      */

src/main/resources/mapper/TbCfOrderDao.xml

@@ -251,10 +251,9 @@
 
 	<!--获取某段时间已发货订单数据-->
 	<select id="getDeliveryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemShippedEntity">
-		select t1.user_id,t1.order_id,t2.create_time "deliveryTime",t1.delivery_address,
-		t2.p_express_number "expressId" from tb_cf_order t1,tb_cf_platform_order t2 where t1.delivery_flag=20
-		and t1.order_id=t2.order_id and t1.enable_flag=1
-		and t2.create_time <![CDATA[ >= ]]> #{beginDate} and t2.create_time <![CDATA[ < ]]> #{endDate}
+		select o.user_id,o.order_id,p.create_time deliveryTime,o.delivery_address,
+		p.p_express_number expressId,i.item_id itemId,d.descripition_name descripitionName from tb_cf_order o left join tb_cf_platform_order p on o.order_id=p.order_id left join tb_cf_station_item i on p.item_id=i.item_id left join tb_cf_descripiton d on d.descripition_id=i.item_descrition_id where o.delivery_flag=20 and o.enable_flag=1
+		and p.create_time <![CDATA[ >= ]]> #{beginDate} and p.create_time <![CDATA[ < ]]> #{endDate}
 	</select>
 
 </mapper>
\ No newline at end of file