refactor(quotation): 将“报价对象”统一修改为“报价主体”

- 统一替换代码注释中的“报价对象”为“报价主体”
- 同步更新验证提示信息中的“报价对象”为“报价主体”
- 统一调整接口返回和请求参数描述为“报价主体”
- 确保相关实体类及请求VO中字段注释一致性
- 修改购物车和订单相关提示消息中的“报价对象”为“报价主体”
This commit is contained in:
曹鹏飞 2026-05-13 14:35:14 +08:00
parent 35bd3b4767
commit dfa793fcff
17 changed files with 20 additions and 20 deletions

View File

@ -89,8 +89,8 @@ public class CustomerDTO {
private List<CustomerAreaDTO> areaList; private List<CustomerAreaDTO> areaList;
/** /**
* 是否报价对象 * 是否报价主体
*/ */
@NotNull(message = "是否报价对象不能为空") @NotNull(message = "是否报价主体不能为空")
private Boolean quotationUse=false; private Boolean quotationUse=false;
} }

View File

@ -33,7 +33,7 @@ public class QuotationAdminSearchRequest extends PageRequest{
private String customerName; private String customerName;
/** /**
* 报价对象 * 报价主体
*/ */
private Long targetId; private Long targetId;

View File

@ -29,12 +29,12 @@ public class QuotationSearchVO {
private String quotationCode; private String quotationCode;
/** /**
* 报价对象 * 报价主体
*/ */
private Integer targetId; private Integer targetId;
/** /**
* 报价对象 * 报价主体
*/ */
private String targetName; private String targetName;

View File

@ -66,7 +66,7 @@ public class ShoppingSearchVO {
private String customerName; private String customerName;
/** /**
* 报价对象代理商时为公司id内部用户时为其用户id * 报价主体代理商时为公司id内部用户时为其用户id
*/ */
private Integer targetId; private Integer targetId;

View File

@ -140,7 +140,7 @@ public class DiscountConfigController extends ControllerBase {
} }
/** /**
* 获取所有报价对象 * 获取所有报价主体
*/ */
@GetMapping("/applyFors") @GetMapping("/applyFors")
public ApiResult<List<DiscountApplyForVO>> getApplyFors() { public ApiResult<List<DiscountApplyForVO>> getApplyFors() {

View File

@ -64,7 +64,7 @@ public class RatioConfigController extends ControllerBase {
private IAdminUserService adminUserService; private IAdminUserService adminUserService;
/** /**
* 获取报价对象 * 获取报价主体
*/ */
@GetMapping("/getTargetUsers") @GetMapping("/getTargetUsers")
public ApiResult<TargetUserVO> getTargetUsers() { public ApiResult<TargetUserVO> getTargetUsers() {

View File

@ -235,7 +235,7 @@ public class AppRatioAgentConfigController extends ControllerBase {
} }
/** /**
* 获取报价对象 * 获取报价主体
*/ */
@GetMapping("list/getUsers") @GetMapping("list/getUsers")
public ApiResult<List<SimpleUserVO>> getUsers() { public ApiResult<List<SimpleUserVO>> getUsers() {

View File

@ -126,7 +126,7 @@ public class ShoppingController extends ControllerBase {
private IDictionaryItemTranslateService dictionaryItemTranslateService; private IDictionaryItemTranslateService dictionaryItemTranslateService;
/** /**
* 购物车-获取报价对象 * 购物车-获取报价主体
*/ */
@GetMapping("/cart/getTargets") @GetMapping("/cart/getTargets")
public ApiResult<List<SimpleUserVO>> getTargets() { public ApiResult<List<SimpleUserVO>> getTargets() {
@ -528,7 +528,7 @@ public class ShoppingController extends ControllerBase {
VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getCustomerName).collect(Collectors.toSet()).size() > 1) VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getCustomerName).collect(Collectors.toSet()).size() > 1)
.throwMessage("客户名称不一致"); .throwMessage("客户名称不一致");
VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getTargetId).collect(Collectors.toSet()).size() > 1) 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) VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getCurrency).collect(Collectors.toSet()).size() > 1)
.throwMessage("币种不一致"); .throwMessage("币种不一致");
VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getExchangeRate).collect(Collectors.toSet()).size() > 1) VUtils.trueThrowBusinessError(carts.stream().map(QuotationShoppingCart::getExchangeRate).collect(Collectors.toSet()).size() > 1)

View File

@ -21,7 +21,7 @@ public class QuotationCopyRequest {
private String customerName; private String customerName;
/** /**
* 报价对象ID * 报价主体ID
*/ */
@NotNull @NotNull
private Integer targetId; private Integer targetId;

View File

@ -27,7 +27,7 @@ public class ShoppingInitRequest {
private String customerName; private String customerName;
/** /**
* 报价对象ID * 报价主体ID
*/ */
@NotNull @NotNull
private Integer targetId; private Integer targetId;

View File

@ -56,7 +56,7 @@ public class ShoppingSaveRequest {
private String customerName; private String customerName;
/** /**
* 报价对象代理商时为公司id内部用户时为其用户id * 报价主体代理商时为公司id内部用户时为其用户id
*/ */
@NotNull @NotNull
private Integer targetId; private Integer targetId;

View File

@ -23,7 +23,7 @@ public class QuotationOrderInfoVO {
private String customerName; private String customerName;
/** /**
* 报价对象 * 报价主体
*/ */
private Integer targetId; private Integer targetId;

View File

@ -25,7 +25,7 @@ public class RatioConfigSearchVO {
private String modelNo; private String modelNo;
/** /**
* 报价对象 * 报价主体
*/ */
private String name; private String name;

View File

@ -56,7 +56,7 @@ public class ShoppingCartVO {
private String customerName; private String customerName;
/** /**
* 报价对象代理商时为公司id内部用户时为其用户id * 报价主体代理商时为公司id内部用户时为其用户id
*/ */
private Integer targetId; private Integer targetId;

View File

@ -62,7 +62,7 @@ public class QuotationShoppingCart implements Serializable {
private String customerName; private String customerName;
/** /**
* 报价对象代理商时为公司id内部用户时为其用户id * 报价主体代理商时为公司id内部用户时为其用户id
*/ */
private Integer targetId; private Integer targetId;

View File

@ -37,7 +37,7 @@ public class QuotationShoppingOrder implements Serializable {
private String customerName; private String customerName;
/** /**
* 报价对象 * 报价主体
*/ */
private Integer targetId; private Integer targetId;

View File

@ -134,7 +134,7 @@ public class TBaseCustomer implements Serializable {
private Integer delIs; private Integer delIs;
/** /**
* 是否报价对象 * 是否报价主体
*/ */
private Boolean quotationUse; private Boolean quotationUse;