修改提供给第三方的接口，修改物流状态订单状态

src/main/resources/mapper/TbCfOrderDao.xml

@@ -279,7 +279,6 @@
 		t1.item_title,
 		t1.item_num,
 		t1.item_price,
-		t1.item_category,
 		t5.template_id descripitionId,
 		t5.template_title descripitionName
 		FROM
@@ -293,7 +292,9 @@
     </select>
 	<!--获取付款订单-->
 	<select id="getOrderListByTime" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
-		select o.user_id,r.order_item_id order_id,o.deal_time from tb_cf_order o  left join tb_cf_item_order_r  r on r.order_id=o.order_id where pay_status=20 and i.enable_flag=1
+		select o.user_id,r.order_item_id order_id,o.deal_time
+		from tb_cf_order o  left join tb_cf_item_order_r  r on r.order_id=o.order_id
+		where pay_status=20 and r.enable_flag=1
 		and deal_time <![CDATA[ >= ]]> #{beginDate} and deal_time <![CDATA[ < ]]> #{endDate}
 	</select>
 

src/test/java/com/diaoyun/zion/ZionApplicationTests.java

@@ -417,7 +417,7 @@ public class ZionApplicationTests {
     @Test
     public void testDate() throws ParseException {
 
-        String res = "2019-10-2 10:04:59";
+        String res = "2019-12-10 10:04:59";
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = simpleDateFormat.parse(res);
         long it = date.getTime();