diff --git a/.gitignore b/.gitignore
index da50e561..85927999 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,5 @@ logs
 ### Code Agent ###
 .codegraph
 .claude
-.claude.json
\ No newline at end of file
+.claude.json
+CLAUDE.md
\ No newline at end of file
diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductSeriesController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductSeriesController.java
index dd065c72..d19b6908 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductSeriesController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductSeriesController.java
@@ -5,6 +5,7 @@ import com.nflg.mobilebroken.common.pojo.ApiResult;
 import com.nflg.mobilebroken.common.pojo.PageData;
 import com.nflg.mobilebroken.common.pojo.request.*;
 import com.nflg.mobilebroken.common.pojo.vo.*;
+import com.nflg.mobilebroken.common.util.MultilingualUtil;
 import com.nflg.mobilebroken.repository.entity.DictionaryItem;
 import com.nflg.mobilebroken.repository.service.IDictionaryItemService;
 import com.nflg.mobilebroken.repository.service.IProductMobilebrokenIntroService;
@@ -39,7 +40,7 @@ public class ProductSeriesController extends ControllerBase{
      */
     @GetMapping("/getModuleList")
     public ApiResult<List<DictionaryItem>> getModuleList(){
-        return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_PRODUCT_MODULE));
+        return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_PRODUCT_MODULE, MultilingualUtil.getLanguage()));
     }
 
     /**
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ShoppingSearchVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ShoppingSearchVO.java
index 3b3bd696..30bfd877 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ShoppingSearchVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ShoppingSearchVO.java
@@ -71,19 +71,9 @@ public class ShoppingSearchVO {
     private Integer targetId;
 
     /**
-     * 油漆要求
+     * 其他要求总费用
      */
-    private String paintRequirements;
-
-    /**
-     * 其他要求
-     */
-    private String otherRequirements;
-
-    /**
-     * 其他要求费用
-     */
-    private BigDecimal otherFee;
+    private BigDecimal otherRequirementsFee;
 
     /**
      * 标配价格
@@ -115,45 +105,45 @@ public class ShoppingSearchVO {
      */
     private BigDecimal serviceFee;
 
-    /**
-     * 交货方式，字典id
-     */
-    private Long deliveryMethod;
-
-    /**
-     * 交货时间
-     */
-    private String deliveryDate;
-
-    /**
-     * 交货地点
-     */
-    private String deliveryAddress;
-
-    /**
-     * 运费
-     */
-    private BigDecimal deliveryFee;
-
-    /**
-     * 付款方式
-     */
-    private String paymentMethod;
-
-    /**
-     * 付款方式产生的费用
-     */
-    private BigDecimal paymentFee;
-
-    /**
-     * 币种，字典id
-     */
-    private Long currency;
-
-    /**
-     * 汇率
-     */
-    private BigDecimal exchangeRate;
+//    /**
+//     * 交货方式，字典id
+//     */
+//    private Long deliveryMethod;
+//
+//    /**
+//     * 交货时间
+//     */
+//    private String deliveryDate;
+//
+//    /**
+//     * 交货地点
+//     */
+//    private String deliveryAddress;
+//
+//    /**
+//     * 运费
+//     */
+//    private BigDecimal deliveryFee;
+//
+//    /**
+//     * 付款方式
+//     */
+//    private String paymentMethod;
+//
+//    /**
+//     * 付款方式产生的费用
+//     */
+//    private BigDecimal paymentFee;
+//
+//    /**
+//     * 币种，字典id
+//     */
+//    private Long currency;
+//
+//    /**
+//     * 汇率
+//     */
+//    private BigDecimal exchangeRate;
 
     /**
      * 创建人类型，0：内部人员；1：代理商
diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
index 9caa32f6..98630243 100644
--- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
+++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
@@ -224,14 +224,16 @@ public class ShoppingController extends ControllerBase {
         }
         if (!request.getShowLowestPrice()) {
             //方案
-            QuotationUserPlanModelItem planModelItem = userPlanModelItemService.getEffectiveForUser(request.getModelId(), AppUserUtil.isAgent() ? 1 : 0, AppUserUtil.getUserId());
+            QuotationUserPlanModelItem planModelItem = userPlanModelItemService.getEffectiveForUser(request.getModelId()
+                    , AppUserUtil.isAgent() ? 1 : 0, AppUserUtil.getUserId(),categoryId);
             if (Objects.nonNull(planModelItem)) {
                 log.debug("机型【{}】方案为{},系数:{}", request.getModelNo(), planModelItem.getName(), planModelItem.getRatio());
                 standardRatio = NumberUtil.multiply(standardRatio, planModelItem.getRatio());
                 log.debug("机型【{}】标准配件系数为{},可选配件系数为{}", request.getModelNo(), standardRatio, optionalRatio);
                 vo.setPlanItemId(planModelItem.getId());
             } else {
-                QuotationUserPlanDefault userPlanDefault = userPlanDefaultService.getEffectiveForUser(AppUserUtil.isAgent() ? 1 : 0, AppUserUtil.getUserId());
+                QuotationUserPlanDefault userPlanDefault = userPlanDefaultService.getEffectiveForUser(AppUserUtil.isAgent() ? 1 : 0
+                        , AppUserUtil.getUserId(), categoryId);
                 if (Objects.nonNull(userPlanDefault)) {
                     vo.setDefaultRatio(userPlanDefault.getRatio());
                     log.debug("用户方案默认系数为{}", userPlanDefault.getRatio());
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationUserPlanModelItemMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationUserPlanModelItemMapper.java
index 6e8f72a4..f25ee857 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationUserPlanModelItemMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationUserPlanModelItemMapper.java
@@ -22,5 +22,5 @@ public interface QuotationUserPlanModelItemMapper extends BaseMapper<QuotationUs
 
     List<PlanSearchItemVO> search(ModelConfigSearchRequest request,Integer userType, Integer userId);
 
-    QuotationUserPlanModelItem getEffectiveForUser(Long modelId,Integer userType, Integer userId);
+    QuotationUserPlanModelItem getEffectiveForUser(Long modelId,Integer userType, Integer userId,Long categoryId);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationUserPlanDefaultService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationUserPlanDefaultService.java
index e1c503ee..a9e10940 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationUserPlanDefaultService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationUserPlanDefaultService.java
@@ -13,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IQuotationUserPlanDefaultService extends IService<QuotationUserPlanDefault> {
 
-    QuotationUserPlanDefault getEffectiveForUser(int userType, Integer userId);
+    QuotationUserPlanDefault getEffectiveForUser(int userType, Integer userId,Long categoryId);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationUserPlanModelItemService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationUserPlanModelItemService.java
index 2a6dd71e..c141426f 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationUserPlanModelItemService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationUserPlanModelItemService.java
@@ -23,5 +23,5 @@ public interface IQuotationUserPlanModelItemService extends IService<QuotationUs
 
     List<PlanSearchItemVO> search(ModelConfigSearchRequest request,Integer userType, Integer userId);
 
-    QuotationUserPlanModelItem getEffectiveForUser(Long modelId,Integer userType, Integer userId);
+    QuotationUserPlanModelItem getEffectiveForUser(Long modelId,Integer userType, Integer userId,Long categoryId);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationUserPlanDefaultServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationUserPlanDefaultServiceImpl.java
index d04cd601..2ea598c5 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationUserPlanDefaultServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationUserPlanDefaultServiceImpl.java
@@ -18,10 +18,11 @@ import org.springframework.stereotype.Service;
 public class QuotationUserPlanDefaultServiceImpl extends ServiceImpl<QuotationUserPlanDefaultMapper, QuotationUserPlanDefault> implements IQuotationUserPlanDefaultService {
 
     @Override
-    public QuotationUserPlanDefault getEffectiveForUser(int userType, Integer userId) {
+    public QuotationUserPlanDefault getEffectiveForUser(int userType, Integer userId,Long categoryId) {
         return lambdaQuery()
                 .eq(QuotationUserPlanDefault::getCreateByType, userType)
                 .eq(QuotationUserPlanDefault::getCreateById, userId)
+                .eq(QuotationUserPlanDefault::getAreaId, categoryId)
                 .one();
     }
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationUserPlanModelItemServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationUserPlanModelItemServiceImpl.java
index f237408b..81279c6c 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationUserPlanModelItemServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationUserPlanModelItemServiceImpl.java
@@ -33,7 +33,7 @@ public class QuotationUserPlanModelItemServiceImpl extends ServiceImpl<Quotation
     }
 
     @Override
-    public QuotationUserPlanModelItem getEffectiveForUser(Long modelId,Integer userType, Integer userId) {
-        return baseMapper.getEffectiveForUser(modelId,userType, userId);
+    public QuotationUserPlanModelItem getEffectiveForUser(Long modelId,Integer userType, Integer userId,Long categoryId) {
+        return baseMapper.getEffectiveForUser(modelId,userType, userId,categoryId);
     }
 }
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationUserPlanModelItemMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationUserPlanModelItemMapper.xml
index 2651e50f..783426a6 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationUserPlanModelItemMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationUserPlanModelItemMapper.xml
@@ -30,6 +30,6 @@
         FROM quotation_user_plan_model qupm
         INNER JOIN quotation_user_plan_model_item qupmi ON qupm.id=qupmi.plan_id
         WHERE qupm.`status`=1 AND qupm.create_by_type=#{userType} AND qupm.create_by_id=#{userId} AND qupmi.is_default=1
-          AND qupmi.model_id=#{modelId}
+          AND qupmi.model_id=#{modelId} and qupmi.area_id=#{categoryId}
     </select>
 </mapper>