类型5也减实物总库存 中积分该已发放状态

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

@@ -13,6 +13,7 @@ import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
 import com.liquidnet.service.feign.candy.api.FeignCandyBaseClient;
 import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
 import com.liquidnet.service.stone.dto.StoneScoreListDto;
+import com.liquidnet.service.sweet.constant.StatusConst;
 import com.liquidnet.service.sweet.dto.vo.*;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 import com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper;
@@ -170,8 +171,6 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 integralParamDe.setContent(integralActivity.getActivityTitle());
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_STONE_INTEGRAL.getKey(),
                         JsonUtils.toJson(integralParamDe));
-//                ResponseDto<String> de2111 = feignStoneIntegralClient.de2111(userId, integralActivity.getActivityNum(), integralActivity.getActivityTitle());
-//                log.info("减积分返回值情况 de2111:{}", de2111);
                 // 抽奖入库
                 String drawId = IDGenerator.nextSnowId();
                 IntegralActivityDrawVo integralActivityDrawVo = IntegralActivityDrawVo.getNew();
@@ -188,7 +187,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 integralActivityDrawVo.setCreatedAt(nowTime);
                 Integer receivingStatus = 1;
                 Integer prizeType = integralActivityPrizeVo.getPrizeType();
-                if (prizeType == 1) {// 中奖积分
+                if (prizeType == StatusConst.PRIZE_TYPE1) {// 中奖积分
                     SweetStoneIntegralParam integralParamIn = SweetStoneIntegralParam.getNew();
                     integralParamIn.setType(1);
                     integralParamIn.setUid(userId);
@@ -196,20 +195,12 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                     integralParamIn.setContent(integralActivity.getActivityTitle());
                     queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_STONE_INTEGRAL.getKey(),
                             JsonUtils.toJson(integralParamIn));
-                    /*try {
-                        // 增加积分
-                        ResponseDto<String> in2111 = feignStoneIntegralClient.in2112(userId, integralActivityPrizeVo.getPrizeTypeNum(), integralActivity.getActivityTitle());
-                        log.info("中奖加积分返回值情况 in2111:{}", in2111);
-                        // 发放状态
-                        receivingStatus = 2;
-                    } catch (Exception e) {
-                        log.error("抽奖发放积分失败 [userId:{}, num:{}]", userId, integralActivityPrizeVo.getPrizeTypeNum());
-                    }*/
+                    receivingStatus = 2;
                 }
                 integralActivityDrawVo.setReceivingStatus(receivingStatus);
                 // redis
                 redisDataUtils.setIntegralActivityDraw(integralActivityDrawVo);
-                if (prizeType == 3 || prizeType == 4) { // 中实物减实物总库存
+                if (prizeType == StatusConst.PRIZE_TYPE3 || prizeType == StatusConst.PRIZE_TYPE4 || prizeType == StatusConst.PRIZE_TYPE5) { // 中实物减实物总库存
                     redisDataUtils.decrIntegralActivityTotalPrizeNum(integralActivityId);
                 }
                 // mongo