Authored by zhaoqing

Merge branch 'dev-limitqueue-6.7' into test6.7

@@ -11,6 +11,7 @@ import com.netflix.config.DynamicLongProperty; @@ -11,6 +11,7 @@ import com.netflix.config.DynamicLongProperty;
11 import com.netflix.config.DynamicPropertyFactory; 11 import com.netflix.config.DynamicPropertyFactory;
12 import com.yoho.activity.dal.ProductLimitUserHelpMapper; 12 import com.yoho.activity.dal.ProductLimitUserHelpMapper;
13 import com.yoho.activity.dal.model.LimitProductHelpUser; 13 import com.yoho.activity.dal.model.LimitProductHelpUser;
  14 +import com.yoho.message.sdk.common.model.SendMessageRspBo;
14 import com.yoho.message.sdk.service.ISendLimitCodeMessage; 15 import com.yoho.message.sdk.service.ISendLimitCodeMessage;
15 import com.yoho.service.model.activity.drawline.response.LimitProductHelpUserRespBO; 16 import com.yoho.service.model.activity.drawline.response.LimitProductHelpUserRespBO;
16 import org.apache.commons.collections.CollectionUtils; 17 import org.apache.commons.collections.CollectionUtils;
@@ -186,9 +187,11 @@ public class DrawlineUserQueueServiceImpl implements IDrawlineUserQueueService { @@ -186,9 +187,11 @@ public class DrawlineUserQueueServiceImpl implements IDrawlineUserQueueService {
186 //先判断是否是首次,根据活动ID查询是否只有一条数据 187 //先判断是否是首次,根据活动ID查询是否只有一条数据
187 Integer queueCount = drawlineUserQueueDAO.selectHelpUserCount(activityId, uid, null); 188 Integer queueCount = drawlineUserQueueDAO.selectHelpUserCount(activityId, uid, null);
188 if (queueCount == 1){ 189 if (queueCount == 1){
189 - logger.info("addDrawlineUserQueue: push message param : uid is{}, productName is{}, limitProductCode is{}",uid, productName, limitProductCode);  
190 try { 190 try {
191 - iSendLimitCodeMessage.queueSuccess(String.valueOf(uid), 4, productName, limitProductCode); 191 + logger.info("addDrawlineUserQueue: push message param : uid is {}, productName is {}, limitProductCode is {}",uid, productName, limitProductCode);
  192 + SendMessageRspBo responseMessage = iSendLimitCodeMessage.queueSuccess(String.valueOf(uid), 4, productName, limitProductCode);
  193 + logger.info("addDrawlineUserQueue: push message success, result is {}",responseMessage);
  194 + logger.info("addDrawlineUserQueue: push message success, code is {}, message is {}",responseMessage.getCode(),responseMessage.getMessage());
192 }catch (Exception e){ 195 }catch (Exception e){
193 logger.error("推送信息失败!", e); 196 logger.error("推送信息失败!", e);
194 } 197 }