From dfa793fcffa33a97094eac3efbda645ceedaf8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 13 May 2026 14:35:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(quotation):=20=E5=B0=86=E2=80=9C?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E5=AF=B9=E8=B1=A1=E2=80=9D=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E2=80=9C=E6=8A=A5=E4=BB=B7=E4=B8=BB?= =?UTF-8?q?=E4=BD=93=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一替换代码注释中的“报价对象”为“报价主体” - 同步更新验证提示信息中的“报价对象”为“报价主体” - 统一调整接口返回和请求参数描述为“报价主体” - 确保相关实体类及请求VO中字段注释一致性 - 修改购物车和订单相关提示消息中的“报价对象”为“报价主体” --- .../com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java | 4 ++-- .../common/pojo/request/QuotationAdminSearchRequest.java | 2 +- .../nflg/mobilebroken/common/pojo/vo/QuotationSearchVO.java | 4 ++-- .../nflg/mobilebroken/common/pojo/vo/ShoppingSearchVO.java | 2 +- .../quotation/controller/admin/DiscountConfigController.java | 2 +- .../quotation/controller/admin/RatioConfigController.java | 2 +- .../controller/app/AppRatioAgentConfigController.java | 2 +- .../quotation/controller/app/ShoppingController.java | 4 ++-- .../quotation/pojo/request/QuotationCopyRequest.java | 2 +- .../quotation/pojo/request/ShoppingInitRequest.java | 2 +- .../quotation/pojo/request/ShoppingSaveRequest.java | 2 +- .../mobilebroken/quotation/pojo/vo/QuotationOrderInfoVO.java | 2 +- .../mobilebroken/quotation/pojo/vo/RatioConfigSearchVO.java | 2 +- .../nflg/mobilebroken/quotation/pojo/vo/ShoppingCartVO.java | 2 +- .../mobilebroken/repository/entity/QuotationShoppingCart.java | 2 +- .../repository/entity/QuotationShoppingOrder.java | 2 +- .../nflg/mobilebroken/repository/entity/TBaseCustomer.java | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java index b630a24f..eaff5e45 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java @@ -89,8 +89,8 @@ public class CustomerDTO { private List areaList; /** - * 是否报价对象 + * 是否报价主体 */ - @NotNull(message = "是否报价对象不能为空") + @NotNull(message = "是否报价主体不能为空") private Boolean quotationUse=false; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/QuotationAdminSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/QuotationAdminSearchRequest.java index 74dde254..602f2452 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/QuotationAdminSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/QuotationAdminSearchRequest.java @@ -33,7 +33,7 @@ public class QuotationAdminSearchRequest extends PageRequest{ private String customerName; /** - * 报价对象 + * 报价主体 */ private Long targetId; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/QuotationSearchVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/QuotationSearchVO.java index 97af4a62..5ac01a26 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/QuotationSearchVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/QuotationSearchVO.java @@ -29,12 +29,12 @@ public class QuotationSearchVO { private String quotationCode; /** - * 报价对象 + * 报价主体 */ private Integer targetId; /** - * 报价对象 + * 报价主体 */ private String targetName; 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 149487b8..3b3bd696 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 @@ -66,7 +66,7 @@ public class ShoppingSearchVO { private String customerName; /** - * 报价对象，代理商时为公司id，内部用户时为其用户id + * 报价主体，代理商时为公司id，内部用户时为其用户id */ private Integer targetId; diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/DiscountConfigController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/DiscountConfigController.java index f45b6e14..4cee3b31 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/DiscountConfigController.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/DiscountConfigController.java @@ -140,7 +140,7 @@ public class DiscountConfigController extends ControllerBase { } /** - * 获取所有报价对象 + * 获取所有报价主体 */ @GetMapping("/applyFors") public ApiResult> getApplyFors() { diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioConfigController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioConfigController.java index 28ea7f8d..52aae6e9 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioConfigController.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioConfigController.java @@ -64,7 +64,7 @@ public class RatioConfigController extends ControllerBase { private IAdminUserService adminUserService; /** - * 获取报价对象 + * 获取报价主体 */ @GetMapping("/getTargetUsers") public ApiResult getTargetUsers() { diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/AppRatioAgentConfigController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/AppRatioAgentConfigController.java index 84a22638..76d72144 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/AppRatioAgentConfigController.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/AppRatioAgentConfigController.java @@ -235,7 +235,7 @@ public class AppRatioAgentConfigController extends ControllerBase { } /** - * 获取报价对象 + * 获取报价主体 */ @GetMapping("list/getUsers") public ApiResult> getUsers() { 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 16b46a38..e5d090c0 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 @@ -126,7 +126,7 @@ public class ShoppingController extends ControllerBase { private IDictionaryItemTranslateService dictionaryItemTranslateService; /** - * 购物车-获取报价对象 + * 购物车-获取报价主体 */ @GetMapping("/cart/getTargets") public ApiResult> getTargets() { @@ -528,7 +528,7 @@ public class ShoppingController extends ControllerBase { VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getCustomerName).collect(Collectors.toSet()).size() > 1) .throwMessage("客户名称不一致"); VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getTargetId).collect(Collectors.toSet()).size() > 1) - .throwMessage("报价对象不一致"); + .throwMessage("报价主体不一致"); VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getCurrency).collect(Collectors.toSet()).size() > 1) .throwMessage("币种不一致"); VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getExchangeRate).collect(Collectors.toSet()).size() > 1) diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/QuotationCopyRequest.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/QuotationCopyRequest.java index 9c2814af..95d629aa 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/QuotationCopyRequest.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/QuotationCopyRequest.java @@ -21,7 +21,7 @@ public class QuotationCopyRequest { private String customerName; /** - * 报价对象ID + * 报价主体ID */ @NotNull private Integer targetId; diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingInitRequest.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingInitRequest.java index 14e5997f..b8264274 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingInitRequest.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingInitRequest.java @@ -27,7 +27,7 @@ public class ShoppingInitRequest { private String customerName; /** - * 报价对象ID + * 报价主体ID */ @NotNull private Integer targetId; diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingSaveRequest.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingSaveRequest.java index 8b0bb3f4..e2dd73cb 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingSaveRequest.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingSaveRequest.java @@ -56,7 +56,7 @@ public class ShoppingSaveRequest { private String customerName; /** - * 报价对象，代理商时为公司id，内部用户时为其用户id + * 报价主体，代理商时为公司id，内部用户时为其用户id */ @NotNull private Integer targetId; diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/QuotationOrderInfoVO.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/QuotationOrderInfoVO.java index f3bb7b42..268102c1 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/QuotationOrderInfoVO.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/QuotationOrderInfoVO.java @@ -23,7 +23,7 @@ public class QuotationOrderInfoVO { private String customerName; /** - * 报价对象 + * 报价主体 */ private Integer targetId; diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/RatioConfigSearchVO.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/RatioConfigSearchVO.java index 80aeb4f7..eaa4d203 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/RatioConfigSearchVO.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/RatioConfigSearchVO.java @@ -25,7 +25,7 @@ public class RatioConfigSearchVO { private String modelNo; /** - * 报价对象 + * 报价主体 */ private String name; diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/ShoppingCartVO.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/ShoppingCartVO.java index 0f7f0d95..27785c39 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/ShoppingCartVO.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/ShoppingCartVO.java @@ -56,7 +56,7 @@ public class ShoppingCartVO { private String customerName; /** - * 报价对象，代理商时为公司id，内部用户时为其用户id + * 报价主体，代理商时为公司id，内部用户时为其用户id */ private Integer targetId; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationShoppingCart.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationShoppingCart.java index efb6cb8e..2e35b775 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationShoppingCart.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationShoppingCart.java @@ -62,7 +62,7 @@ public class QuotationShoppingCart implements Serializable { private String customerName; /** - * 报价对象，代理商时为公司id，内部用户时为其用户id + * 报价主体，代理商时为公司id，内部用户时为其用户id */ private Integer targetId; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationShoppingOrder.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationShoppingOrder.java index f8cfcd52..0cb9df34 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationShoppingOrder.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationShoppingOrder.java @@ -37,7 +37,7 @@ public class QuotationShoppingOrder implements Serializable { private String customerName; /** - * 报价对象 + * 报价主体 */ private Integer targetId; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java index 287a7021..8522534f 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java @@ -134,7 +134,7 @@ public class TBaseCustomer implements Serializable { private Integer delIs; /** - * 是否报价对象 + * 是否报价主体 */ private Boolean quotationUse;