数字藏品预约活动-不登陆

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -64,7 +64,7 @@ public class SweetConstant {
     // 2021草莓音乐节海报活动活动
     public static final String REDIS_KEY_SWEET_STRAWBERRY_POSTER_CLICK = "sweet:strawberryPoster:click:openId:";
     // 数字藏品预约活动
-    public final static String REDIS_KEY_SWEET_COLLECTION_RESERVATION_USER = "sweet:collectionReservation:unionId:";
+//    public final static String REDIS_KEY_SWEET_COLLECTION_RESERVATION_USER = "sweet:collectionReservation:unionId:";
     // 活动结束时间
     public final static String REDIS_KEY_SWEET_ACTIVITY_END_TIME = "sweet:activity:endTime:type:";
 

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetCollectionReservationService.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.sweet.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.entity.SweetCollectionReservation;
-import com.liquidnet.service.sweet.vo.SweetCollectionReservationVo;
 
 /**
  * <p>
@@ -15,9 +14,9 @@ import com.liquidnet.service.sweet.vo.SweetCollectionReservationVo;
  */
 public interface ISweetCollectionReservationService extends IService<SweetCollectionReservation> {
 
-    ResponseDto<SweetCollectionReservationVo> info(String unionId);
+    ResponseDto<Integer> info();
 
     ResponseDto<Boolean> time(String endTime);
 
-    ResponseDto<Boolean> create(String unionId, String nickname, String mobile, String mailbox, String enterpriseName, String title);
+    ResponseDto<Boolean> create(String nickname, String mobile, String mailbox, String enterpriseName, String title);
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetCollectionReservationController.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.sweet.controller;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.service.ISweetCollectionReservationService;
-import com.liquidnet.service.sweet.vo.SweetCollectionReservationVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -28,12 +27,9 @@ public class SweetCollectionReservationController {
     private ISweetCollectionReservationService reservationService;
 
     @GetMapping("info")
-    @ApiOperation("预约信息和活动状态")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", dataType = "String", name = "unionId", value = "微信unionId", required = true)
-    })
-    public ResponseDto<SweetCollectionReservationVo> info(@RequestParam() String unionId) {
-        return reservationService.info(unionId);
+    @ApiOperation("活动状态")
+    public ResponseDto<Integer> info() {
+        return reservationService.info();
     }
 
     @PostMapping("time")
@@ -50,7 +46,6 @@ public class SweetCollectionReservationController {
     @PostMapping("create")
     @ApiOperation("添加预约记录")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", dataType = "String", name = "unionId", value = "微信unionId", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "nickname", value = "昵称", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "mobile", value = "手机号", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "mailbox", value = "邮箱", required = true),
@@ -58,14 +53,13 @@ public class SweetCollectionReservationController {
             @ApiImplicitParam(type = "form", dataType = "String", name = "title", value = "职务")
     })
     public ResponseDto<Boolean> create(
-            @RequestParam() String unionId,
             @RequestParam() String nickname,
             @RequestParam() String mobile,
             @RequestParam() String mailbox,
             @RequestParam() String enterpriseName,
             @RequestParam(defaultValue = "") String title
     ) {
-        return reservationService.create(unionId, nickname, mobile, mailbox, enterpriseName, title);
+        return reservationService.create(nickname, mobile, mailbox, enterpriseName, title);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetCollectionReservationServiceImpl.java

@@ -11,7 +11,6 @@ import com.liquidnet.service.sweet.mapper.SweetCollectionReservationMapper;
 import com.liquidnet.service.sweet.service.ISweetCollectionReservationService;
 import com.liquidnet.service.sweet.utils.QueueUtils;
 import com.liquidnet.service.sweet.utils.RedisActivityUtils;
-import com.liquidnet.service.sweet.vo.SweetCollectionReservationVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,19 +34,14 @@ public class SweetCollectionReservationServiceImpl extends ServiceImpl<SweetColl
     QueueUtils queueUtils;
 
     @Override
-    public ResponseDto<SweetCollectionReservationVo> info(String unionId) {
-        SweetCollectionReservationVo reserved = activityUtils.getSweetCollectionReserved(unionId);
+    public ResponseDto<Integer> info() {
         LocalDateTime endTime = activityUtils.getEndTime("reservation");
         LocalDateTime nowTime = LocalDateTime.now();
-        if (null == reserved) {
-            reserved = SweetCollectionReservationVo.getNew();
-        }
         if (null == endTime || nowTime.isAfter(endTime)) {
-            reserved.setStatus(2);
+            return ResponseDto.success(2);
         } else {
-            reserved.setStatus(1);
+            return ResponseDto.success(1);
         }
-        return ResponseDto.success(reserved);
     }
 
     @Override
@@ -57,12 +51,11 @@ public class SweetCollectionReservationServiceImpl extends ServiceImpl<SweetColl
     }
 
     @Override
-    public ResponseDto<Boolean> create(String unionId, String nickname, String mobile, String mailbox, String enterpriseName, String title) {
+    public ResponseDto<Boolean> create(String nickname, String mobile, String mailbox, String enterpriseName, String title) {
         SweetCollectionReservation reservation = SweetCollectionReservation.getNew();
         String id = IDGenerator.nextSnowId();
         LocalDateTime nowTime = LocalDateTime.now();
         reservation.setReservationId(id);
-        reservation.setUnionId(unionId);
         reservation.setNickname(nickname);
         reservation.setMobile(mobile);
         reservation.setMailbox(mailbox);
@@ -76,14 +69,11 @@ public class SweetCollectionReservationServiceImpl extends ServiceImpl<SweetColl
         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
         sqls.add(SqlMapping.get("sweet_collection_reservation.insert"));
         sqlsDataA.add(new Object[]{
-                id, unionId, nickname, mobile, mailbox, enterpriseName, title, nowTime, nowTime
+                id, nickname, mobile, mailbox, enterpriseName, title, nowTime, nowTime
         });
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_ANSWER_INSERT.getKey(),
                 SqlMapping.gets(sqls, sqlsDataA));
 
-        SweetCollectionReservationVo reservationVo = SweetCollectionReservationVo.getNew().copy(reservation);
-        activityUtils.setSweetCollectionReserved(reservationVo);
-
         return ResponseDto.success();
     }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisActivityUtils.java

 package com.liquidnet.service.sweet.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.sweet.constant.SweetConstant;
-import com.liquidnet.service.sweet.vo.SweetCollectionReservationVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -18,7 +16,7 @@ public class RedisActivityUtils {
     @Autowired
     private RedisUtil redisUtil;
 
-    public void setSweetCollectionReserved(SweetCollectionReservationVo reservationVo) {
+    /*public void setSweetCollectionReserved(SweetCollectionReservationVo reservationVo) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_COLLECTION_RESERVATION_USER.concat(reservationVo.getUnionId());
         redisUtil.set(redisKey, reservationVo);
     }
@@ -31,7 +29,7 @@ public class RedisActivityUtils {
         } else {
             return (SweetCollectionReservationVo) obj;
         }
-    }
+    }*/
 
     public void setEndTime(String type, String endTime) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_ACTIVITY_END_TIME.concat(type);

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -57,7 +57,7 @@ sweet_wechat_maodeng.insert=INSERT INTO sweet_wechat_maodeng(mao_id,user_id,text
 sweet_wechat_maodeng.text.update=UPDATE sweet_wechat_maodeng SET text_msg=? WHERE user_id=? AND mao_id=?
 sweet_wechat_maodeng.img.update=UPDATE sweet_wechat_maodeng SET img_url=? WHERE user_id=? AND mao_id=?
 # --------------------------数字藏品预约活动--------------------------
-sweet_collection_reservation.insert=INSERT INTO sweet_collection_reservation (reservation_id,union_id,nickname,mobile,mailbox,enterprise_name,title,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?)
+sweet_collection_reservation.insert=INSERT INTO sweet_collection_reservation (reservation_id,nickname,mobile,mailbox,enterprise_name,title,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?)