admin
2020-11-28 dc5be7d38446f70e6ff86df311119c32b41fe7f8
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -20,7 +21,7 @@
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.push.PushGoodsException;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -297,29 +298,29 @@
   }
   @Override
   public List<PushGoods> listQuery(long start, int count, String key, Integer state) {
      return pushGoodsMapper.listQuery(start, count, key, state);
   public List<PushGoods> listQuery(long start, int count, String key, Integer state, SystemEnum system) {
      return pushGoodsMapper.listQuery(start, count, key, state,system);
   }
   @Override
   public long countQuery(String key, Integer state) {
      return pushGoodsMapper.countQuery(key, state);
   public long countQuery(String key, Integer state, SystemEnum system) {
      return pushGoodsMapper.countQuery(key, state,system);
   }
   @Override
   public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime) {
      return pushGoodsMapper.listHistoryByPushTime(start, count, uid, pushTime);
   public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime, SystemEnum system) {
      return pushGoodsMapper.listHistoryByPushTime(start, count, uid, pushTime,system);
   }
   @Override
   public long countHistoryByPushTime(Long uid, Date pushTime) {
      return pushGoodsMapper.countHistoryByPushTime(uid, pushTime);
   public long countHistoryByPushTime(Long uid, Date pushTime, SystemEnum system) {
      return pushGoodsMapper.countHistoryByPushTime(uid, pushTime,system);
   }
   
   @Override
   public List<PushGoods> listTask() {
      return pushGoodsMapper.listTask();
   public List<PushGoods> listTask( SystemEnum system) {
      return pushGoodsMapper.listTask(system);
   }
   
   
@@ -441,13 +442,13 @@
         }
      }
      
      String url = configService.get(ConfigKeyEnum.pushActivityLink.getKey());
      String url = configService.getValue(ConfigKeyEnum.pushActivityLink.getKey(),pushGoods.getSystem());
      if (StringUtil.isNullOrEmpty(url)) {
         throw new PushGoodsException(1, "推送页面链接不存在");
      }
      url = url + "?id=" + pushGoods.getId();
      // h活动全推
      pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid);
      pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid,pushGoods.getSystem());
   }
   
   
@@ -501,16 +502,16 @@
         Long goodsId = commonGoods.getGoodsId();
         String url = "https://item.taobao.com/item.htm?id=" + goodsId;
         pushService.pushGoods(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url,listIOS, listAndroid);
         pushService.pushGoods(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url,listIOS, listAndroid,pushGoods.getSystem());
      } else {
         /*   多个商品推送    */
         String url = configService.get(ConfigKeyEnum.pushGoodsDetails.getKey());
         String url = configService.getValue(ConfigKeyEnum.pushGoodsDetails.getKey(),pushGoods.getSystem());
         if (StringUtil.isNullOrEmpty(url)) {
            throw new PushGoodsException(1, "推送页面链接不存在");
         }
         // 生成链接
         url = url + "?id=" + id;
         pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid);
         pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid,pushGoods.getSystem());
      }
   }