From bc6b86f129ee54c15ebf865625f3e762c067d931 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 13 Oct 2025 17:05:09 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=BA=93=E5=AD=98=E5=92=8C=E5=AE=A2=E6=88=B7=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/migartion/GtAndFhbBizController.java | 12 ++++++------ .../xkt/migartion/GtAndTyBizController.java | 12 ++++++------ .../resources/mapper/StoreProductColorSizeMapper.xml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java index 1e56e7f22..8413f9623 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java @@ -507,12 +507,12 @@ public class GtAndFhbBizController extends BaseController { Map buJuProdColorMap = Optional.ofNullable(prodColorGroupMap.get(storeProd.getId())).orElseThrow(() -> new ServiceException("没有商品颜色!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); // 根据步橘货号 找到FHB对应的货号，可能是列表 List fhbAtrNoList = Optional.ofNullable(multiSameFhbMap.get(cleanArtNo)).orElseThrow(() -> new ServiceException("没有FHB货号!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); - fhbAtrNoList.forEach(fhbAtrNo -> { - // 处理档口客户商品优惠 - this.handleCusDisc(fhbAtrNo, fhbCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, storeProd.getStoreId(), storeProd.getId(), prodCusDiscList); - // 处理档口商品库存 - this.handleProdStock(fhbAtrNo, fhbStockGroupMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList); - }); + // 取FHB第一个货号（因为可能对应FHB多个货号，只需取其中一个货号的优惠、库存等） + final String fhbAtrNo = fhbAtrNoList.get(0); + // 处理档口客户商品优惠 + this.handleCusDisc(fhbAtrNo, fhbCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, storeProd.getStoreId(), storeProd.getId(), prodCusDiscList); + // 处理档口商品库存 + this.handleProdStock(fhbAtrNo, fhbStockGroupMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList); }); // 档口客户优惠 this.storeCusProdDiscMapper.insert(prodCusDiscList); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java index 800b66dba..3e837339c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java @@ -477,12 +477,12 @@ public class GtAndTyBizController extends BaseController { Map buJuProdColorMap = Optional.ofNullable(prodColorGroupMap.get(storeProd.getId())).orElseThrow(() -> new ServiceException("没有商品颜色!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); // 根据步橘货号 找到TY对应的货号，可能是列表 List tyAtrNoList = Optional.ofNullable(multiSameTyMap.get(cleanArtNo)).orElseThrow(() -> new ServiceException("没有TY货号!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); - tyAtrNoList.forEach(tyAtrNo -> { - // 处理客户优惠 - this.handleCusDisc(tyAtrNo, tyCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, prodCusDiscList, storeProd.getStoreId(), storeProd.getId()); - // 处理档口商品库存 - this.handleProdStock(tyAtrNo, tyProdStockMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList); - }); + // 取TY第一个货号（因为可能对应TY多个货号，只需取其中一个货号的优惠、库存等） + final String tyAtrNo = tyAtrNoList.get(0); + // 处理客户优惠 + this.handleCusDisc(tyAtrNo, tyCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, prodCusDiscList, storeProd.getStoreId(), storeProd.getId()); + // 处理档口商品库存 + this.handleProdStock(tyAtrNo, tyProdStockMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList); }); // 档口客户优惠 this.storeCusProdDiscMapper.insert(prodCusDiscList); diff --git a/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml index 4f9e9e2af..a208a60ca 100644 --- a/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml @@ -203,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM store_product_color spc JOIN store_product sp ON spc.store_prod_id = sp.id - LEFT JOIN store_customer_product_discount scpd ON scpd.store_prod_color_id = spc.id AND scpd.del_flag = 0 + LEFT JOIN store_customer_product_discount scpd ON scpd.store_prod_color_id = spc.id AND scpd.del_flag = 0 AND scpd.store_cus_id = #{storeCusId} WHERE spc.del_flag = 0 AND spc.id = #{storeProdColorId}