From 601d9f1111b4fc3ca4400ca18281d5ffb36c0824 Mon Sep 17 00:00:00 2001
From: dy-hu <dy-hu@haihangyun.com>
Date: Wed, 12 Jun 2024 11:23:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E4=B8=9A=E5=8A=A1=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E5=AF=B9=E8=B1=A1=E8=BF=90=E8=B4=B9=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=E5=8A=9F=E8=83=BD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cereshop/app/service/order/impl/CereShopOrderServiceImpl.java   | 2 +-
 .../resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml    | 6 +++---
 .../java/com/shop/cereshop/commons/domain/shop/CereShopCheck.java   | 2 +-
 .../java/com/shop/cereshop/commons/domain/shop/CereShopGroup.java   | 2 +-
 .../java/com/shop/cereshop/commons/domain/tool/CereShopCrowd.java   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java
index e39aecd..f351fd9 100644
--- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java
+++ b/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());
diff --git a/cereshop-app/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml
index 9ba48e9..1136e65 100644
--- a/cereshop-app/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml
+++ b/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">
diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CereShopCheck.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CereShopCheck.java
index c845f32..a0479d7 100644
--- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CereShopCheck.java
+++ b/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;
 
diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CereShopGroup.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CereShopGroup.java
index bd61def..3172269 100644
--- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CereShopGroup.java
+++ b/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;
diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/tool/CereShopCrowd.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/tool/CereShopCrowd.java
index 57498b1..e6e780a 100644
--- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/tool/CereShopCrowd.java
+++ b/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;