下单业务物流对象运费结算业务逻辑功能模块修改

cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java

@@ -2265,7 +2265,7 @@ public class CereShopOrderServiceImpl implements CereShopOrderService {
                                 } else {
                                     //查询店铺物流方案
                                     //根据仓库来计算运费
-                                    List<CereOrderLogistics> logistics = logisticsList.stream().filter(item -> shop.getShopId().equals(item.getShopId()) && storehouseId.equals(item.getStorehouseId())).collect(Collectors.toList());
+                                    List<CereOrderLogistics> logistics = logisticsList.stream().filter(item -> storehouseId.equals(item.getStorehouseId())).collect(Collectors.toList());
                                     List<CartSku> logisticsSkuList = sortSkuList;
                                     if (sceneMarketFreeShipingMap.get(shop.getShopId()) != null) {
                                         logisticsSkuList = sortSkuList.stream().filter(sku -> sku.getSceneId() == null).collect(Collectors.toList());

cereshop-app/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml

@@ -102,15 +102,15 @@
   </update>
 
   <select id="findLogistics" parameterType="java.lang.Object" resultType="com.shop.cereshop.commons.domain.logistics.CereOrderLogistics">
-    SELECT * FROM cere_order_logistics where shop_id=#{shopId}
+    SELECT b.* FROM (SELECT * FROM cere_platform_shop where shop_id=#{shopId}) a INNER JOIN cere_order_logistics b ON a.business_id = b.shop_id
   </select>
 
   <select id="findLogisticsList" parameterType="java.util.List" resultType="com.shop.cereshop.commons.domain.logistics.CereOrderLogistics">
-    SELECT * FROM cere_order_logistics where
+    SELECT b.* FROM (SELECT * FROM cere_platform_shop where
     shop_id in ( <foreach collection="shopIdList" item="shopId" index="index" separator=",">
     #{shopId}
   </foreach>
-    )
+    )) a INNER JOIN cere_order_logistics b ON a.business_id = b.shop_id
   </select>
 
   <select id="findCharges" parameterType="java.lang.Object" resultType="com.shop.cereshop.commons.domain.logistics.CereLogisticsCharge">

cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CereShopCheck.java

@@ -25,7 +25,7 @@ public class CereShopCheck implements Serializable {
     private Long checkId;
 
     /**
-     * 关联店铺id
+     * 关联店铺id(存的是商家id)
      */
     private Long shopId;
 

cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CereShopGroup.java

@@ -37,7 +37,7 @@ public class CereShopGroup implements Serializable {
     private Long shopGroupId;
 
     /**
-     * 关联店铺id
+     * 关联店铺id (存的是商家id)
      */
     @ApiModelProperty(value = "关联店铺id")
     private Long shopId;

cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/tool/CereShopCrowd.java

@@ -25,7 +25,7 @@ public class CereShopCrowd implements Serializable {
     private Long shopCrowdId;
 
     /**
-     * 店铺id
+     * 店铺id (存的是商家id)
      */
     private Long shopId;