From b8f2c85cb025380914cca7da5c0e8da258e08e48 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Thu, 31 Jul 2025 15:28:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=A7=84=E6=A0=BC=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E8=A7=84=E6=A0=BC=E9=94=99=E4=B9=B1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/sync/service/impl/ProductMappingServiceImpl.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 e2373c48..439cf42a 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
@@ -288,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(),"",item.getItem_enable()});
+        String product_uniqid=ShopJsonUtils.generateJsonWithOrgJson(item.getSpec_item_ids(),new Object[]{item.getItem_id(),item.getItem_unit_price(),"","1001"});
         shopProductInfo.setProduct_uniqid(product_uniqid);
     }
 
@@ -311,6 +311,7 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
                 query.or(q -> q.eq("store_id", base.getStore_id())
                         .eq("product_id", base.getProduct_id()));
             });
+            query.orderByAsc("product_id");
             return shopProductItemService.list(query);
     }
 
@@ -332,6 +333,7 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
         shopProductBaseList.forEach(base -> {
             query.or(q -> q.eq("product_id", base.getProduct_id()));
         });
+        query.orderByAsc("product_id");
         return shopProductInfoService.list(query);
     }
 
@@ -411,6 +413,8 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
         QueryWrapper<ShopProductBase> queryWrapper=  new QueryWrapper<>();
         queryWrapper.eq("product_state_id", StateCode.PRODUCT_STATE_OFF_THE_SHELF_UNCHECK);
         queryWrapper.eq("store_id", storeId);
+        queryWrapper.gt("unit_price", BigDecimal.ZERO);
+        queryWrapper.orderByAsc("product_id");
         long total=shopProductBaseService.count(queryWrapper);
 
        int pages= CommonUtil.getPagesCount(Math.toIntExact(total),SHOPBASEPAGE);