修改积分商品订单详情

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

@@ -50,7 +50,13 @@ public class StoneScoreItemVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 8, value = "注意事项")
     private String notice;
 
-    @ApiModelProperty(position = 9, value = "状态[-999-全部|-1-删除|0-未上架|1-已上架|2-定时上架|7-已下架|8-售罄]")
+    @ApiModelProperty(position = 8, value = "积分状态[1-积分充足|2-积分不足]")
+    private Integer scoreStatus;
+
+    @ApiModelProperty(position = 8, value = "限购状态[1-可购买|2-已限购]")
+    private Integer limitStatus;
+
+    @ApiModelProperty(position = 9, value = "状态[-999-全部|-1-删除|0-未上架|1-已上架|2-定时上架|7-已下架|8-售罄|9-即将售罄]")
     private Integer status;
 
     private static final StoneScoreItemVo obj = new StoneScoreItemVo();
@@ -63,7 +69,7 @@ public class StoneScoreItemVo implements Serializable, Cloneable {
         }
     }
 
-    public StoneScoreItemVo copy(StoneScoreItems source) {
+    public StoneScoreItemVo copy(StoneScoreItems source, Integer scoreStatus, Integer limitStatus) {
         if (null == source) return this;
         this.setItemId(source.getItemId());
         this.setTargetTitle(source.getTargetTitle());
@@ -74,6 +80,8 @@ public class StoneScoreItemVo implements Serializable, Cloneable {
         this.setLimitCount(source.getLimitCount());
         this.setDetails(source.getDetails());
         this.setNotice(source.getNotice());
+        this.setScoreStatus(scoreStatus);
+        this.setLimitStatus(limitStatus);
         LocalDateTime now = LocalDateTime.now();
         if (source.getStatus() == 2) {
             if (now.isAfter(source.getStartTime())) {//未上架
@@ -83,7 +91,7 @@ public class StoneScoreItemVo implements Serializable, Cloneable {
             } else {
                 this.setStatus(1);//上架中
             }
-        }else{
+        } 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

 package com.liquidnet.service.stone.service.impl;
 
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.stone.entity.StoneScoreItems;
@@ -71,11 +72,34 @@ public class StoneScoreItemsServiceImpl implements IStoneScoreItemsService {
 
     @Override
     public ResponseDto<StoneScoreItemVo> itemDetails(String itemId) {
+        String uid = CurrentUtil.getCurrentUid();
         StoneScoreItems data = redisUtils.getItemData(itemId);
-        if(redisUtils.getStoneGeneralSurplus(itemId)<=0){
+        int restCount = redisUtils.getStoneGeneralSurplus(itemId);
+        int restScore = redisUtils.getUserScoreRest(uid);
+        int singleScore = data.getScore().intValue();
+        int buyCount = redisUtils.getItemLimit(uid, itemId);
+        int limitCount = data.getLimitCount();
+        int scoreStatus = 2;
+        int limitStatus = 2;
+        //判断库存
+        if (restCount <= 0) {
             data.setStatus(8);
+        } else if (restCount <= 50) {
+            data.setStatus(9);
         }
-        StoneScoreItemVo vo = StoneScoreItemVo.getNew().copy(data);
+        //判断积分是否够
+        if (singleScore > restScore) {
+            scoreStatus = 2;
+        } else {
+            scoreStatus = 1;
+        }
+        //判断积分是否够
+        if (buyCount >= limitCount) {
+            limitStatus = 2;
+        } else {
+            limitStatus = 1;
+        }
+        StoneScoreItemVo vo = StoneScoreItemVo.getNew().copy(data,scoreStatus,limitStatus);
         return ResponseDto.success(vo);
     }
 }

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

@@ -57,7 +57,7 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
         if (stoneRedisUtils.getStoneGeneralSurplus(itemId) <= 0) {
             return ResponseDto.failure("该商品库存不足");
         }
-        StoneScoreItemVo vo = StoneScoreItemVo.getNew().copy(data);
+        StoneScoreItemVo vo = StoneScoreItemVo.getNew().copy(data,1,1);
         if(vo.getStatus()==2){
             return ResponseDto.failure("账号被冻结");
         }