Merge branch 'dev/2024/0806/update-business-Y' of Harper/feifan-backend-zx-business into master

追加商品的结算价

feifan-module-mall/feifan-module-product-api/src/main/java/cn/newfeifan/mall/module/product/enums/ErrorCodeConstants.java

@@ -4,7 +4,6 @@ import cn.newfeifan.mall.framework.common.exception.ErrorCode;
 
 /**
  * Product 错误码枚举类
- *
  * product 系统，使用 1-008-000-000 段
  */
 public interface ErrorCodeConstants {
@@ -52,5 +51,6 @@ public interface ErrorCodeConstants {
     // ========== 商品 收藏 1-008-008-000 ==========
     ErrorCode FAVORITE_EXISTS = new ErrorCode(1_008_008_000, "该商品已经被收藏");
     ErrorCode FAVORITE_NOT_EXISTS = new ErrorCode(1_008_008_001, "商品收藏不存在");
+    ErrorCode HIGH_PRECISION_PRICE_NOT_ENOUGH = new ErrorCode(1_008_008_002, "结算价不能大于成本价");
 
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuRespVO.java

@@ -65,4 +65,10 @@ public class ProductSkuRespVO {
     @Schema(description = "高精度价格", example = "9255")
     private BigDecimal highPrecisionPrice;
 
+    @Schema(description = "结算价，单位： 分", example = "19500")
+    private Integer settlementPrice;
+
+    @Schema(description = "高精度结算价", example = "19997")
+    private BigDecimal highPrecisionSettlementPrice;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java

@@ -89,4 +89,10 @@ public class ProductSkuSaveReqVO {
 
     @Schema(description = "高精度价格", example = "9255")
     private BigDecimal highPrecisionPrice;
+
+    @Schema(description = "结算价，单位： 分", example = "19500")
+    private Integer settlementPrice;
+
+    @Schema(description = "高精度结算价", example = "19997")
+    private BigDecimal highPrecisionSettlementPrice;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/sku/ProductSkuDO.java

@@ -113,6 +113,15 @@ public class ProductSkuDO extends BaseDO {
      * 高精度价格
      */
     private BigDecimal highPrecisionPrice;
+
+    /**
+     * 结算价，单位： 分
+     */
+    private Integer settlementPrice;
+    /**
+     * 高精度结算价
+     */
+    private BigDecimal highPrecisionSettlementPrice;
     /**
      * 商品属性
      */

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/service/sku/ProductSkuServiceImpl.java

@@ -82,6 +82,21 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         if (CollUtil.isEmpty(skus)) {
             throw exception(SKU_NOT_EXISTS);
         }
+
+        // 校验结算价是否大于成本价
+        for (ProductSkuSaveReqVO sku : skus) {
+            // 如果是高精度商品
+            if(sku.getSettlementPrice().equals(0)){
+                if(sku.getHighPrecisionSettlementPrice().compareTo(sku.getHighPrecisionPrice()) > 0){
+                    throw exception(HIGH_PRECISION_PRICE_NOT_ENOUGH);
+                }
+            }else {
+                if(sku.getSettlementPrice() > sku.getCostPrice()){
+                    throw exception(HIGH_PRECISION_PRICE_NOT_ENOUGH);
+                }
+            }
+        }
+
         // 单规格，赋予单规格默认属性
         if (ObjectUtil.equal(specType, false)) {
             ProductSkuSaveReqVO skuVO = skus.get(0);