Bläddra i källkod

managew

master
chenchaod 2 månader sedan
förälder
incheckning
c21570bf45
16 ändrade filer med 85 tillägg och 85 borttagningar
  1. 8
    8
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/multiple/MultipleEquityAddReqDTO.java
  2. 20
    20
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/multiple/MultipleEquityDetailResDTO.java
  3. 1
    1
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/single/SingleEquityAddRequestDTO.java
  4. 5
    5
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/attachment/AttachMentAddRequestDTO.java
  5. 1
    1
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/attachment/AttachMentDeleteRequestDTO.java
  6. 2
    2
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/attachment/AttachMentStatusRequestDTO.java
  7. 1
    1
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/attachment/AttachMentUpdateRequestDTO.java
  8. 21
    21
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/product/ProductAddRequestDto.java
  9. 4
    4
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/product/ProductDetailResponseDTO.java
  10. 5
    5
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/promotion/PromoteAddRequestDTO.java
  11. 5
    5
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/promotion/PromoteDetailResponseDTO.java
  12. 3
    3
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/promotion/PromoteExamineReqDTO.java
  13. 2
    2
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/promotion/PromoteStatusReqDTO.java
  14. 2
    2
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/product/AfterSaleFee.java
  15. 2
    2
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/product/ProcessingFee.java
  16. 3
    3
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/repo/jpa/request/IssueProductPageRequest.java

+ 8
- 8
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/multiple/MultipleEquityAddReqDTO.java Visa fil

@@ -58,29 +58,29 @@ public class MultipleEquityAddReqDTO extends AbstractStaffBizRequestDTO {
@ApiModelProperty(value = "渠道授权")
@NotNull
private List<String> channelAuthorization;
@ApiModelProperty(name = "原价")
@ApiModelProperty(value = "原价")
@NotNull
private Long originalPrice;
@ApiModelProperty(name = "上架启用日期")
@ApiModelProperty(value = "上架启用日期")
private LocalDateTime startDate;
@ApiModelProperty(name = "权益提供方")
@ApiModelProperty(value = "权益提供方")
@NotBlank
private String equityProvider;
@ApiModelProperty(name = "是否支持权益产品过户(1---是;0---否)")
@ApiModelProperty(value = "是否支持权益产品过户(1---是;0---否)")
@NotNull
@IntegerConstant(values = "0,1")
private Integer transferable;
@ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(1---是;0---否)")
@ApiModelProperty(value = "是否可使用积分商城所兑换的折扣券(1---是;0---否)")
@NotNull
@IntegerConstant(values = "0,1")
private Integer discountCouponUsable;
@ApiModelProperty(name = "使用有效期")
@ApiModelProperty(value = "使用有效期")
@NotNull
private Integer usageValidity;
@ApiModelProperty(name = "单项权益ID")
@ApiModelProperty(value = "单项权益ID")
@NotNull
private List<String> singleEquityIds;
@ApiModelProperty(name = "是否单独售卖 1是 0否")
@ApiModelProperty(value = "是否单独售卖 1是 0否")
@NotNull
@IntegerConstant(values = "0,1")
private Integer alonePay;

+ 20
- 20
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/multiple/MultipleEquityDetailResDTO.java Visa fil

@@ -29,66 +29,66 @@ public class MultipleEquityDetailResDTO {
@ApiModelProperty(value = "权益类产品内容简介")
@NotBlank
private String productIntro;
@ApiModelProperty(name = "客户群体")
@ApiModelProperty(value = "客户群体")
@NotNull
private Integer customerGroup;
@ApiModelProperty(name = "收费类型")
@ApiModelProperty(value = "收费类型")
@NotNull
private Integer chargeType;
@ApiModelProperty(name = "优惠售价")
@ApiModelProperty(value = "优惠售价")
@NotNull
private Long discountPrice;
@ApiModelProperty(name = "成本组成描述")
@ApiModelProperty(value = "成本组成描述")
@NotBlank
private String costDescription;
@ApiModelProperty(name = "下架结束日期")
@ApiModelProperty(value = "下架结束日期")
private LocalDateTime endDate;
@ApiModelProperty(name = "会员积分")
@ApiModelProperty(value = "会员积分")
@NotNull
private Long memberPoints;
@ApiModelProperty(name = "ETC设备强绑定权益注销时是否退费(1是;0否)")
@ApiModelProperty(value = "ETC设备强绑定权益注销时是否退费(1是;0否)")
@NotNull
@IntegerConstant(values = "0,1")
private Integer refundOnEtcCancel;
@ApiModelProperty(name = "有效期格式 1日 2月 3季 4年")
@ApiModelProperty(value = "有效期格式 1日 2月 3季 4年")
@NotNull
@IntegerConstant(values = "1,2,3,4")
private Integer validityFormat;
@ApiModelProperty(name = "卖点")
@ApiModelProperty(value = "卖点")
@NotBlank
private String sellingPoint;
@ApiModelProperty(name = "渠道授权")
@ApiModelProperty(value = "渠道授权")
@NotNull
private List<String> channelAuthorization;
@ApiModelProperty(name = "原价")
@ApiModelProperty(value = "原价")
@NotNull
private Long originalPrice;
@ApiModelProperty(name = "上架启用日期")
@ApiModelProperty(value = "上架启用日期")
private LocalDateTime startDate;
@ApiModelProperty(name = "权益提供方")
@ApiModelProperty(value = "权益提供方")
@NotBlank
private String equityProvider;
@ApiModelProperty(name = "是否支持权益产品过户(1---是;0---否)")
@ApiModelProperty(value = "是否支持权益产品过户(1---是;0---否)")
@NotNull
@IntegerConstant(values = "0,1")
private Integer transferable;
@ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(1---是;0---否)")
@ApiModelProperty(value = "是否可使用积分商城所兑换的折扣券(1---是;0---否)")
@NotNull
@IntegerConstant(values = "0,1")
private Integer discountCouponUsable;
@ApiModelProperty(name = "使用有效期")
@ApiModelProperty(value = "使用有效期")
@NotNull
private Integer usageValidity;
@ApiModelProperty(name = "单项权益ID")
@ApiModelProperty(value = "单项权益ID")
@NotNull
private List<String> singleEquityIds;
@ApiModelProperty(name = "是否单独售卖 1是 0否")
@ApiModelProperty(value = "是否单独售卖 1是 0否")
@NotNull
@IntegerConstant(values = "0,1")
private Integer alonePay;

@ApiModelProperty(name = "操作人id")
@ApiModelProperty(value = "操作人id")
private String operateUserId;//操作人id
@ApiModelProperty(name = "操作人名称")
@ApiModelProperty(value = "操作人名称")
private String operateUserName;//操作人名称
}

+ 1
- 1
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/single/SingleEquityAddRequestDTO.java Visa fil

@@ -81,7 +81,7 @@ public class SingleEquityAddRequestDTO extends AbstractStaffBizRequestDTO {
private EquityType equityType;
@ApiModelProperty(value = "卡券id")
private String couponId;
@ApiModelProperty(name = "是否支持单独购买 1是 0否",required = true)
@ApiModelProperty(value = "是否支持单独购买 1是 0否",required = true)
@NotNull
@IntegerConstant(values = "0,1")
private Integer isAlonePay;

+ 5
- 5
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/attachment/AttachMentAddRequestDTO.java Visa fil

@@ -14,19 +14,19 @@ import javax.validation.constraints.NotBlank;
@ApiModel(description = "产品上线附件新增请求")
public class AttachMentAddRequestDTO extends AbstractStaffBizRequestDTO {

@ApiModelProperty(name = "发行产品编号")
@ApiModelProperty(value = "发行产品编号")
@NotBlank
private String releaseId;
@ApiModelProperty(name = "文件名")
@ApiModelProperty(value = "文件名")
@NotBlank
private String fileName;
@ApiModelProperty(name = "文件类型")
@ApiModelProperty(value = "文件类型")
@NotBlank
private String typeName;
@ApiModelProperty(name = "文件地址")
@ApiModelProperty(value = "文件地址")
@NotBlank
private String fileUrl;
@ApiModelProperty(name = "版本号")
@ApiModelProperty(value = "版本号")
@NotBlank
private String version;


+ 1
- 1
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/attachment/AttachMentDeleteRequestDTO.java Visa fil

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotBlank;
@Setter
@ApiModel(description = "产品上线附件删除请求")
public class AttachMentDeleteRequestDTO extends AbstractStaffBizRequestDTO {
@ApiModelProperty(name = "补充文件表逻辑主键")
@ApiModelProperty(value = "补充文件表逻辑主键")
@NotBlank
private String id;


+ 2
- 2
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/attachment/AttachMentStatusRequestDTO.java Visa fil

@@ -18,10 +18,10 @@ import javax.validation.constraints.NotNull;
@Data
@ApiModel(description = "产品上线附件状态请求参数")
public class AttachMentStatusRequestDTO extends AbstractStaffBizRequestDTO {
@ApiModelProperty(name = "补充文件表逻辑主键")
@ApiModelProperty(value = "补充文件表逻辑主键")
@NotBlank
private String id;
@ApiModelProperty(name = "状态")
@ApiModelProperty(value = "状态")
@NotNull
private EnableStatus status;
}

+ 1
- 1
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/attachment/AttachMentUpdateRequestDTO.java Visa fil

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank;
@Getter
@Setter
public class AttachMentUpdateRequestDTO extends AttachMentAddRequestDTO {
@ApiModelProperty(name = "补充文件表逻辑主键")
@ApiModelProperty(value = "补充文件表逻辑主键")
@NotBlank
private String id;


+ 21
- 21
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/product/ProductAddRequestDto.java Visa fil

@@ -69,67 +69,67 @@ public class ProductAddRequestDto extends AbstractStaffBizRequestDTO {
@ApiModelProperty(value = "车辆类型 1客车 2货车 3 专项作业车",required = true)
@NotNull
private List<String> vanType;
@ApiModelProperty(name = "支持车型",required = true)
@ApiModelProperty(value = "支持车型",required = true)
@NotNull
private List<String> vehicleType;
@ApiModelProperty(name = "合作渠道是否支持售后1-是,0-否",required = true)
@ApiModelProperty(value = "合作渠道是否支持售后1-是,0-否",required = true)
@IntegerConstant(values="0,1")
@NotNull
private Integer supAfterSales;
@ApiModelProperty(name = "办理费 信息列表")
@ApiModelProperty(value = "办理费 信息列表")
@Valid
private List<ProcessingFee> processingFeeList;
@ApiModelProperty(name = "使用费 信息列表")
@ApiModelProperty(value = "使用费 信息列表")
@Valid
private List<IssueProductUseFee> useFeeList;
/** 售后费 信息 */
@ApiModelProperty(name = "质保期",required = true)
@ApiModelProperty(value = "质保期",required = true)
@NotNull
private Integer warrantyPeriod;
/** 违约金 信息 */
@ApiModelProperty(name = "欠费月收比例")
@ApiModelProperty(value = "欠费月收比例")
@NotNull
private Integer monthlyRate;
/** 注销费 信息列表 */
@ApiModelProperty(name = "注销年限")
@ApiModelProperty(value = "注销年限")
private Integer cancelAgeLimit;
@ApiModelProperty(name = "注销费金额")
@ApiModelProperty(value = "注销费金额")
private Long cancelAmount;
@ApiModelProperty(name = "是否是通用秘钥设备(9901,5201,选装)",required = true)
@ApiModelProperty(value = "是否是通用秘钥设备(9901,5201,选装)",required = true)
@NotNull
private SecretKeyType deviceType;
@ApiModelProperty(name = "部中心编号")
@ApiModelProperty(value = "部中心编号")
private String centerNo;
@ApiModelProperty(name = "扣费渠道编号",required = true)
@ApiModelProperty(value = "扣费渠道编号",required = true)
@NotBlank
private String deductionChannelsId;
@ApiModelProperty(name = "车辆性质 1营运 2非营运 3营运和非营运",required = true)
@ApiModelProperty(value = "车辆性质 1营运 2非营运 3营运和非营运",required = true)
@NotNull
private Integer useCharacter;
@ApiModelProperty(name = "其他注销条件")
@ApiModelProperty(value = "其他注销条件")
private String otherCancelCondition;
@ApiModelProperty(name = "售后费用")
@ApiModelProperty(value = "售后费用")
@Valid
private List<AfterSaleFee> afterSaleFees;
@ApiModelProperty(name = "合作机构",required = true)
@ApiModelProperty(value = "合作机构",required = true)
@NotBlank
private String agencyId;
@NotNull
@ApiModelProperty(name = "true需要支付false不需要支付",required = true)
@ApiModelProperty(value = "true需要支付false不需要支付",required = true)
private Boolean needPay;
@NotNull
@IntegerConstant(values = "0,1")
@ApiModelProperty(name = "协议签署方 0、黔通 1、渠道")
@ApiModelProperty(value = "协议签署方 0、黔通 1、渠道")
private Integer signingParty;
@NotNull
@IntegerConstant(values="0,1")
@ApiModelProperty(name = "1是黔通签约0否黔通签约",required = true)
@ApiModelProperty(value = "1是黔通签约0否黔通签约",required = true)
private Integer qtSign;
@ApiModelProperty(name = "渠道签约地址")
@ApiModelProperty(value = "渠道签约地址")
private String qdSignUrl;
@ApiModelProperty(name = "渠道签约小程序appId")
@ApiModelProperty(value = "渠道签约小程序appId")
private String qdSignAppId;
@ApiModelProperty(name = "支持车籍")
@ApiModelProperty(value = "支持车籍")
private List<String> vehiclePalce;
@Override
protected void validate(ViolationValidator validator) {

+ 4
- 4
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/product/ProductDetailResponseDTO.java Visa fil

@@ -94,16 +94,16 @@ public class ProductDetailResponseDTO {
@ApiModelProperty(value = "售后费用")
private List<AfterSaleFee> afterSaleFees;

@ApiModelProperty(name = "办理费 信息列表")
@ApiModelProperty(value = "办理费 信息列表")
private List<ProcessingFee> processingFeeList;

@ApiModelProperty(name = "欠费月收比例")
@ApiModelProperty(value = "欠费月收比例")
private Integer monthlyRate;

@ApiModelProperty(value = "是否支付true是false否")
private Boolean isPay;

@ApiModelProperty(name = "协议签署方 0、黔通 1、渠道")
@ApiModelProperty(value = "协议签署方 0、黔通 1、渠道")
private Integer signingParty;

@ApiModelProperty(value = "1是黔通签约0否黔通签约")
@@ -118,7 +118,7 @@ public class ProductDetailResponseDTO {
@ApiModelProperty(value = "备注")
private String remarks;

@ApiModelProperty(name = "使用费 信息列表")
@ApiModelProperty(value = "使用费 信息列表")
private List<IssueProductUseFee> useFeeList;

}

+ 5
- 5
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/promotion/PromoteAddRequestDTO.java Visa fil

@@ -35,7 +35,7 @@ public class PromoteAddRequestDTO extends AbstractStaffBizRequestDTO {
private Integer validityFormat;
@ApiModelProperty(value = "产品有效期")
private Integer productValidity;
@ApiModelProperty(name = "发行范围")
@ApiModelProperty(value = "发行范围")
private List<List<String>> issueScope;
@ApiModelProperty(value = "渠道(可多个,逗号分割)")
@NotNull
@@ -49,16 +49,16 @@ public class PromoteAddRequestDTO extends AbstractStaffBizRequestDTO {
@ApiModelProperty(value = "使用费 信息列表")
@Valid
private List<UseFeeModel> useFeeList;
@ApiModelProperty(name = "售后费用")
@ApiModelProperty(value = "售后费用")
@Valid
private List<AfterSaleFeeModel> afterSaleFees;
@Valid
@ApiModelProperty(name = "通行费")
@ApiModelProperty(value = "通行费")
private CommonFee passFee;
@ApiModelProperty(name = "注销违约金")
@ApiModelProperty(value = "注销违约金")
@Valid
private CommonFee cancelDefault;
@ApiModelProperty(name = "通行费违约金")
@ApiModelProperty(value = "通行费违约金")
@Valid
private CommonFee passDefault;


+ 5
- 5
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/promotion/PromoteDetailResponseDTO.java Visa fil

@@ -40,7 +40,7 @@ public class PromoteDetailResponseDTO {
private Integer validityFormat;
@ApiModelProperty(value = "产品有效期")
private Integer productValidity;
@ApiModelProperty(name = "发行范围")
@ApiModelProperty(value = "发行范围")
private List<List<String>> issueScope;
@ApiModelProperty(value = "渠道(可多个,逗号分割)")
@NotNull
@@ -54,16 +54,16 @@ public class PromoteDetailResponseDTO {
@ApiModelProperty(value = "使用费 信息列表")
@Valid
private List<UseFeeModel> useFeeList;
@ApiModelProperty(name = "售后费用")
@ApiModelProperty(value = "售后费用")
@Valid
private List<AfterSaleFeeModel> afterSaleFees;
@Valid
@ApiModelProperty(name = "通行费")
@ApiModelProperty(value = "通行费")
private CommonFee passFee;
@ApiModelProperty(name = "注销违约金")
@ApiModelProperty(value = "注销违约金")
@Valid
private CommonFee cancelDefault;
@ApiModelProperty(name = "通行费违约金")
@ApiModelProperty(value = "通行费违约金")
@Valid
private CommonFee passDefault;
}

+ 3
- 3
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/promotion/PromoteExamineReqDTO.java Visa fil

@@ -12,15 +12,15 @@ import javax.validation.constraints.NotNull;
@Getter
@Setter
public class PromoteExamineReqDTO extends AbstractStaffBizRequestDTO {
@ApiModelProperty(name = "推广发行产品ID")
@ApiModelProperty(value = "推广发行产品ID")
@NotBlank
private String id;
@ApiModelProperty(name = "审核状态 0通过 1不通过")
@ApiModelProperty(value = "审核状态 0通过 1不通过")
@NotNull
@IntegerConstant(values = "0,1")
private Integer examine;

@ApiModelProperty(name = "审核原因")
@ApiModelProperty(value = "审核原因")
private String examineDes;

@Override

+ 2
- 2
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/promotion/PromoteStatusReqDTO.java Visa fil

@@ -12,10 +12,10 @@ import javax.validation.constraints.NotNull;
@Getter
@Setter
public class PromoteStatusReqDTO extends AbstractStaffBizRequestDTO {
@ApiModelProperty(name = "推广产品ID")
@ApiModelProperty(value = "推广产品ID")
@NotBlank
private String id;
@ApiModelProperty(name = "状态")
@ApiModelProperty(value = "状态")
@NotNull
private EnableStatus status;


+ 2
- 2
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/product/AfterSaleFee.java Visa fil

@@ -15,10 +15,10 @@ import javax.validation.constraints.NotNull;
@Data
public class AfterSaleFee {

@ApiModelProperty(name = "售后类型")
@ApiModelProperty(value = "售后类型")
@NotNull
private ProductAfterType productAfterType;
@ApiModelProperty(name = "金额")
@ApiModelProperty(value = "金额")
@NotNull
private Long amount;
}

+ 2
- 2
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/product/ProcessingFee.java Visa fil

@@ -15,10 +15,10 @@ import javax.validation.constraints.NotNull;
@Data
public class ProcessingFee {

@ApiModelProperty(name = "办理费类型")
@ApiModelProperty(value = "办理费类型")
@NotNull
private ProcessingFeeType processingFeeType;
@ApiModelProperty(name = "金额")
@ApiModelProperty(value = "金额")
@NotNull
private Long amount;
}

+ 3
- 3
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/repo/jpa/request/IssueProductPageRequest.java Visa fil

@@ -12,11 +12,11 @@ import lombok.Setter;
@Setter
public class IssueProductPageRequest extends JpaDateTimePageableDataRequest<IssueProduct>{

@ApiModelProperty(name = "产品名称")
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(name = "状态")
@ApiModelProperty(value = "状态")
private EnableStatus status;
@ApiModelProperty(name = "产品编号")
@ApiModelProperty(value = "产品编号")
private String releaseId;



Laddar…
Avbryt
Spara