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

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

@@ -3,6 +3,7 @@ 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>
@@ -14,7 +15,7 @@ import com.liquidnet.service.sweet.entity.SweetCollectionReservation;
  */
 public interface ISweetCollectionReservationService extends IService<SweetCollectionReservation> {
 
-    ResponseDto<Integer> info();
+    ResponseDto<SweetCollectionReservationVo> info();
 
     ResponseDto<Boolean> time(String endTime);
 

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

 package com.liquidnet.service.sweet.vo;
 
-import com.liquidnet.service.sweet.entity.SweetCollectionReservation;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 @Data
-public class SweetCollectionReservationVo implements Serializable, Cloneable {
+public class SweetCollectionReservationVo implements Serializable {
 
     private static final long serialVersionUID = -6689305045906446522L;
 
-    @ApiModelProperty("reservation_id")
-    private String reservationId;
-
-    @ApiModelProperty("union_id")
-    private String unionId;
-
-    @ApiModelProperty("称呼")
-    private String nickname;
-
-    @ApiModelProperty("手机号")
-    private String mobile;
-
-    @ApiModelProperty("邮箱")
-    private String mailbox;
-
-    @ApiModelProperty("企业名称")
-    private String enterpriseName;
-
-    @ApiModelProperty("职务")
-    private String title;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createdAt;
-
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updatedAt;
-
     @ApiModelProperty("活动状态 1正常 2已结束")
     private Integer status;
 
@@ -51,18 +22,4 @@ public class SweetCollectionReservationVo implements Serializable, Cloneable {
         }
     }
 
-    public SweetCollectionReservationVo copy(SweetCollectionReservation source) {
-        if (null == source) return this;
-        this.setReservationId(source.getReservationId());
-        this.setUnionId(source.getUnionId());
-        this.setNickname(source.getNickname());
-        this.setMobile(source.getMobile());
-        this.setMailbox(source.getMailbox());
-        this.setEnterpriseName(source.getEnterpriseName());
-        this.setTitle(source.getTitle());
-        this.setCreatedAt(source.getCreatedAt());
-        this.setUpdatedAt(source.getUpdatedAt());
-        return this;
-    }
-
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetCollectionReservation.java

@@ -30,11 +30,6 @@ public class SweetCollectionReservation implements Serializable, Cloneable {
      */
     private String reservationId;
 
-    /**
-     * union_id
-     */
-    private String unionId;
-
     /**
      * 称呼
      */

liquidnet-bus-service/liquidnet-service-sweet/docu/db_collection_reservation_118.sql

@@ -3,17 +3,16 @@ drop TABLE if exists `sweet_collection_reservation`;
 CREATE TABLE `sweet_collection_reservation`
 (
     `mid`             bigint unsigned NOT NULL AUTO_INCREMENT,
-    `reservation_id`  varchar(255)    NOT NULL DEFAULT '' COMMENT 'reservation_id',
-    `union_id`        varchar(255)    NOT NULL DEFAULT '' COMMENT 'union_id',
-    `nickname`        varchar(50)     NOT NULL DEFAULT '' COMMENT '称呼',
-    `mobile`          varchar(11)     NOT NULL DEFAULT '' COMMENT '手机号',
-    `mailbox`         varchar(255)    NOT NULL DEFAULT '' COMMENT '邮箱',
-    `enterprise_name` varchar(255)    NOT NULL DEFAULT '' COMMENT '企业名称',
-    `title`           varchar(255)    NOT NULL DEFAULT '' COMMENT '职务',
-    `created_at`      datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`      datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `reservation_id`  varchar(255) NOT NULL DEFAULT '' COMMENT 'reservation_id',
+    `nickname`        varchar(50)  NOT NULL DEFAULT '' COMMENT '称呼',
+    `mobile`          varchar(11)  NOT NULL DEFAULT '' COMMENT '手机号',
+    `mailbox`         varchar(255) NOT NULL DEFAULT '' COMMENT '邮箱',
+    `enterprise_name` varchar(255) NOT NULL DEFAULT '' COMMENT '企业名称',
+    `title`           varchar(255) NOT NULL DEFAULT '' COMMENT '职务',
+    `created_at`      datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`      datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),
-    KEY `sweet_reservation_id` (`reservation_id`)
+    KEY               `sweet_reservation_id` (`reservation_id`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET utf8mb4
   COLLATE utf8mb4_unicode_ci

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

@@ -3,6 +3,7 @@ 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,7 +29,7 @@ public class SweetCollectionReservationController {
 
     @GetMapping("info")
     @ApiOperation("活动状态")
-    public ResponseDto<Integer> info() {
+    public ResponseDto<SweetCollectionReservationVo> info() {
         return reservationService.info();
     }
 

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

@@ -11,6 +11,7 @@ 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;
 
@@ -34,14 +35,16 @@ public class SweetCollectionReservationServiceImpl extends ServiceImpl<SweetColl
     QueueUtils queueUtils;
 
     @Override
-    public ResponseDto<Integer> info() {
+    public ResponseDto<SweetCollectionReservationVo> info() {
         LocalDateTime endTime = activityUtils.getEndTime("reservation");
         LocalDateTime nowTime = LocalDateTime.now();
+        SweetCollectionReservationVo reservationVo = SweetCollectionReservationVo.getNew();
         if (null == endTime || nowTime.isAfter(endTime)) {
-            return ResponseDto.success(2);
+            reservationVo.setStatus(2);
         } else {
-            return ResponseDto.success(1);
+            reservationVo.setStatus(1);
         }
+        return ResponseDto.success(reservationVo);
     }
 
     @Override