From 47c438762af897b7eb06ef074bfd5d7961a8ad55 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Tue, 11 Mar 2025 11:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/account/dto/points/OrderDeductionPointsDTO.java    | 2 +-
 .../product/service/impl/ShopProdCategoryServiceImpl.java      | 2 +-
 .../product/service/impl/ShopProductSpecServiceImpl.java       | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/points/OrderDeductionPointsDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/points/OrderDeductionPointsDTO.java
index adcda3c4..d97e93be 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/points/OrderDeductionPointsDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/points/OrderDeductionPointsDTO.java
@@ -53,7 +53,7 @@ public class OrderDeductionPointsDTO implements Serializable {
     /**
      * 实际抵扣的金额
      */
-    private Integer deductionAmount;
+    private BigDecimal deductionAmount;
     /**
      * 下单抵扣积分比例 1元=?积分
      */
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
index 9370c8ac..a36c82aa 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
@@ -34,7 +34,7 @@ public class ShopProdCategoryServiceImpl extends ServiceImpl<ShopProdCategoryMap
         }
         Long shopId = StpKit.USER.getShopId(0L);
         queryWrapper.eq(ShopProdCategory::getShopId, shopId);
-        queryWrapper.eq(ShopProdCategory::getSort, true);
+        queryWrapper.orderBy(ShopProdCategory::getSort, true);
         queryWrapper.orderBy(ShopProdCategory::getId, false);
         return queryWrapper;
     }
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProductSpecServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProductSpecServiceImpl.java
index ec00d7b2..a5f73cc1 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProductSpecServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProductSpecServiceImpl.java
@@ -49,6 +49,9 @@ public class ShopProductSpecServiceImpl extends ServiceImpl<ShopProdSpecMapper,
         if (StrUtil.isNotEmpty(param.getName())) {
             queryWrapper.like(ShopProdSpec::getFullName, param.getName());
         }
+        if (ObjUtil.isNotNull(param.getLevel())) {
+            queryWrapper.like(ShopProdSpec::getLevel, param.getLevel());
+        }
         Long shopId = StpKit.USER.getShopId(0L);
         queryWrapper.eq(ShopProdSpec::getShopId, shopId);
         queryWrapper.orderBy(ShopProdSpec::getLevel, true);