Merge branch 'quanku_v2.7' into quanku_v2.7.1

ch-wx-api/src/main/java/com/wwdz/ch/wx/job/SpecialPerformanceNoticeJob.java

@@ -12,11 +12,15 @@ import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.RedisUtils;
 import com.wwdz.ch.core.util.StringUtil;
+import com.wwdz.ch.db.dao.FollowFansRecordDao;
 import com.wwdz.ch.db.dao.UserDao;
 import com.wwdz.ch.db.dao.distribution.*;
+import com.wwdz.ch.db.domain.FollowFansRecord;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.distribution.*;
+import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
 import com.wwdz.ch.db.dto.request.UserRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceConfigRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceRequestDto;
 import com.wwdz.ch.wx.service.distribution.DistributionOrderService;
 import com.xxdxxs.utils.DateUtils;
@@ -78,6 +82,9 @@ public class SpecialPerformanceNoticeJob {
     @Autowired
     UserDao userDao;
 
+    @Autowired
+    FollowFansRecordDao followFansRecordDao;
+
     @Value("${spring.profiles.active}")
     private String env;
 
@@ -124,24 +131,43 @@ public class SpecialPerformanceNoticeJob {
                 }*/
 
                 logger.info("当前即将开始的专场id:{}, 名称为 {} ", specialPerformance.getId(), specialPerformance.getTitle());
+
+                //查询专场的商品所属藏家
+                Long creatorId = null;
+                SpecialPerformanceConfigRequestDto specialPerformanceConfigRequestDto = new SpecialPerformanceConfigRequestDto();
+                specialPerformanceConfigRequestDto.setSpecialPerformanceId(specialPerformance.getId());
+                List<SpecialPerformanceConfig> specialPerformanceConfigList = specialPerformanceConfigDao.findList(specialPerformanceConfigRequestDto);
+                if (!CollectionUtils.isEmpty(specialPerformanceConfigList)) {
+                    SpecialPerformanceConfig specialPerformanceConfig = specialPerformanceConfigList.get(0);
+                    long itemId = specialPerformanceConfig.getItemId();
+                    AuctionConfig auctionConfig = auctionConfigDao.findByItemId(itemId);
+                     if (auctionConfig == null) {
+                        return;
+                     }
+                     creatorId = auctionConfig.getCreatorId();
+                     //查询该用户的粉丝列表
+                }
+                if (creatorId == null) {
+                    logger.error("================ 专场商品所属藏家id为空，不发送通知 ================ ");
+                    return;
+                }
                 //发送短信通知
                 String url = wxAppletApi.getUrlLink(SPECIAL_PERFORMANCE_URL,"specialId=" + specialPerformance.getId());
                 String msg = specialPerformance.getTitle() + "将在" + DateUtils.toString(specialPerformance.getStartTime()) + "开始，请前往"+ url + "查看";
                 boolean hasNextPage = true;
                 int page = 1;
-                UserRequestDto userRequestDto = new UserRequestDto();
+                FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
+                followFansRecordRequestDto.setFollowerId(creatorId);
                 while (hasNextPage) {
-                    List<User> userList = userDao.findList(userRequestDto);
-                    PageInfo pageInfo = new PageInfo(userList);
-                    for (User user : userList) {
-                        String phone = user.getMobile();
-                        if (StringUtils.hasLength(phone)) {
-                            aliSmsSender.sendSms(phone, msg);
-                        }
+                    List<FollowFansRecord > followFansRecordList = followFansRecordDao.findList(followFansRecordRequestDto);
+                    PageInfo pageInfo = new PageInfo(followFansRecordList);
+                    for (FollowFansRecord followFansRecord : followFansRecordList) {
+                        long userId = followFansRecord.getFansId();
+                        aliSmsSender.sendSms(userId, msg);
                     }
                     if (pageInfo.isHasNextPage()) {
                         page = page + 1;
-                        userRequestDto.setPage(page);
+                        followFansRecordRequestDto.setPage(page);
                         logger.info("要发送短信通知的用户数据总页数为 : {}, 当前为 : {}", pageInfo.getPages(), page);
                     } else {
                         hasNextPage = false;