yujian
2019-05-15 265e7fc98dfa0ac37bcc95a105e42546ffb3d094
fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java
@@ -18,17 +18,18 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.brand.BrandClass;
import com.yeshi.fanli.entity.brand.TaoBaoShopHistory;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.service.inter.brand.BrandClassService;
import com.yeshi.fanli.service.inter.brand.BrandClassShopService;
import com.yeshi.fanli.service.inter.brand.TaoBaoShopHistoryService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
@@ -57,9 +58,13 @@
   @Resource
   private HongBaoManageService manageService;
   @Resource
   private QualityGoodsService qualityGoodsService;
   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
   @Resource
   private DaTaoKeGoodsService daTaoKeGoodsService;
   /**
    * 获取品牌分类
    * 
@@ -85,26 +90,6 @@
      }
   }
   /**
    * 添加足迹
    *
    * @param acceptData
    * @param out
    */
   @RequestMapping(value = "addHistory", method = RequestMethod.POST)
   public void addHistory(AcceptData acceptData, Long sid, Long uid, PrintWriter out) {
      try {
         if (sid == null || sid == 0) {
            out.print(JsonUtil.loadFalseResult("店铺id为空"));
            return;
         }
         out.print(JsonUtil.loadTrueResult("记录成功"));
      } catch (Exception e) {
         out.print(JsonUtil.loadFalseResult("记录失败"));
         e.printStackTrace();
      }
   }
   /**
@@ -138,6 +123,15 @@
   @RequestMapping(value = "getHistory", method = RequestMethod.POST)
   public void getHistory(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
      try {
         if (type == null) {
            out.print(JsonUtil.loadFalseResult("类型不正确"));
            return;
         }
         if (page == null || page < 1) {
            page = 1;
         }
         int pageSize;
         if (type == 1) {
            pageSize = 4;
@@ -187,7 +181,7 @@
         }
         JSONObject data = new JSONObject();
         data.put("count", list.size());
         data.put("count", count);
         data.put("list", JsonUtil.getApiCommonGson().toJson(list));
         out.print(JsonUtil.loadTrueResult(data));
@@ -226,11 +220,17 @@
   @RequestMapping(value = "getShopInfo", method = RequestMethod.POST)
   public void getShopInfo(AcceptData acceptData, Integer page, Long sid, Long uid, PrintWriter out) {
      try {
         if (sid == null) {
            out.print(JsonUtil.loadFalseResult("缺失店铺id"));
            return;
         }
         JSONObject data = new JSONObject();
         if (page == 1) {
            TaoBaoShop taoBaoShop = taoBaoShopService.selectByPrimaryKey(sid);
            if (taoBaoShop == null) {
               out.print(JsonUtil.loadFalseResult("店铺信息获取失败"));
               return;
            }
            String shopLink = taoBaoShop.getShopLink();
            if (StringUtil.isNullOrEmpty(shopLink)) {
@@ -246,7 +246,7 @@
            if (!StringUtil.isNullOrEmpty(shopIconCustom)) {
               taoBaoShop.setShopIcon(shopIconCustom);
            }
            data.put("shop", taoBaoShop);
            data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));
            
            
            ThreadUtil.run(new Runnable() {
@@ -255,24 +255,37 @@
                  taoBaoShopHistoryService.addHistory(sid, uid, acceptData.getDevice());
               }
            });
         }
         int pageSize = Constant.PAGE_SIZE;
         List<QualityFactory> listQuery = qualityGoodsService.listByShopId((page - 1) * pageSize, pageSize, sid);
         // 商品列表信息
         int pageSize = 50;
         List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
         // 先查询大淘客数据
         List<DaTaoKeDetail> listDaTaoKe = daTaoKeGoodsService.listBySellerId(0, pageSize, sid);
         if (listDaTaoKe != null && listDaTaoKe.size() > 0) {
            for (DaTaoKeDetail daTaoKe: listDaTaoKe) {
               listGoodsBrief.add(TaoBaoUtil.convert(daTaoKe));
            }
         }
         // 不足50条数据、查询精选库
         if (listGoodsBrief.size() < pageSize) {
            int needCount = pageSize- listGoodsBrief.size();
            List<TaoBaoGoodsBrief> listGoods = taoBaoGoodsBriefService.listByShopId(0, needCount, sid);
            if (listGoods != null && listGoods.size() > 0) {
               listGoodsBrief.addAll(listGoods);
            }
         }
         long count = 0;
         JSONArray array = new JSONArray();
         if (listQuery != null && listQuery.size() > 0) {
         if (listGoodsBrief.size() > 0) {
            List<Long> listGid = new ArrayList<Long>();
            for (QualityFactory qualityFactory : listQuery) {
               TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();
               if (taoBaoGoodsBrief == null) {
                  continue;
               }
            for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
               listGid.add(taoBaoGoodsBrief.getAuctionId());
            }
            // API网络接口验证是否在售
            List<TaoBaoGoodsBrief> listTaoKeGoods = null;
            try {
@@ -284,17 +297,13 @@
            } catch (Exception e) {
               e.printStackTrace();
            }
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
            BigDecimal proportion = manageService.getFanLiRate();
            for (QualityFactory selectionGoods : listQuery) {
               TaoBaoGoodsBrief taoBaoGoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
               if (taoBaoGoodsBrief == null) {
                  continue;
               }
            for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
               if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
                  boolean stateSale = false; // 默认停售
                  Long goodsId = taoBaoGoodsBrief.getAuctionId();
@@ -305,16 +314,15 @@
                        break;
                     }
                  }
                  if (!stateSale) {
                     continue;
                  }
               }
               array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
            }
            count = qualityGoodsService.countByShopId(sid);
         }
         data.put("count", count);
         data.put("count", array.size());
         data.put("list", array);
         out.print(JsonUtil.loadTrueResult(data));
      } catch (Exception e) {