Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17

YunaiV
2 parents f68f1f93 330fa3a2
Showing 4 changed files with 14 additions and 3 deletions
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmCustomerParseFun
 import cn.iocoder.yudao.module.crm.framework.operatelog.core.SysAdminUserParseFunction;
 import com.mzt.logapi.starter.annotation.DiffLogField;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -67,6 +68,7 @@ public class CrmContractSaveReqVO {
     @Schema(description = "合同金额", example = "5617")
     @DiffLogField(name = "合同金额")
+    @DecimalMin(value = "0", message = "合同金额不能小于 0")
     private BigDecimal totalPrice;
     @Schema(description = "客户签约人编号", example = "18546")
@@ -217,6 +217,10 @@ public class CrmContractServiceImpl implements CrmContractService {
     private void calculateTotalPrice(CrmContractDO contract, List<CrmContractProductDO> contractProducts) {
         contract.setTotalProductPrice(getSumValue(contractProducts, CrmContractProductDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
+        // 无产品明细的合同，合同金额以传入值为准（支持手工填写合同金额），不做重算覆盖
+        if (CollUtil.isEmpty(contractProducts)) {
+            return;
+        }
         BigDecimal discountPrice = MoneyUtils.priceMultiplyPercent(contract.getTotalProductPrice(), contract.getDiscountPercent());
         contract.setTotalPrice(contract.getTotalProductPrice().subtract(discountPrice));
     }
@@ -45,6 +45,7 @@ public interface ErrorCodeConstants {
     ErrorCode SPU_ATTR_NUMBERS_MUST_BE_EQUALS = new ErrorCode(1_008_006_002, "一个 SPU 下的每个 SKU，其属性项必须一致");
     ErrorCode SPU_SKU_NOT_DUPLICATE = new ErrorCode(1_008_006_003, "一个 SPU 下的每个 SKU，必须不重复");
     ErrorCode SKU_STOCK_NOT_ENOUGH = new ErrorCode(1_008_006_004, "商品 SKU 库存不足");
+    ErrorCode SKU_PROPERTIES_EMPTY = new ErrorCode(1_008_006_005, "多规格商品必须从规格列表选择属性组合，SKU 属性不能为空");
     // ========== 商品 评价 1-008-007-000 ==========
     ErrorCode COMMENT_NOT_EXISTS = new ErrorCode(1_008_007_000, "商品评价不存在");
@@ -106,9 +106,13 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         Set<Long> propertyIds = skus.stream().filter(p -> p.getProperties() != null)
                 // 遍历多个 Property 属性
                 .flatMap(p -> p.getProperties().stream())
-                // 将每个 Property 转换成对应的 propertyId，最后形成集合
-                .map(ProductSkuSaveReqVO.Property::getPropertyId)
-                .collect(Collectors.toSet());
+        // 将每个 Property 转换成对应的 propertyId，最后形成集合
+        .map(ProductSkuSaveReqVO.Property::getPropertyId)
+        .collect(Collectors.toSet());
+        // 多规格下，属性组合不能为空：空集合会让后续按 id 批量查询生成非法 SQL（IN()）而 500，这里明确拒绝
+        if (CollUtil.isEmpty(propertyIds)) {
+            throw exception(SKU_PROPERTIES_EMPTY);
+        }
         List<ProductPropertyDO> propertyList = productPropertyService.getPropertyList(propertyIds);
         if (propertyList.size() != propertyIds.size()) {
             throw exception(PROPERTY_NOT_EXISTS);