Merge branch 'master' into prod

cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java

@@ -108,6 +108,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         Long shopId = StpKit.USER.getShopId(0L);
         queryWrapper.eq(Product::getShopId, shopId);
         queryWrapper.eq(Product::getIsDel, DeleteEnum.NORMAL.value());
+        queryWrapper.orderBy(Product::getIsSoldStock, true);
+        queryWrapper.orderBy(Product::getIsSale, false);
         queryWrapper.orderBy(Product::getSort, false);
         queryWrapper.orderBy(Product::getId, false);
         return queryWrapper;