From 10ae2505bf65c58e7f9b042b2073f6a2acc0ae38 Mon Sep 17 00:00:00 2001
From: honghy <704887482@qq.com>
Date: Tue, 25 Feb 2025 18:40:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82157=20=E7=A9=BA=E8=BF=90?=
=?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=B7=B2=E8=A3=85=E5=8D=95=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E6=8E=88=E6=9D=83=E5=93=81=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dal/mysql/orderWarehouseIn/OrderWarehouseInMapper.java | 4 ++--
.../mysql/productbrandempower/ProductBrandEmpowerMapper.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderWarehouseIn/OrderWarehouseInMapper.java b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderWarehouseIn/OrderWarehouseInMapper.java
index 1f2c7824..6a217109 100644
--- a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderWarehouseIn/OrderWarehouseInMapper.java
+++ b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderWarehouseIn/OrderWarehouseInMapper.java
@@ -64,8 +64,8 @@ public interface OrderWarehouseInMapper extends AbstractMapper<OrderWarehouseInD
@ResultType(OrderWarehouseInBackItemVO.class)
@Select("select t.*,t1.prod_title_en,t1.prod_title_zh,t1.brand,t1.warehouse_in_prod_attr_ids as prodAttrIds,t1.material,t1.usage_ids,(SELECT 1" +
" FROM ecw_product_brand_empower a " +
- " LEFT JOIN ecw_order_consignor b on b.order_id = t1.order_id " +
- " LEFT JOIN ecw_order_consignee c on c.order_id = t1.order_id " +
+ " LEFT JOIN ecw_order_consignor b on b.customer_id= a.customer_id and b.order_id = t1.order_id " +
+ " LEFT JOIN ecw_order_consignee c on c.customer_id = a.customer_id and c.order_id = t1.order_id " +
" WHERE a.product_brand_id = t1.brand and (b.customer_id is not null OR c.customer_id is not null) " +
" AND (date_format(now(),'%Y-%m-%d') BETWEEN date_format(a.start_time,'%Y-%m-%d') AND date_format(a.end_time,'%Y-%m-%d')OR start_time IS NULL) AND a.deleted = 0 LIMIT 1) AS brandTag from ecw_order_warehouse_in t LEFT JOIN ecw_order_item t1 on t.order_item_id=t1.order_item_id where t.order_id=#{orderId} and t.deleted=0")
List<OrderWarehouseInBackItemVO> getOrderWarehouseInListOrderByInTime(@Param("orderId") Long orderId);
diff --git a/yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/productbrandempower/ProductBrandEmpowerMapper.java b/yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/productbrandempower/ProductBrandEmpowerMapper.java
index d84f1aa6..97ea700a 100644
--- a/yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/productbrandempower/ProductBrandEmpowerMapper.java
+++ b/yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/productbrandempower/ProductBrandEmpowerMapper.java
@@ -376,8 +376,8 @@ public interface ProductBrandEmpowerMapper extends AbstractMapper<ProductBrandEm
"<script>",
" SELECT 1 " +
" FROM ecw_product_brand_empower a " +
- " LEFT JOIN ecw_order_consignor b on b.order_id = #{orderId} " +
- " LEFT JOIN ecw_order_consignee c on c.order_id = #{orderId} " +
+ " LEFT JOIN ecw_order_consignor b on b.customer_id= a.customer_id and b.order_id = #{orderId} " +
+ " LEFT JOIN ecw_order_consignee c on c.customer_id= a.customer_id and c.order_id = #{orderId} " +
" WHERE a.product_brand_id = #{brand} and (b.customer_id is not null OR c.customer_id is not null) " +
" AND (date_format(now(),'%Y-%m-%d') BETWEEN date_format(a.start_time,'%Y-%m-%d') AND date_format(a.end_time,'%Y-%m-%d')OR start_time IS NULL) AND a.deleted = 0 LIMIT 1",
"</script>"
--
2.22.0