更新提供给第三方的物流接口

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

@@ -7,7 +7,6 @@ import java.util.List;
  * 订单 （用于订单查询）
  */
 public class OrderEntity implements Serializable {
-
     /**
      * 订单id
      */
@@ -39,6 +38,7 @@ public class OrderEntity implements Serializable {
      */
     private List<ItemEntity> itemDetailList;
 
+
     public String getOrderId() {
         return orderId;
     }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java

@@ -598,13 +598,12 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
      *
      * @param tbCfUserInfoVo
      * @param pageOrder
-     * @param tbCfCartItemDetailList
      * @return
      * @throws IOException
      * @throws URISyntaxException
      */
-    private TbCfOrderVo ensureOrder(TbCfUserInfoVo tbCfUserInfoVo, TbCfOrderVo pageOrder, List<TbCfCartItemDetailVo> tbCfCartItemDetailList, String toitableId) {
-        TbCfOrderVo definiteOrder = getGenericOrder(tbCfCartItemDetailList);
+    private TbCfOrderVo ensureOrder(TbCfUserInfoVo tbCfUserInfoVo, TbCfOrderVo pageOrder, List<TbCfCartItemDetailVo> itemDetailList, String toitableId) {
+        TbCfOrderVo definiteOrder = getGenericOrder(itemDetailList);
 
         /*//获取可以使用的优惠券，后续还有判断此订单是否可以使用
         List<TbCfCouponEntity> tbCfCouponList = tbCfCouponDao.queryUserAvailableCoupon(tbCfUserInfoVo.getUserId(), new Date());
@@ -657,14 +656,14 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
      *
      * @return
      */
-    private TbCfOrderVo getGenericOrder(List<TbCfCartItemDetailVo> tbCfCartItemDetailList) {
+    private TbCfOrderVo getGenericOrder(List<TbCfCartItemDetailVo> itemDetailList) {
 
         TbCfOrderVo genericOrder = new TbCfOrderVo();
-        genericOrder.setItemDetailList(tbCfCartItemDetailList);
+        genericOrder.setItemDetailList(itemDetailList);
         //初始商品总价
         BigDecimal itemsPrice = BigDecimal.valueOf(0.00);
         BigDecimal totalExpressCost = BigDecimal.ZERO;
-        for (TbCfCartItemDetailVo tbCfCartItemDetailVo : tbCfCartItemDetailList) {
+        for(TbCfCartItemDetailVo tbCfCartItemDetailVo:itemDetailList) {
             BigDecimal itemNum = BigDecimal.valueOf(tbCfCartItemDetailVo.getItemNum());
             BigDecimal itemSourcePrice = tbCfCartItemDetailVo.getItemPrice();
             itemsPrice = itemsPrice.add(itemSourcePrice.multiply(itemNum));
@@ -673,7 +672,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
             expressCost = expressCost.multiply(itemNum);
             totalExpressCost = totalExpressCost.add(expressCost);
         }
-
         //计算手续费
         BigDecimal fee = countFee(itemsPrice);
         //税费

src/main/resources/mapper/TbCfOrderDao.xml

@@ -71,14 +71,14 @@
 	</select>
 	<select id="getOrder" resultType="com.diaoyun.zion.chinafrica.entity.OrderEntity">
 			select
-				`order_id`,
-				`order_no`,
-				`user_name`,
-				`delivery_address`,
-				`delivery_name`,
-				`delivery_phone`
-			from tb_cf_order
-			where order_id = #{id}
+				r.order_item_id order_id,
+				o.order_no,
+				o.user_name,
+				o.delivery_address,
+				o.delivery_name,
+				o.delivery_phone
+			from tb_cf_order o left join tb_cf_item_order_r r on r.order_id=o.order_id
+			where r.order_item_id = #{id}
 	</select>
 	<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
 		select
@@ -286,19 +286,19 @@
 		LEFT JOIN tb_cf_platform_order t4 on  t3.order_id=t4.order_id
 		LEFT JOIN tb_cf_express_template t5 on t5.template_id=t4.descripition_id
 		WHERE
-		t2.enable_flag = 1 and t3.order_id=#{order_id}
+		t2.enable_flag = 1 and t2.order_item_id=#{order_id}
     </select>
 	<!--获取付款订单-->
 	<select id="getOrderListByTime" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
-		select user_id,order_id,deal_time from tb_cf_order where pay_status=20 and enable_flag=1 and
-		deal_time <![CDATA[ >= ]]> #{beginDate} and deal_time <![CDATA[ < ]]> #{endDate}
+		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 o.enable_flag=1
+		and deal_time <![CDATA[ >= ]]> #{beginDate} and deal_time <![CDATA[ < ]]> #{endDate}
 	</select>
 
 	<!--获取某段时间已发货订单数据-->
 	<select id="getDeliveryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemShippedEntity">
 		select
 		o.user_id,
-		o.order_id,
+		r.order_item_id order_id,
 		p.create_time deliveryTime,
 		o.delivery_address,
 		p.p_express_number expressId,
@@ -306,9 +306,10 @@
 		e.template_title 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_item_order_r r on r.order_id=o.order_id
+		LEFT JOIN tb_cf_item_detail i on r.item_id=i.item_id
 		LEFT JOIN tb_cf_express_template e on e.template_id=p.descripition_id
-		where o.delivery_flag=10  and o.enable_flag=1
+		where o.delivery_flag=20  and o.enable_flag=1
 		and p.create_time <![CDATA[ >= ]]> #{beginDate} and p.create_time <![CDATA[ < ]]> #{endDate}
 	</select>