商品模块bug修复

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元=?积分
      */

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;
     }

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);