bug fixes

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

@@ -831,7 +831,13 @@ public class OrderServiceImpl implements OrderService {
     public void affirmCargo(Integer orderID) throws Exception {
         CmOrder order = orderMapper.findOrder(orderID);
         if (order == null) throw new Exception("订单不存在");
-        if (order.getStatus() == 33) {
+        if (order.getStatus() == 33 && order.getPayStatus().equals("3")) {
+            //已付款供应商,订单完成
+            order.setStatus(5);
+            orderMapper.update(order);
+            orderMapper.updateLogisticsBatch(orderID);
+        } else if (order.getStatus() == 33) {
+            //交易完成
             order.setStatus(4);
             orderMapper.update(order);
             orderMapper.updateLogisticsBatch(orderID);

src/main/resources/mapper/OrderMapper.xml

@@ -275,14 +275,14 @@
     </select>
 
     <select id="findAllShopOrder" resultType="com.caimei.entity.CmShopOrder">
-        SELECT 
-          cso.*, 
+        SELECT
+          cso.*,
           s.name AS shopName,
           s.logo AS shopLogo
         FROM
-          cm_shop_order cso 
-          LEFT JOIN shop s ON cso.shopID = s.shopID 
-        WHERE 
+          cm_shop_order cso
+          LEFT JOIN shop s ON cso.shopID = s.shopID
+        WHERE
           cso.shopOrderID IN
           <foreach collection="array" item="shopOrderID" index="index" open="(" separator="," close=")">
               #{shopOrderID}
@@ -330,18 +330,19 @@
     </select>
 
     <select id="findLogisticsInfo" parameterType="int" resultType="com.caimei.entity.LogisticsInfo">
-        SELECT
+        SELECT DISTINCT
           li.*,
           clb.deliveryTime
         FROM
           logistics_information li
           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 != ''"  >
-              li.shopOrderID = #{shopOrderID}
+            clr.shopOrderID = #{shopOrderID}
         </if>
         <if test="orderID != null and orderID != ''"  >
-              li.orderID = #{orderID}
+            clr.orderID = #{orderID}
         </if>
     </select>