From 099f0159641e72a2185882b0d9e6d47cd6dc3107 Mon Sep 17 00:00:00 2001
From: "LIONCITYS\\lioncity" <18026623439@163.com>
Date: Tue, 22 Sep 2020 10:17:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=85=B6=E4=BB=96=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=97=B6,=E9=98=B2=E6=AD=A2=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E5=95=86=E5=93=81=E6=8E=92=E5=BA=8F=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/service/impl/YxStoreProductServiceImpl.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
index a14f35fb..00f73103 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
@@ -63,6 +63,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
+import com.qiniu.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -260,7 +261,10 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
         }
 
         wrapper.lambda().orderByDesc(YxStoreProduct::getSort);
-
+        //无其他排序条件时,防止因为商品排序导致商品重复
+        if (StringUtils.isNullOrEmpty(productQueryParam.getPriceOrder()) && StringUtils.isNullOrEmpty(productQueryParam.getSalesOrder())) {
+            wrapper.lambda().orderByDesc(YxStoreProduct::getId);
+        }
         Page<YxStoreProduct> pageModel = new Page<>(productQueryParam.getPage(),
                 productQueryParam.getLimit());