refactor(quotation): 将“报价对象”统一修改为“报价主体”
- 统一替换代码注释中的“报价对象”为“报价主体” - 同步更新验证提示信息中的“报价对象”为“报价主体” - 统一调整接口返回和请求参数描述为“报价主体” - 确保相关实体类及请求VO中字段注释一致性 - 修改购物车和订单相关提示消息中的“报价对象”为“报价主体”
This commit is contained in:
曹鹏飞
parent
35bd3b4767
commit
dfa793fcff
|
|
@ -89,8 +89,8 @@ public class CustomerDTO {
|
|||
private List<CustomerAreaDTO> areaList;
|
||||
|
||||
/**
|
||||
* 是否报价对象
|
||||
* 是否报价主体
|
||||
*/
|
||||
@NotNull(message = "是否报价对象不能为空")
|
||||
@NotNull(message = "是否报价主体不能为空")
|
||||
private Boolean quotationUse=false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ public class QuotationAdminSearchRequest extends PageRequest{
|
|||
private String customerName;
|
||||
|
||||
/**
|
||||
* 报价对象
|
||||
* 报价主体
|
||||
*/
|
||||
private Long targetId;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@ public class QuotationSearchVO {
|
|||
private String quotationCode;
|
||||
|
||||
/**
|
||||
* 报价对象
|
||||
* 报价主体
|
||||
*/
|
||||
private Integer targetId;
|
||||
|
||||
/**
|
||||
* 报价对象
|
||||
* 报价主体
|
||||
*/
|
||||
private String targetName;
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ public class ShoppingSearchVO {
|
|||
private String customerName;
|
||||
|
||||
/**
|
||||
* 报价对象，代理商时为公司id，内部用户时为其用户id
|
||||
* 报价主体，代理商时为公司id，内部用户时为其用户id
|
||||
*/
|
||||
private Integer targetId;
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ public class DiscountConfigController extends ControllerBase {
|
|||
}
|
||||
|
||||
/**
|
||||
* 获取所有报价对象
|
||||
* 获取所有报价主体
|
||||
*/
|
||||
@GetMapping("/applyFors")
|
||||
public ApiResult<List<DiscountApplyForVO>> getApplyFors() {
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class RatioConfigController extends ControllerBase {
|
|||
private IAdminUserService adminUserService;
|
||||
|
||||
/**
|
||||
* 获取报价对象
|
||||
* 获取报价主体
|
||||
*/
|
||||
@GetMapping("/getTargetUsers")
|
||||
public ApiResult<TargetUserVO> getTargetUsers() {
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ public class AppRatioAgentConfigController extends ControllerBase {
|
|||
}
|
||||
|
||||
/**
|
||||
* 获取报价对象
|
||||
* 获取报价主体
|
||||
*/
|
||||
@GetMapping("list/getUsers")
|
||||
public ApiResult<List<SimpleUserVO>> getUsers() {
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ public class ShoppingController extends ControllerBase {
|
|||
private IDictionaryItemTranslateService dictionaryItemTranslateService;
|
||||
|
||||
/**
|
||||
* 购物车-获取报价对象
|
||||
* 购物车-获取报价主体
|
||||
*/
|
||||
@GetMapping("/cart/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)
|
||||
.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)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public class QuotationCopyRequest {
|
|||
private String customerName;
|
||||
|
||||
/**
|
||||
* 报价对象ID
|
||||
* 报价主体ID
|
||||
*/
|
||||
@NotNull
|
||||
private Integer targetId;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public class ShoppingInitRequest {
|
|||
private String customerName;
|
||||
|
||||
/**
|
||||
* 报价对象ID
|
||||
* 报价主体ID
|
||||
*/
|
||||
@NotNull
|
||||
private Integer targetId;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public class ShoppingSaveRequest {
|
|||
private String customerName;
|
||||
|
||||
/**
|
||||
* 报价对象，代理商时为公司id，内部用户时为其用户id
|
||||
* 报价主体，代理商时为公司id，内部用户时为其用户id
|
||||
*/
|
||||
@NotNull
|
||||
private Integer targetId;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ public class QuotationOrderInfoVO {
|
|||
private String customerName;
|
||||
|
||||
/**
|
||||
* 报价对象
|
||||
* 报价主体
|
||||
*/
|
||||
private Integer targetId;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ public class RatioConfigSearchVO {
|
|||
private String modelNo;
|
||||
|
||||
/**
|
||||
* 报价对象
|
||||
* 报价主体
|
||||
*/
|
||||
private String name;
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public class ShoppingCartVO {
|
|||
private String customerName;
|
||||
|
||||
/**
|
||||
* 报价对象，代理商时为公司id，内部用户时为其用户id
|
||||
* 报价主体，代理商时为公司id，内部用户时为其用户id
|
||||
*/
|
||||
private Integer targetId;
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ public class QuotationShoppingCart implements Serializable {
|
|||
private String customerName;
|
||||
|
||||
/**
|
||||
* 报价对象，代理商时为公司id，内部用户时为其用户id
|
||||
* 报价主体，代理商时为公司id，内部用户时为其用户id
|
||||
*/
|
||||
private Integer targetId;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class QuotationShoppingOrder implements Serializable {
|
|||
private String customerName;
|
||||
|
||||
/**
|
||||
* 报价对象
|
||||
* 报价主体
|
||||
*/
|
||||
private Integer targetId;
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ public class TBaseCustomer implements Serializable {
|
|||
private Integer delIs;
|
||||
|
||||
/**
|
||||
* 是否报价对象
|
||||
* 是否报价主体
|
||||
*/
|
||||
private Boolean quotationUse;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue