提交

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftGoodsSkuInfoVo.java

@@ -86,6 +86,10 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
     private BigInteger aboutPeople;
     @ApiModelProperty(position = 64, value = "前三预约头像")
     private List<String> aboutAvatarList;
+    @ApiModelProperty("预约类型（1：预约提醒，2：预约获得购买资格）")
+    private Integer type;
+    @ApiModelProperty("设置预约人数")
+    private Integer peopleType;
 
     private static final GoblinNftGoodsSkuInfoVo obj = new GoblinNftGoodsSkuInfoVo();
 
@@ -122,6 +126,8 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
             if (anticipateValueVo.getAboutEndDate() != null) {
                 this.setAboutStartDate(DateUtil.Formatter.yyyyMMddHHmmss.format(anticipateValueVo.getAboutStartDate()));
             }
+            this.setType(anticipateValueVo.getType());
+            this.setPeopleType(anticipateValueVo.getPeopleType());
             this.setState(anticipateValueVo.getState());
             this.setRule(anticipateValueVo.getRule());
             this.setAboutPeople(anticipateValueVo.getAboutPeople());

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinGoodsAnticipateMgServiceImpl.java

@@ -63,7 +63,7 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
                 if (goblinRedisUtils.getSkuId(vo.getSkuId())) {
                     return ResponseDto.failure(vo.getSkuName().concat("该商品已创建预约！"));
                 }
-               if (vo.getAboutStartDate().isAfter(vo.getAboutEndDate())){
+                if (vo.getAboutStartDate().isAfter(vo.getAboutEndDate())) {
                     return ResponseDto.failure(vo.getSkuName().concat("该商品预约时间在结束时间之后，不可创建！"));
                 }
             }
@@ -92,7 +92,7 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
             //mongodb新增
             goblinMongoUtils.setGoblinGoodsAnticipateVo(goodsAnticipateVo);
 
-            addAnticipateValues(antId, goodsAnticipateAddParam.getRule(), goodsAnticipateAddParam.getList(),goodsAnticipateAddParam.getPeople(),goodsAnticipateAddParam.getType());
+            addAnticipateValues(antId, goodsAnticipateAddParam.getRule(), goodsAnticipateAddParam.getList(), goodsAnticipateAddParam.getPeople(), goodsAnticipateAddParam.getType());
 
             //返回预约id
             return ResponseDto.success(antId);
@@ -100,7 +100,7 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
         return ResponseDto.failure("参数有误");
     }
 
-    public void addAnticipateValues(String antId, String rule, List<GoblinGoodsAnticipateValueAddParam> list,Integer people,Integer type) {
+    public void addAnticipateValues(String antId, String rule, List<GoblinGoodsAnticipateValueAddParam> list, Integer people, Integer type) {
         //获取创建者uid
         String uid = CurrentUtil.getCurrentUid();
         if (list != null && list.size() > 0) {
@@ -158,7 +158,7 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
     public ResponseDto<PageInfo<GoblinGoodsAnticipateValueVo>> list(GoblinGoodsAnticipateValueParam goodsAnticipateValueParam) {
         PageInfo<GoblinGoodsAnticipateValueVo> pageInfo = new PageInfo<>();
         String uid = CurrentUtil.getCurrentUid();
-        HashMap<String, Object> map = goblinMongoUtils.getGoblinGoodsAnticipateValueVos(goodsAnticipateValueParam,uid);
+        HashMap<String, Object> map = goblinMongoUtils.getGoblinGoodsAnticipateValueVos(goodsAnticipateValueParam, uid);
         List<GoblinGoodsAnticipateValueVo> data = (List<GoblinGoodsAnticipateValueVo>) map.get("data");
         for (GoblinGoodsAnticipateValueVo anticipateValueVo : data) {
             //查询真实预约人数
@@ -166,7 +166,7 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
             autIdPeople = autIdPeople != null ? autIdPeople : BigInteger.valueOf(0);
             //预约人数   读取缓存的预约人数
             GoblinGoodsAnticipateValueVo aboutPeople = goblinRedisUtils.getValueBySkuId(anticipateValueVo.getSkuId());
-            anticipateValueVo.setAboutPeople(aboutPeople!=null?aboutPeople.getAboutPeople():BigInteger.valueOf(0));
+            anticipateValueVo.setAboutPeople(aboutPeople != null ? aboutPeople.getAboutPeople() : BigInteger.valueOf(0));
             //实际预约人数
             anticipateValueVo.setActualPeople(autIdPeople);
             //设置预约状态
@@ -202,7 +202,7 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
         //更具skuId查询
         GoblinGoodsAnticipateValueVo goodsAnticipateValueVo = goblinRedisUtils.getValueBySkuId(skuId);
         String uid = CurrentUtil.getCurrentUid();
-        if (!goodsAnticipateValueVo.getUid().equals(uid)){
+        if (!goodsAnticipateValueVo.getUid().equals(uid)) {
             return ResponseDto.failure("无权限删除");
         }
         goodsAnticipateValueVo.setState(GoblinAnticipateUtils.setState(goodsAnticipateValueVo.getAboutStartDate(), goodsAnticipateValueVo.getAboutEndDate()));
@@ -236,11 +236,13 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
             valueVo.setAboutEndDate(null);
             valueVo.setAboutStartDate(null);
             valueVo.setAboutPeople(BigInteger.ZERO);
+            valueVo.setType(null);
+            valueVo.setPeopleType(null);
             valueVo.setRule("");
         }
-        if(hasHead==1){
+        if (hasHead == 1) {
             valueVo.setAboutAvatarList(goblinRedisUtils.getUserAvatar(skuId));
-        }else{
+        } else {
             valueVo.setAboutAvatarList(CollectionUtil.linkedListString());
         }
         return valueVo;