商品业务新增富文本和价格单位

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/request/KwpBizWalletPrepayRequest.java

@@ -27,8 +27,10 @@ public class KwpBizWalletPrepayRequest extends PageRequest {
     /**
      * 本次更新金额（单位：元，保留2位小数）
      */
-    @NotNull(message = "金额不能为空！")
     @Schema(description = "本次更新金额")
+    @NotNull(message = "金额不能为空！")
+    @Positive(message = "金额必须为正数！")
+    @Digits(integer = 10, fraction = 5, message = "金额最多10位整数和5位小数！")
     private BigDecimal amount;
 
     /**

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoods.java

@@ -137,4 +137,11 @@ public class KwpGoods extends BaseModel implements Serializable {
      */
     @TableField("car_axis")
     private String carAxis;
+
+    /**
+     * 富文本内容
+     */
+    @TableField("content")
+    private String content;
+
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsParam.java

@@ -2,12 +2,14 @@ package com.sckw.product.model.vo.req;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.Range;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -78,6 +80,12 @@ public class AddGoodsParam {
     @Schema(description = "轴数")
     private String carAxis;
 
+    /**
+     * 富文本内容
+     */
+    @Schema(description = "富文本内容")
+    private String content;
+
     /**
      * 参考价格（元）
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/GoodsDetail.java

@@ -96,11 +96,21 @@ public class GoodsDetail {
      */
     private BigDecimal amount;
 
+    /**
+     * 价格单位
+     */
+    private BigDecimal priceUnit;
+
     /**
      * 轴数
      */
     private String carAxis;
 
+    /**
+     * 富文本内容
+     */
+    private String content;
+
     /**
      * 单位（吨、方、件、箱、其他）
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/GoodsList.java

@@ -163,5 +163,20 @@ public class GoodsList {
      */
     private String remark;
 
+    /**
+     * 价格单位
+     */
+    private String priceUnit;
+
+    /**
+     * 轴数
+     */
+    private String carAxis;
+
+    /**
+     * 富文本内容
+     */
+    private String content;
+
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -139,6 +139,7 @@ public class KwpGoodsService {
                 .setThumb(FileUtils.replaceAll(goods.getThumb()))
                 .setEntId(LoginUserHolder.getEntId())
                 .setAddedTime(new Date())
+                .setPriceUnit("元")
                 .setStatus(GoodsStatusEnum.PUT_ON_SHELVES.getCode());
         kwpGoodsMapper.insert(goods);
         //添加商品其他信息
@@ -716,47 +717,32 @@ public class KwpGoodsService {
                 userIds.add(e.getCreateBy());
             }
         });
-        //地址信息
-        Map<Long, String> addressMap = kwpGoodsAddressService.getByGoodsIds(goodsIds).stream()
-                .collect(Collectors.toMap(KwpGoodsAddress::getGoodsId, KwpGoodsAddress::getName, (k1, k2) -> k1));
+
         //价格梯度信息
         Map<Long, List<KwpGoodsPriceRange>> priceRangeMap = kwpGoodsPriceRangeService.getByGoodsIds(goodsIds).stream()
                 .collect(Collectors.groupingBy(KwpGoodsPriceRange::getGoodsId));
         //用户信息
         Map<Long, UserCacheResDto> userMap = remoteSystemService.queryUserCacheMapByIds(userIds);
-        //供应企业信息
-        List<EntCacheResDto> entList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(supplyEntIds)) {
-            entList = remoteSystemService.queryEntCacheByIds(supplyEntIds);
-        }
+
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.PRODUCT_NAME_TYPE.getType(),
                 DictTypeEnum.UNIT_TYPE.getType(), DictTypeEnum.TAX_RATE.getType(), DictTypeEnum.GOODS_STATUS.getType()));
-        Map<String, String> productNameMap, unitMap, taxRateMap, goodsStatusMap;
+        Map<String, String> productNameMap, unitMap,  goodsStatusMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             productNameMap = dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());
-            taxRateMap = dict.get(DictTypeEnum.TAX_RATE.getType());
             goodsStatusMap = dict.get(DictTypeEnum.GOODS_STATUS.getType());
         } else {
             productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-            taxRateMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             goodsStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
-        Map<Long, String> entMap = entList.stream().collect(Collectors.toMap(EntCacheResDto::getId, EntCacheResDto::getFirmName, (k1, k2) -> k1));
         list.forEach(e -> {
             Long id = e.getId();
             GoodsList goodsList = BeanUtils.copyProperties(e, GoodsList.class);
-            UserCacheResDto manager = userMap.get(e.getManager());
             UserCacheResDto createUser = userMap.get(e.getCreateBy());
             goodsList.setStatusLabel(CollectionUtils.isNotEmpty(goodsStatusMap) ? goodsStatusMap.get(String.valueOf(goodsList.getStatus())) : null)
                     .setGoodsTypeLabel(CollectionUtils.isNotEmpty(productNameMap) ? productNameMap.get(goodsList.getGoodsType()) : null)
                     .setUnitLabel(CollectionUtils.isNotEmpty(unitMap) ? unitMap.get(goodsList.getUnit()) : null)
-                    .setTaxRateLabel(CollectionUtils.isNotEmpty(taxRateMap) ? taxRateMap.get(goodsList.getTaxRate()) : null)
-                    .setPrepaidLimitLabel(Objects.equals(e.getPrepaidLimit(), 1) ? "是" : "否")
-                    .setAddress(addressMap.get(id)).setSupplyEnt(entMap.get(e.getSupplyEntId()))
-                    .setManageName(Objects.nonNull(manager) ? manager.getName() : null)
-                    .setPhone(Objects.nonNull(manager) ? manager.getPhone() : null)
                     .setThumb(FileUtils.splice(e.getThumb()))
                     .setCreateByName(Objects.nonNull(createUser) ? createUser.getName() : null);
             List<KwpGoodsPriceRange> priceRanges = priceRangeMap.get(id);