暂时提交

liquidnet-bus-api/liquidnet-service-stone-api/src/main/java/com/liquidnet/service/stone/vo/StoneItemListVo.java

@@ -81,11 +81,6 @@ public class StoneItemListVo implements Serializable, Cloneable {
                 this.setStatus(7);
             } else {
                 this.setStatus(1);//上架中
-//                if (source.getGeneralSurplus()<=0) {
-//                    this.setStatus(8);//售罄
-//                } else {
-//                    this.setStatus(1);//上架中
-//                }
             }
         }else{
             this.setStatus(source.getStatus());

liquidnet-bus-api/liquidnet-service-stone-api/src/main/java/com/liquidnet/service/stone/vo/StoneScoreItemVo.java

 package com.liquidnet.service.stone.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.stone.entity.StoneScoreItems;
-import com.liquidnet.service.stone.entity.StoneScoreLogs;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -79,7 +74,18 @@ public class StoneScoreItemVo implements Serializable, Cloneable {
         this.setLimitCount(source.getLimitCount());
         this.setDetails(source.getDetails());
         this.setNotice(source.getNotice());
-        this.setStatus(source.getStatus());
+        LocalDateTime now = LocalDateTime.now();
+        if (source.getStatus() == 2) {
+            if (now.isAfter(source.getStartTime())) {//未上架
+                this.setStatus(2);
+            } else if (now.isBefore(source.getEndTime())) {//已下架
+                this.setStatus(7);
+            } else {
+                this.setStatus(1);//上架中
+            }
+        }else{
+            this.setStatus(source.getStatus());
+        }
         return this;
     }
 }

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/service/impl/StoneScoreItemsServiceImpl.java

@@ -57,7 +57,6 @@ public class StoneScoreItemsServiceImpl implements IStoneScoreItemsService {
         List<StoneItemListVo> returnVoList = ObjectUtils.getStoneItemListVoArrayList();
         for (int i = 0; i < voList.size(); i++) {
             StoneScoreItems vo = voList.get(i);
-//            vo.setGeneralSurplus(redisUtils.getStoneGeneralSurplus(vo.getItemId()));
             StoneItemListVo returnVo = StoneItemListVo.getNew().copy(vo);
             returnVoList.add(returnVo);
         }

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/service/impl/StoneScoreOrderServiceImpl.java

@@ -2,9 +2,13 @@ package com.liquidnet.service.stone.service.impl;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.stone.entity.StoneScoreItems;
 import com.liquidnet.service.stone.service.IStoneScoreOrderService;
+import com.liquidnet.service.stone.util.StoneRedisUtils;
 import com.liquidnet.service.stone.vo.StoneItemListVo;
 import com.liquidnet.service.stone.vo.StoneOrderListVo;
+import com.liquidnet.service.stone.vo.StoneScoreItemVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,8 +24,27 @@ import java.util.List;
 @Service
 public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
 
+    @Autowired
+    StoneRedisUtils stoneRedisUtils;
+
     @Override
     public ResponseDto<String> order(String itemId, Integer number) {
+        //判断状态 库存
+        StoneScoreItems data = stoneRedisUtils.getItemData(itemId);
+        if(data==null){
+            return ResponseDto.failure("参数异常");
+        }
+        if(stoneRedisUtils.getStoneGeneralSurplus(itemId)<=0){
+            return ResponseDto.failure("该商品库存不足");
+        }
+        StoneScoreItemVo vo = StoneScoreItemVo.getNew().copy(data);
+        if(vo.getStatus()!=1){
+            return ResponseDto.failure("该商品不可下单");
+        }
+
+        //获取积分
+        //获取限购
+        //下单
         return null;
     }