Merge remote-tracking branch 'origin/master'

admin

2019-05-15 3be3f6e670d2e11d7ced76b8202f0ef30b56870f

 fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java

@@ -18,7 +18,6 @@
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.exception.taobao.TaoKeApiException;

@@ -26,8 +25,8 @@
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.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -57,8 +56,9 @@
   @Resource

   private HongBaoManageService manageService;



	
   @Resource

   private QualityGoodsService qualityGoodsService;

   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;



   /**

    * 获取品牌分类

@@ -85,26 +85,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();

      }

   }





   /**

@@ -274,17 +254,13 @@
         }



         int pageSize = Constant.PAGE_SIZE;

         List<QualityFactory> listQuery = qualityGoodsService.listByShopId((page - 1) * pageSize, pageSize, sid);

         List<TaoBaoGoodsBrief> listGoods = taoBaoGoodsBriefService.listByShopId((page - 1) * pageSize, pageSize, sid);



         long count = 0;

         JSONArray array = new JSONArray();

         if (listQuery != null && listQuery.size() > 0) {

         if (listGoods != null && listGoods.size() > 0) {

            List<Long> listGid = new ArrayList<Long>();

            for (QualityFactory qualityFactory : listQuery) {

               TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();

               if (taoBaoGoodsBrief == null) {

                  continue;

               }

            for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoods) {

               listGid.add(taoBaoGoodsBrief.getAuctionId());

            }



@@ -304,12 +280,7 @@
                  .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 : listGoods) {

               if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {

                  boolean stateSale = false; // 默认停售

                  Long goodsId = taoBaoGoodsBrief.getAuctionId();

@@ -327,7 +298,7 @@
               }

               array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

            }

            count = qualityGoodsService.countByShopId(sid);

            count = taoBaoGoodsBriefService.countByShopId(sid);

         }

         data.put("count", count);

         data.put("list", array);