From 085799d908b9df96849274e4e2f0c38b2deb3b05 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Thu, 31 Jul 2025 09:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=90=8C=E6=AD=A5=E5=95=86=E5=93=81=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/modules/sync/StoreDbConfig.java    |  1 -
 .../impl/ShopProductBaseServiceImpl.java      | 20 ++++++++++---------
 .../impl/ProductMappingServiceImpl.java       | 10 ++++++++--
 .../impl/SyncThirdDataServiceImpl.java        |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/sync/StoreDbConfig.java b/mall-common/src/main/java/com/suisung/mall/common/modules/sync/StoreDbConfig.java
index afa48bb5..7d136962 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/modules/sync/StoreDbConfig.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/sync/StoreDbConfig.java
@@ -124,7 +124,6 @@ public class StoreDbConfig implements Serializable {
     private String priorityMode="1";
 
     @TableField(value = "shop_gap_time",updateStrategy = FieldStrategy.NOT_EMPTY)
-    @ApiModelProperty(value = "商品同步间隔时间，由于商品同步时异步，要等同步完成才同步商品和活动，所以要设置间隔时间")
     @NotBlank(message = "商品同步间隔时间不能为空")
     private String shopGapTime;
 }
\ No newline at end of file
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
index 89886819..1cfb0db0 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
@@ -5364,7 +5364,9 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
                     Integer product_state_id = Integer.valueOf(existBaseIdAndState[1]);
                     base.setProduct_id(existId);
                     base.setProduct_src_id(existId);
-                    base.setProduct_state_id(product_state_id);
+                    if(!(base.getProduct_state_id()==StateCode.PRODUCT_STATE_OFF_THE_SHELF_UNCHECK)){//重新分配
+                        base.setProduct_state_id(product_state_id);
+                    }
                     shopProductBaseList.get(i).setProduct_id(existId);
                     //shopProductIndexList.get(i).setProduct_id(existId);
                     // shopProductIndexList.get(i).setProduct_unit_points(BigDecimal.ZERO);
@@ -5622,14 +5624,14 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
                 logger.info("处理成功，新增{}条，更新{}条", newProducts.size(), updateProducts.size());
 
                 //计算规格
-                if (CollUtil.isNotEmpty(newProducts)) {
-                    productMappingService.computeProductMapping(newProducts, newProducts.get(0).getStore_id(),shopProductSpecItemMap,ShopBaseProductSpecMap,productMappingMap, isUpdatePrice,DicEnum.YESORNO_0.getCode());
-                }
-                if (CollUtil.isNotEmpty(updateProducts)) {//如果时自动优先，则按平台规则切割商品
-                    if (DicEnum.PRIORITY_MODE_2.getCode().equals(priorityMode)) {
-                        productMappingService.computeProductMapping(updateProducts, updateProducts.get(0).getStore_id(),shopProductSpecItemMap,ShopBaseProductSpecMap,productMappingMap, true,DicEnum.YESORNO_0.getCode());
-                    }
-                }
+//                if (CollUtil.isNotEmpty(newProducts)) {
+//                    productMappingService.computeProductMapping(newProducts, newProducts.get(0).getStore_id(),shopProductSpecItemMap,ShopBaseProductSpecMap,productMappingMap, isUpdatePrice,DicEnum.YESORNO_0.getCode());
+//                }
+//                if (CollUtil.isNotEmpty(updateProducts)) {//如果时自动优先，则按平台规则切割商品
+//                    if (DicEnum.PRIORITY_MODE_2.getCode().equals(priorityMode)) {
+//                        productMappingService.computeProductMapping(updateProducts, updateProducts.get(0).getStore_id(),shopProductSpecItemMap,ShopBaseProductSpecMap,productMappingMap, true,DicEnum.YESORNO_0.getCode());
+//                    }
+//                }
                 return Pair.of(true, String.format("处理成功，新增%d条，更新%d条",
                         newProducts.size(), updateProducts.size()));
             } catch (RuntimeException e) {
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
index 431404e6..e2373c48 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
@@ -184,8 +184,14 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
                     if(stateId!=StateCode.PRODUCT_STATE_NORMAL){
                         shopProductBaseList.get(i).setProduct_state_id(StateCode.PRODUCT_STATE_OFF_THE_SHELF);
                         shopProductIndex.setProduct_state_id(StateCode.PRODUCT_STATE_OFF_THE_SHELF);
-                        shopProductItems.get(i).setItem_enable(StateCode.PRODUCT_STATE_OFF_THE_SHELF);
+                       // shopProductItems.get(i).setItem_enable(StateCode.PRODUCT_STATE_OFF_THE_SHELF);
                     }
+                    if(StringUtils.isNotEmpty(shopProductBaseList.get(i).getProduct_image())){
+                        shopProductBaseList.get(i).setProduct_state_id(StateCode.PRODUCT_STATE_NORMAL);
+                        shopProductIndex.setProduct_state_id(StateCode.PRODUCT_STATE_NORMAL);
+                        shopProductItems.get(i).setItem_enable(StateCode.PRODUCT_STATE_NORMAL);
+                    }
+
                 }
                 shopProductItems.get(i).setItem_is_default(1);
                 if(shopProductSpecItem.isUpdate()){
@@ -282,7 +288,7 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
             item.setItem_spec(item_spec);
             shopProductInfo.setProduct_spec(productSpec);
         }
-        String product_uniqid=ShopJsonUtils.generateJsonWithOrgJson(item.getSpec_item_ids(),new Object[]{item.getItem_id(),item.getItem_unit_price(),"",1002});
+        String product_uniqid=ShopJsonUtils.generateJsonWithOrgJson(item.getSpec_item_ids(),new Object[]{item.getItem_id(),item.getItem_unit_price(),"",item.getItem_enable()});
         shopProductInfo.setProduct_uniqid(product_uniqid);
     }
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
index 07fe36c4..1944901d 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
@@ -673,7 +673,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
 //        } catch (RuntimeException e) {
 //            logger.error("同步时间失败" + e.getMessage());
 //        }
-
+        productMappingService.syncAllProductMapping(Integer.valueOf(storeId),DicEnum.YESORNO_0.getCode());
         syncShopImages(Integer.valueOf(storeId));//同时商品图库数据
     }