feat(shopping-cart): 添加购物车其他要求相关功能

- 新增QuotationShoppingCartOther实体及其Mapper和Service实现
- 新增ShoppingCartOtherRequest请求对象并添加字段校验
- 在ShoppingSaveRequest中增加others字段支持其他要求
- 修改ShoppingController增加对其他要求的保存逻辑
- 修正部分代码格式与空格规范
- 增加依赖注入IQuotationShoppingCartOtherService以便操作其他要求数据

nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/PlanSearchItemVO.java

@@ -2,6 +2,8 @@ package com.nflg.mobilebroken.common.pojo.vo;
 
 import com.nflg.mobilebroken.common.util.NumberUtil;
 import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.data.annotation.AccessType;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -9,6 +11,7 @@ import java.math.BigDecimal;
 import java.util.Objects;
 
 @Data
+@Accessors(chain = true)
 public class PlanSearchItemVO {
 
     private Long id;

nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/PlanController.java

@@ -137,7 +137,7 @@ public class PlanController extends ControllerBase {
         boolean multiRegionQuotations = isMultiRegionQuotationsUser();
         List<Long> categoryIds = new ArrayList<>();
         if (multiRegionQuotations) {
-            categoryIds = dictionaryItemService.getListByDictionaryCode("MultiRegionQuotationsSupplier")
+            categoryIds = dictionaryItemService.getListByDictionaryCode("DirectSalesCategory")
                     .stream()
                     .map(DictionaryItem::getId)
                     .collect(Collectors.toList());
@@ -146,6 +146,7 @@ public class PlanController extends ControllerBase {
         }
         List<ModelPriceVO> prices = priceService.getAllModelPrice();
         Map<Long, List<PlanSearchItemVO>> fgroup = items.stream().collect(Collectors.groupingBy(PlanSearchItemVO::getModelId));
+        pageData.setTotal(fgroup.size());
         for (Map.Entry<Long, List<PlanSearchItemVO>> entry : fgroup.entrySet()) {
             if (index >= startIndex && index < endIndex) {
                 categoryIds.forEach(categoryId -> {
@@ -156,14 +157,30 @@ public class PlanController extends ControllerBase {
                             .collect(Collectors.toList());
                     if (CollectionUtil.isEmpty(vos)) {
                         entry.getValue().forEach(item -> {
-                            item.setStandardPrice(salePrice);
-                            item.setAreaId(categoryId);
-                            datas.add(item);
+                            datas.add(new PlanSearchItemVO()
+                                    .setPlanId(item.getPlanId())
+                                    .setIsDefault(item.getIsDefault())
+                                    .setModelId(item.getModelId())
+                                    .setModelNo(item.getModelNo())
+                                    .setName(item.getName())
+                                    .setRatio(item.getRatio())
+                                    .setAreaId(categoryId)
+                                    .setStandardPrice(salePrice)
+                            );
                         });
                     } else {
                         vos.forEach(item -> {
-                            item.setStandardPrice(salePrice);
-                            datas.add(item);
+                            datas.add(new PlanSearchItemVO()
+                                    .setId(item.getId())
+                                    .setPlanId(item.getPlanId())
+                                    .setIsDefault(item.getIsDefault())
+                                    .setModelId(item.getModelId())
+                                    .setModelNo(item.getModelNo())
+                                    .setName(item.getName())
+                                    .setRatio(item.getRatio())
+                                    .setAreaId(categoryId)
+                                    .setStandardPrice(salePrice)
+                            );
                         });
                     }
                 });

nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java

@@ -101,6 +101,9 @@ public class ShoppingController extends ControllerBase {
     @Resource
     private IQuotationShoppingCartServiceService shoppingCartServiceService;
 
+    @Resource
+    private IQuotationShoppingCartOtherService shoppingCartOtherService;
+
     @Resource
     private IQuotationShoppingOrderService shoppingOrderService;
 
@@ -357,6 +360,16 @@ public class ShoppingController extends ControllerBase {
                     ).collect(Collectors.toList())
             );
         }
+        if (CollectionUtil.isNotEmpty(request.getOthers())) {
+            shoppingCartOtherService.saveBatch(
+                    request.getOthers().stream().map(as -> {
+                                QuotationShoppingCartOther ci = Convert.convert(QuotationShoppingCartOther.class, as);
+                                ci.setCartId(cartId);
+                                return ci;
+                            }
+                    ).collect(Collectors.toList())
+            );
+        }
         shoppingCartService.save(cart);
         return ApiResult.success(cartId);
     }
@@ -1025,20 +1038,20 @@ public class ShoppingController extends ControllerBase {
      * 获取下属报价单
      */
     @PostMapping("/getQuotationOfSubordinate")
-    public ApiResult<PageData<QuotationSearchVO>> getQuotationOfSubordinate(@Valid @RequestBody SubordinateQuotationSearchRequest request){
+    public ApiResult<PageData<QuotationSearchVO>> getQuotationOfSubordinate(@Valid @RequestBody SubordinateQuotationSearchRequest request) {
         VUtils.trueThrowBusinessError(AppUserUtil.isAgent() && !AppUserUtil.isPrimary())
                 .throwMessage("你不是代理商主账号无权查看");
-        if (Objects.isNull(request.getCreateById())){
+        if (Objects.isNull(request.getCreateById())) {
             request.setCreateByIds(
                     appUserService.getChildren(appUserService.getById(AppUserUtil.getUserId()))
                             .stream()
                             .map(AppUser::getId)
                             .collect(Collectors.toList())
             );
-        }else {
+        } else {
             request.setCreateByIds(List.of(request.getCreateById()));
         }
-        if (!AppUserUtil.isAgent()){
+        if (!AppUserUtil.isAgent()) {
             request.setTargetId(null);
         }
         return ApiResult.success(shoppingOrderService.getQuotationOfSubordinate(request));

nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingCartOtherRequest.java

@@ -0,0 +1,23 @@
+package com.nflg.mobilebroken.quotation.pojo.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+public class ShoppingCartOtherRequest {
+
+    /**
+     * 要求说明
+     */
+    @NotBlank(message = "要求说明不能为空")
+    private String desc;
+
+    /**
+     * 费用
+     */
+    @NotNull(message = "费用不能为空")
+    private BigDecimal fee;
+}

nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingSaveRequest.java

@@ -148,4 +148,10 @@ public class ShoppingSaveRequest {
      */
     @Valid
     private List<ShoppingSaveServiceRequest> services;
+
+    /**
+     * 其他要求
+     */
+    @Valid
+    private List<ShoppingCartOtherRequest> others;
 }

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationShoppingCartOther.java

@@ -0,0 +1,43 @@
+package com.nflg.mobilebroken.repository.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 报价-购物车-其他要求
+ * </p>
+ * @author 代码生成器生成
+ * @since 2026
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("quotation_shopping_cart_other")
+public class QuotationShoppingCartOther implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 购物车id
+     */
+    private Long cartId;
+
+    /**
+     * 要求说明
+     */
+    private String desc;
+
+    /**
+     * 费用
+     */
+    private BigDecimal fee;
+}

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationShoppingCartOtherMapper.java

@@ -0,0 +1,16 @@
+package com.nflg.mobilebroken.repository.mapper;
+
+import com.nflg.mobilebroken.repository.entity.QuotationShoppingCartOther;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报价-购物车-其他要求 Mapper 接口
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2026
+ */
+public interface QuotationShoppingCartOtherMapper extends BaseMapper<QuotationShoppingCartOther> {
+
+}

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationShoppingCartOtherService.java

@@ -0,0 +1,16 @@
+package com.nflg.mobilebroken.repository.service;
+
+import com.nflg.mobilebroken.repository.entity.QuotationShoppingCartOther;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 报价-购物车-其他要求 服务类
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2026
+ */
+public interface IQuotationShoppingCartOtherService extends IService<QuotationShoppingCartOther> {
+
+}

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationShoppingCartOtherServiceImpl.java

@@ -0,0 +1,20 @@
+package com.nflg.mobilebroken.repository.service.impl;
+
+import com.nflg.mobilebroken.repository.entity.QuotationShoppingCartOther;
+import com.nflg.mobilebroken.repository.mapper.QuotationShoppingCartOtherMapper;
+import com.nflg.mobilebroken.repository.service.IQuotationShoppingCartOtherService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报价-购物车-其他要求 服务实现类
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2026
+ */
+@Service
+public class QuotationShoppingCartOtherServiceImpl extends ServiceImpl<QuotationShoppingCartOtherMapper, QuotationShoppingCartOther> implements IQuotationShoppingCartOtherService {
+
+}