提交 代码 消费和做任务接口

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

@@ -56,7 +56,10 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
             return ResponseDto.failure("该商品库存不足");
         }
         StoneScoreItemVo vo = StoneScoreItemVo.getNew().copy(data);
-        if (vo.getStatus() != 1) {
+        if(vo.getStatus()==2){
+            return ResponseDto.failure("账号被冻结");
+        }
+        if (data.getStatus() != 1) {
             return ResponseDto.failure("该商品不可下单");
         }
         //获取积分

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

@@ -65,7 +65,11 @@ public class StoneScoreUserServiceImpl implements IStoneScoreUserService {
             vo.setMobile(userVo.getMobile());
             vo.setNickName(userVo.getNickname());
             vo.setScoreAll(BigDecimal.valueOf(use + rest));
-            vo.setScoreRest(BigDecimal.valueOf(rest));
+            if (vo.getStatus() == 2) {
+                vo.setScoreRest(BigDecimal.ZERO);
+            } else {
+                vo.setScoreRest(BigDecimal.valueOf(rest));
+            }
             vo.setScoreUse(BigDecimal.valueOf(use));
             vo.setStatus(userTaskVo.getStatus());
             vo.setSignIn(0);