Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinGoodsAnticipateService.java

 package com.liquidnet.service.goblin.service;
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateAddParam;
-import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateUpdateParam;
-import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateValueAddParam;
-import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateValueParam;
-import com.liquidnet.service.goblin.dto.manage.vo.AnticipateValueVo;
-import com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinGoodsAnticipateVo;
 
-import java.math.BigInteger;
-import java.util.List;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinGoodsAnticipateController.java

@@ -36,7 +36,7 @@ public class GoblinGoodsAnticipateController {
         return goblinGoodsAnticipateService.userAbout(skuId, uid, phone);
     }
 
-    @ApiOperation("根据skuid和uid查询")
+    @ApiOperation("根据skuId和uid查询")
     @GetMapping("/selectAnticipateBySkuIdAndUid")
     public ResponseDto<Boolean> selectAnticipate(@RequestParam(name = "skuId") String skuId,@RequestParam(name = "uid") String uid){
         return goblinGoodsAnticipateService.selectAnticipate(skuId,uid);

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

@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigInteger;
-import java.util.List;
 
 /**
  * <p>

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

@@ -92,18 +92,18 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
         return ResponseDto.success(goblinRedisUtils.getUserAboutAut(skuId, uid) != null) ;
     }
 
-    private Integer setState(LocalDateTime StartDate, LocalDateTime EndDate) {
+    private Integer setState(LocalDateTime startDate, LocalDateTime endDate) {
 
         LocalDateTime now = LocalDateTime.now();
-        if (StartDate.isAfter(now)) {
+        if (startDate.isAfter(now)) {
             //未开始  0
             return 0;
         }
-        if (StartDate.isBefore(now) && EndDate.isAfter(now)) {
+        if (startDate.isBefore(now) && endDate.isAfter(now)) {
             //预约中 1
             return 1;
         }
-        if (EndDate.isBefore(now)) {
+        if (endDate.isBefore(now)) {
             //已结束 2
             return 2;
         }

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

@@ -11,7 +11,6 @@ import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateValueAddPara
 import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateValueParam;
 import com.liquidnet.service.goblin.dto.manage.vo.AnticipateValueVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinGoodAnticipateUserVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsAnticipateVo;
 import com.liquidnet.service.goblin.service.manage.IGoblinGoodsAnticipateMgService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;