物流信息

src/main/java/com/caimei/controller/order/OrderController.java

@@ -226,7 +226,7 @@ public class OrderController {
     @RequestMapping("/logistics")
     public WxJsonModel logistics(Integer orderID) {
         WxJsonModel model = WxJsonModel.newInstance();
-        List<CmLogisticsRecord> logistics = null;
+        List<CmLogisticsBatch> logistics = null;
         try {
             logistics = orderService.logistics(orderID);
         } catch (Exception e) {

src/main/java/com/caimei/entity/CmLogisticsBatch.java

@@ -24,6 +24,15 @@ public class CmLogisticsBatch implements Serializable {
 	private String receiptTime;		// 收货时间
 	List<CmLogisticsRecord> cmLogisticsRecords;//该批次订单商品记录
 	List<LogisticsInfo> logisticsInfos;//该批次物流信息
+	private List<CmShopOrder> shopOrderList;
+
+	public List<CmShopOrder> getShopOrderList() {
+		return shopOrderList;
+	}
+
+	public void setShopOrderList(List<CmShopOrder> shopOrderList) {
+		this.shopOrderList = shopOrderList;
+	}
 
 	public Integer getId() {
 		return id;

src/main/java/com/caimei/entity/CmLogisticsRecord.java

@@ -25,19 +25,6 @@ public class CmLogisticsRecord implements Serializable {
     private Integer organizeProductID;  //组织的商品Id，关联cm_mall_organize_products表ID[适用于组织订单]
     private String name;        //供应商名称
     private String logo;        //供应商logo
-    private List<CmShopOrder> shopOrderList;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public List<CmShopOrder> getShopOrderList() {
-        return shopOrderList;
-    }
-
-    public void setShopOrderList(List<CmShopOrder> shopOrderList) {
-        this.shopOrderList = shopOrderList;
-    }
 
     public String getName() {
         return name;

src/main/java/com/caimei/mapper/order/OrderMapper.java

@@ -40,9 +40,9 @@ public interface OrderMapper {
 
     List<CmReturnedPurchase> findReturnedPurchase(Integer orderID);
 
-    List<LogisticsInfo> findLogisticsInfo(@Param("orderID") Integer orderID, @Param("shopOrderID") Integer shopOrderID);
+    List<LogisticsInfo> findLogisticsInfo(Integer logisticsBatchID);
 
-    List<CmLogisticsRecord> findLogisticsRecord(Integer shopOrderID);
+    List<CmLogisticsRecord> findLogisticsRecord(@Param("shopOrderID") Integer shopOrderID,@Param("logisticsBatchID") Integer logisticsBatchID);
 
     CmMallShareCodeRecord findShareCodeRecord(@Param("openid") String openid, @Param("orderID") Integer orderID);
 
@@ -76,5 +76,5 @@ public interface OrderMapper {
 
     List<String> findShopOrderID(@Param("orderID") Integer orderID, @Param("id") Integer id);
 
-    List<CmLogisticsRecord> findLogistics(Integer orderID);
+    List<CmLogisticsBatch> findLogistics(Integer orderID);
 }

src/main/java/com/caimei/service/order/OrderService.java

@@ -12,7 +12,7 @@ public interface OrderService {
 
     Map<String, Object> particulars(Integer orderID) throws Exception;
 
-    List<CmLogisticsRecord> logistics(Integer orderID) throws Exception;
+    List<CmLogisticsBatch> logistics(Integer orderID) throws Exception;
 
     WxJsonModel saveOrderInfo(WxJsonModel wxJsonModel, Integer userId, Integer organizeID, String cartType, Integer addressID, Object orderInfo, String balanceDeductionFlag, Double orderShouldPayFee, Integer cmOperationID);
 

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -213,8 +213,8 @@ public class OrderServiceImpl implements OrderService {
             order.setStatus(111);
         }
         //判断交易全退情况下,是否发过货,77,交易全退可以查看物流
-        List<LogisticsInfo> logisticsInfoList = orderMapper.findLogisticsInfo(orderID, null);
-        if (order.getStatus().equals(7) && logisticsInfoList != null && logisticsInfoList.size() > 0) {
+        List<CmLogisticsBatch> batchList = orderMapper.findLogistics(orderID);
+        if (order.getStatus().equals(7) && batchList != null && batchList.size() > 0) {
             order.setStatus(77);
         }
         //商品信息
@@ -695,33 +695,33 @@ public class OrderServiceImpl implements OrderService {
 
 
     @Override
-    public List<CmLogisticsRecord> logistics(Integer orderID) throws Exception {
+    public List<CmLogisticsBatch> logistics(Integer orderID) throws Exception {
         //物流商品信息
         CmOrder order = orderMapper.findOrder(orderID);
         if (order == null) throw new Exception("订单已删除");
-        List<CmLogisticsRecord> recordList = orderMapper.findLogistics(orderID);
-        for (CmLogisticsRecord record : recordList) {
-            List<String> shopOrderIDList = orderMapper.findShopOrderID(orderID, record.getId());
+        List<CmLogisticsBatch> batchList = orderMapper.findLogistics(orderID);
+        for (CmLogisticsBatch batch : batchList) {
+            List<String> shopOrderIDList = orderMapper.findShopOrderID(orderID, batch.getId());
             String[] ShopOrderIDs = shopOrderIDList.toArray(new String[shopOrderIDList.size()]);
             List<CmShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
             for (CmShopOrder shopOrder : shopOrderList) {
-                List<CmLogisticsRecord> logisticsRecordList = orderMapper.findLogisticsRecord(shopOrder.getShopOrderID());
+                List<CmLogisticsRecord> logisticsRecordList = orderMapper.findLogisticsRecord(shopOrder.getShopOrderID(), batch.getId());
                 for (CmLogisticsRecord logisticsRecord : logisticsRecordList) {
                     logisticsRecord.setImage(AppUtils.getImageURL("product", logisticsRecord.getImage(), 0, domain));
                 }
                 shopOrder.setCmLogisticsRecords(logisticsRecordList);
                 shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
                 //物流信息
-                List<LogisticsInfo> logisticsInfoList = orderMapper.findLogisticsInfo(null, shopOrder.getShopOrderID());
+                List<LogisticsInfo> logisticsInfoList = orderMapper.findLogisticsInfo(batch.getId());
                 for (LogisticsInfo logisticsInfo : logisticsInfoList) {
                     List<Router> routers = JSONArray.parseArray(logisticsInfo.getInfo(), Router.class);
                     logisticsInfo.setRouters(routers);
                 }
                 shopOrder.setLogisticsInfos(logisticsInfoList);
             }
-            record.setShopOrderList(shopOrderList);
+            batch.setShopOrderList(shopOrderList);
         }
-        return recordList;
+        return batchList;
     }
 
     @Override

src/main/resources/mapper/OrderMapper.xml

@@ -338,12 +338,7 @@
         LEFT JOIN cm_logistics_batch clb ON clb.id = li.logisticsBatchID
         LEFT JOIN cm_logistics_record clr ON clr.logisticsBatchID=clb.id
         WHERE
-        <if test="shopOrderID != null and shopOrderID != ''"  >
-            clr.shopOrderID = #{shopOrderID}
-        </if>
-        <if test="orderID != null and orderID != ''"  >
-            clr.orderID = #{orderID}
-        </if>
+          li.logisticsBatchID = #{logisticsBatchID}
     </select>
 
     <select id="findLogisticsRecord" resultType="com.caimei.entity.CmLogisticsRecord" parameterType="int">
@@ -355,6 +350,7 @@
           LEFT JOIN cm_order_product cop ON clr.orderProductID = cop.orderProductID
         WHERE
           clr.shopOrderID = #{shopOrderID}
+          and clr.logisticsBatchID = #{logisticsBatchID}
     </select>
 
     <select id="findShareCodeRecord" resultType="com.caimei.entity.CmMallShareCodeRecord">
@@ -551,7 +547,7 @@
           and logisticsBatchID = #{id}
     </select>
 
-    <select id="findLogistics" resultType="com.caimei.entity.CmLogisticsRecord" parameterType="int">
+    <select id="findLogistics" resultType="com.caimei.entity.CmLogisticsBatch" parameterType="int">
         SELECT * FROM cm_logistics_batch WHERE orderID= #{orderID}
     </select>