diff --git a/cms-modules/cms-order/cms-order-api/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsPromotionGiftVo.java b/cms-modules/cms-order/cms-order-api/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsPromotionGiftVo.java new file mode 100644 index 0000000..31709da --- /dev/null +++ b/cms-modules/cms-order/cms-order-api/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsPromotionGiftVo.java @@ -0,0 +1,79 @@ +package com.qs.serve.modules.oms.entity.vo; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.qs.serve.mbp.handler.SplitStringTypeHandler; +import lombok.Data; +import org.apache.ibatis.type.JdbcType; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 搭赠方案 实体类 + * @author YenHex + * @since 2025-06-05 + */ +@Data +public class OmsPromotionGiftVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 通案标题 */ + @NotBlank(message = "通案标题不能为空") + @Length(max = 255,message = "通案标题长度不能超过255字") + private String giftTitle; + + /** 通案编码 */ + @NotBlank(message = "通案编码不能为空") + @Length(max = 64,message = "通案编码长度不能超过64字") + private String giftCode; + + /** 通案状态:状态:0-暂存;1-审批中;2-完成;3-驳回/退回;4-中止/拒绝;5-作废 */ + @NotNull(message = "通案状态:状态:0-暂存;1-审批中;2-完成;3-驳回;4-中止;5-作废不能为空") + private Integer giftStatus; + + /** 生效开始时间 */ + @NotNull(message = "生效开始时间不能为空") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate effectStartDate; + + /** 生效结束时间 */ + @NotNull(message = "生效结束时间不能为空") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate effectEndDate; + + /** 允许重复使用 */ + @NotNull(message = "允许重复使用不能为空") + private Integer reuseFlag; + + /** 搭赠说明 */ + @Length(max = 655,message = "搭赠说明长度不能超过655字") + private String explainText; + + /** 附件ID */ + @Length(max = 1024,message = "附件ID长度不能超过1024字") + @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) + private String[] attachIds; + + /** 备注 */ + @Length(max = 600,message = "备注长度不能超过600字") + private String remark; + + + +} + diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsPromotionGiftService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsPromotionGiftService.java index 2391c64..585bf24 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsPromotionGiftService.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsPromotionGiftService.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.oms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.modules.oms.entity.OmsPromotionGift; import com.qs.serve.modules.oms.entity.bo.OmsPromotionGiftBo; +import com.qs.serve.modules.oms.entity.vo.OmsPromotionGiftVo; /** * 搭赠方案 服务接口 @@ -11,6 +12,8 @@ import com.qs.serve.modules.oms.entity.bo.OmsPromotionGiftBo; */ public interface OmsPromotionGiftService extends IService { + OmsPromotionGiftVo getDetailVo(String id); + /** * 修改搭赠方案 * @param param diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsPromotionGiftServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsPromotionGiftServiceImpl.java index d0301e3..f3f13b9 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsPromotionGiftServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsPromotionGiftServiceImpl.java @@ -14,6 +14,7 @@ import com.qs.serve.modules.goods.entity.dto.TbsCenterDto; import com.qs.serve.modules.goods.service.GoodsApplicationService; import com.qs.serve.modules.oms.entity.*; import com.qs.serve.modules.oms.entity.bo.*; +import com.qs.serve.modules.oms.entity.vo.OmsPromotionGiftVo; import com.qs.serve.modules.oms.mapper.*; import com.qs.serve.modules.oms.service.OmsPromotionGiftService; import com.qs.serve.modules.tbs.service.TbsCenterDtoService; @@ -47,6 +48,11 @@ public class OmsPromotionGiftServiceImpl extends ServiceImpl