供应商发货

src/main/java/com/caimei365/order/service/impl/ShipServiceImpl.java

@@ -160,6 +160,8 @@ public class ShipServiceImpl implements ShipService {
         if (null != shopOrder) {
             setShopOrderInfo(shopOrder);
         }
+        // 过滤已发货商品
+        shopOrder.getOrderProductList().removeIf(p -> (p.getNotOutStore() - p.getActualCancelNum()) < 1);
         return ResponseJson.success(shopOrder);
     }
 

src/main/resources/mapper/ShipMapper.xml

@@ -117,6 +117,7 @@
             a.shopPostFee,
             a.shopTaxFee,
             a.shouldPayShopAmount,
+            a.payedShopAmount,
             a.orderTime,
             a.orderSubmitType,
             a.payStatus,
@@ -209,6 +210,7 @@
             shopPostFee,
             shopTaxFee,
             shouldPayShopAmount,
+            payedShopAmount,
             outStoreNum,
             IFNULL(presentNum,0) AS presentNum,
             orderTime,