记得上下班打卡 | git大法好,push需谨慎

Commit 64d18bcf authored by 胡佳晨's avatar 胡佳晨

提交

parent 90055ec7
...@@ -59,6 +59,8 @@ public class AnticipateValueVo implements Cloneable { ...@@ -59,6 +59,8 @@ public class AnticipateValueVo implements Cloneable {
this.setAboutStartDate(source.getAboutStartDate()); this.setAboutStartDate(source.getAboutStartDate());
this.setAboutEndDate(source.getAboutEndDate()); this.setAboutEndDate(source.getAboutEndDate());
this.setState(source.getState()); this.setState(source.getState());
this.setType(source.getType());
this.setPeopleType(source.getPeopleType());
return this; return this;
} }
......
...@@ -18,7 +18,7 @@ import java.time.LocalDateTime; ...@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
* @since 2022-04-08 * @since 2022-04-08
*/ */
@Data @Data
public class GoblinGoodsAnticipateValueVo implements Cloneable{ public class GoblinGoodsAnticipateValueVo implements Cloneable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -97,6 +97,10 @@ public class GoblinGoodsAnticipateValueVo implements Cloneable{ ...@@ -97,6 +97,10 @@ public class GoblinGoodsAnticipateValueVo implements Cloneable{
*/ */
@ApiModelProperty(value = "删除(0:未删除1:已删除)") @ApiModelProperty(value = "删除(0:未删除1:已删除)")
private Integer delTag; private Integer delTag;
@ApiModelProperty("预约类型(1:预约提醒,2:预约获得购买资格)")
private Integer type;
@ApiModelProperty("设置预约人数")
private Integer peopleType;
private static final GoblinGoodsAnticipateValueVo obj = new GoblinGoodsAnticipateValueVo(); private static final GoblinGoodsAnticipateValueVo obj = new GoblinGoodsAnticipateValueVo();
...@@ -119,5 +123,4 @@ public class GoblinGoodsAnticipateValueVo implements Cloneable{ ...@@ -119,5 +123,4 @@ public class GoblinGoodsAnticipateValueVo implements Cloneable{
} }
} }
...@@ -226,8 +226,8 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat ...@@ -226,8 +226,8 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
GoblinGoodsAnticipateValueVo anticipateValueVo = goblinRedisUtils.getValueBySkuId(skuId); GoblinGoodsAnticipateValueVo anticipateValueVo = goblinRedisUtils.getValueBySkuId(skuId);
AnticipateValueVo valueVo = AnticipateValueVo.getNew(); AnticipateValueVo valueVo = AnticipateValueVo.getNew();
if (anticipateValueVo != null) { if (anticipateValueVo != null) {
valueVo = valueVo.copy(anticipateValueVo);
GoblinGoodsAnticipateHelp help = goblinRedisUtils.getSharePeopleBySkuId(skuId); GoblinGoodsAnticipateHelp help = goblinRedisUtils.getSharePeopleBySkuId(skuId);
valueVo = valueVo.copy(anticipateValueVo);
valueVo.setType(help.getType()); valueVo.setType(help.getType());
valueVo.setPeopleType(help.getPeople()); valueVo.setPeopleType(help.getPeople());
valueVo.setState(GoblinAnticipateUtils.setState(valueVo.getAboutStartDate(), valueVo.getAboutEndDate())); valueVo.setState(GoblinAnticipateUtils.setState(valueVo.getAboutStartDate(), valueVo.getAboutEndDate()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment