抽奖完善 优化

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

@@ -126,12 +126,9 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                             activityPrizeVoArrayList.add(info);
                         }
                     }
-                    /*if (CollectionUtils.isEmpty(activityPrizeVoArrayList)) {
-                        return ResponseDto.failure("活动太火爆了，奖品已经没有库存啦～");
-                    }*/
                 }
 
-                if (!lotteryDraw || CollectionUtils.isEmpty(activityPrizeVoArrayList)) {// 没中实物 或者 实物库存没了中券
+                if (!lotteryDraw || CollectionUtils.isEmpty(activityPrizeVoArrayList)) {// 没中实物、实物库存没了、是黑名单中用户 中券
                     List<IntegralActivityPrizeVo> prizeList = integralActivity.getPrizeList1();
                     for (IntegralActivityPrizeVo info : prizeList) {
                         int integralActivityPrizeNum = redisDataUtils.getIntegralActivityPrizeNum(integralActivityId, info.getPrizeId());
@@ -171,27 +168,27 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 integralActivityDrawVo.setPrizeTitle(integralActivityPrizeVo.getPrizeTitle());
                 integralActivityDrawVo.setPrizeType(integralActivityPrizeVo.getPrizeType());
                 integralActivityDrawVo.setPrizeTypeNum(integralActivityPrizeVo.getPrizeTypeNum());
-//                integralActivityDrawVo.setRelationId(sweetIntegralActivityPrize.getRelationId());
                 integralActivityDrawVo.setUserId(userId);
                 integralActivityDrawVo.setNickname(nickname);
                 LocalDateTime nowTime = LocalDateTime.now();
                 integralActivityDrawVo.setCreatedAt(nowTime);
                 Integer receivingStatus = 1;
                 Integer prizeType = integralActivityPrizeVo.getPrizeType();
-                if (prizeType == 2) {// 中奖积分
-                    // 增加积分
-                    ResponseDto<String> in2111 = feignStoneIntegralClient.in2112(userId, integralActivityPrizeVo.getPrizeTypeNum(), integralActivity.getActivityTitle());
-                    log.info("中奖加积分返回值情况 in2111:{}", in2111);
-                    // 发放状态
-                    receivingStatus = 2;
-                }
-                if (prizeType == 1) { // 谢谢惠顾
-                    receivingStatus = 3;
+                if (prizeType == 1) {// 中奖积分
+                    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());
+                    }
                 }
                 integralActivityDrawVo.setReceivingStatus(receivingStatus);
                 // redis
                 redisDataUtils.setIntegralActivityDraw(integralActivityDrawVo);
-                if (prizeType == 3 || prizeType == 4) { // 中实物减总库存
+                if (prizeType == 3 || prizeType == 4) { // 中实物减实物总库存
                     redisDataUtils.decrIntegralActivityTotalPrizeNum(integralActivityId);
                 }
                 // mongo
@@ -204,13 +201,13 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 sqlsDataA.add(new Object[]{
                         drawId, integralActivityId, integralActivity.getActivityNum(),
                         integralActivityPrizeVo.getPrizeId(), integralActivityPrizeVo.getPrizeTitle(), integralActivityPrizeVo.getPrizeType(),
-                        integralActivityPrizeVo.getPrizeTypeNum(), //sweetIntegralActivityPrize.getRelationId(),
+                        integralActivityPrizeVo.getPrizeTypeNum(),
                         userId, nickname,
                         receivingStatus
                 });
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_INTEGRAL_ACTIVITY_DRAW.getKey(),
                         SqlMapping.gets(sqls, sqlsDataA));
-                // TODO: 2021/12/6 查券详情返回 
+                integralActivityPrizeVo.setPrizeRelationList(null);
                 return ResponseDto.success(integralActivityPrizeVo);
             } catch (Exception e) {
                 log.error("积分抽奖异常 e:{}", e);

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -45,7 +45,7 @@ sweet_city_vote_stat.update=UPDATE sweet_city_vote_stat SET vote_num = IFNULL(vo
 # --------------------------防疫答题--------------------------
 sweet_antigenic_question.insert=INSERT INTO sweet_antigenic_question (question_id,type,openId,unionId,nickname,address,phone,urgent_phone,keyword1,keyword11,keyword2,keyword3,keyword4,keyword5,keyword6,keyword7) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 # ------------------------积分抽奖----------------------------
-integral_activity_draw.insert=INSERT INTO sweet_integral_activity_draw (draw_id,integral_activity_id,activity_num,prize_id,prize_title,prize_type,prize_type_num,relation_id,user_id,nickname,receiving_status) VALUES (?,?,?,?,?,?,?,?,?,?,?)
+integral_activity_draw.insert=INSERT INTO sweet_integral_activity_draw (draw_id,integral_activity_id,activity_num,prize_id,prize_title,prize_type,prize_type_num,user_id,nickname,receiving_status) VALUES (?,?,?,?,?,?,?,?,?,?)
 integral_activity_draw.update=UPDATE sweet_integral_activity_draw SET receiving_addresses_id = ?, receiving_name = ?, receiving_phone = ?, receiving_address = ?, receiving_province = ?, receiving_city = ?, receiving_county = ?, updated_at = ? WHERE draw_id = ?
 
 # --------------------------小程序登录记录用户解密后信息--------------------------