Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java

@@ -3,22 +3,27 @@
import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.taobao.ShareHotGoodsDao;

import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;

import com.yeshi.fanli.entity.taobao.ShareHotGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;



@@ -30,6 +35,12 @@
   @Resource

   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   @Resource

   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;



   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;



   @Override

   public void addShareHotGoods(ShareHotGoods goods) {

      if (goods == null || StringUtil.isNullOrEmpty(goods.getDay()) || goods.getGoods() == null)

@@ -40,6 +51,7 @@
      shareHotGoodsDao.save(goods);

   }



   @Cacheable(value = "commonContentCache", key = "'listByDay'+#day")

   @Override

   public List<ShareHotGoods> listByDay(String day) {

      return listByDay(day, 10);

@@ -47,7 +59,28 @@


   @Override

   public List<ShareHotGoods> listByDay(String day, int count) {

      return shareHotGoodsDao.listByDayOrderByUpdateTime(day, 1, count);

      List<ShareHotGoods> list = shareHotGoodsDao.listByDayOrderByUpdateTime(day, 1, count);

      List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

      if (list != null) {

         for (ShareHotGoods shg : list)

            goodsList.add(shg.getGoods());

      }

      // 过滤下线商品

      goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);

      // 添加大淘客信息

      goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);

      Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>();

      if (goodsList != null)

         for (TaoBaoGoodsBrief g : goodsList)

            goodsMap.put(g.getAuctionId(), g);



      for (int j = 0; j < list.size(); j++) {

         if (goodsMap.get(list.get(j).getGoods().getAuctionId()) == null) {

            list.remove(j);

            j--;

         }

      }

      return list;

   }



   @Override

@@ -56,8 +89,8 @@
   }



   @Override

   public List<TaoBaoGoodsBrief> listPreGoods() {

      List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listPreShareHotGoods();

   public List<TaoBaoGoodsBrief> listPreGoods(int page) {

      List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listPreShareHotGoods(page);

      List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

      if (list != null) {

         for (DaTaoKeDetailV2 v2 : list)

@@ -72,13 +105,12 @@
   }



   @Override

   public boolean verifyCanCreateTLJ(Long auctionId) {

   public boolean verifyCanCreateTLJ(Long auctionId, TaoKeAppInfo info) {

      TaoLiJinDTO taoLiJinDTO = null;

      try {

         taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, "淘礼金验证", new BigDecimal("1.00"), 1, new Date(),

               new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), new Date(),

               new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6),

               TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);

               new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), info);

      } catch (TaoKeApiException e) {

         if (e.getCode() == TaoKeApiException.CODE_TLJ_FORBIDDEN) {

            // 该商品不支持创建淘礼金红包

@@ -90,4 +122,24 @@
      }

      return true;

   }



   @Override

   public void updateShareGoods(TaoBaoGoodsBrief goods) {

      List<ShareHotGoods> list = shareHotGoodsDao.listByAuctionId(goods.getAuctionId());

      if (list != null)

         for (ShareHotGoods shareHotGoods : list) {

            // 更新券信息 ，价格信息，销量信息

            shareHotGoods.getGoods().setZkPrice(goods.getZkPrice());

            shareHotGoods.getGoods().setCouponAmount(goods.getCouponAmount());

            shareHotGoods.getGoods().setCouponInfo(goods.getCouponInfo());

            shareHotGoods.getGoods().setCouponEffectiveEndTime(goods.getCouponEffectiveEndTime());

            shareHotGoods.getGoods().setCouponEffectiveStartTime(goods.getCouponEffectiveStartTime());

            shareHotGoods.getGoods().setCouponLeftCount(goods.getCouponLeftCount());

            shareHotGoods.getGoods().setCouponStartFee(goods.getCouponStartFee());

            shareHotGoods.getGoods().setCouponTotalCount(goods.getCouponTotalCount());

            shareHotGoods.getGoods().setBiz30day(goods.getBiz30day());

            shareHotGoods.getGoods().setTkRate(goods.getTkRate());

            shareHotGoodsDao.save(shareHotGoods);

         }

   }

}