金币BUG修改

admin

2019-09-22 b9f8ef2c4737b6e6be4b12fc8f7bafb033bfcfe5

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java

@@ -14,10 +14,15 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.brand.BrandGoodsCahe;

import com.yeshi.fanli.entity.brand.BrandInfo;

import com.yeshi.fanli.entity.brand.BrandInfoRecord;

import com.yeshi.fanli.entity.brand.BrandShopCahe;

import com.yeshi.fanli.entity.brand.TaoBaoShopHistory;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.jd.JDGoods;

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

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

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

@@ -25,12 +30,14 @@
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.BrandGoodsCaheService;

import com.yeshi.fanli.service.inter.brand.BrandInfoRecordService;

import com.yeshi.fanli.service.inter.brand.BrandInfoService;

import com.yeshi.fanli.service.inter.brand.BrandShopCaheService;

import com.yeshi.fanli.service.inter.brand.TaoBaoShopHistoryService;

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

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

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

@@ -42,6 +49,7 @@
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.brand.BrandInfoVO;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.goods.ShopInfoVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -82,6 +90,12 @@
   

   @Resource

   private BrandInfoRecordService brandInfoRecordService;

	
   @Resource

   private BrandGoodsCaheService brandGoodsCaheService;

	
   @Resource

   private BrandShopCaheService brandShopCaheService;

   



   /**

@@ -529,7 +543,6 @@
   }

   

   

	
   /**

    * 店铺足迹

    * 

@@ -602,4 +615,160 @@
      data.put("list", JsonUtil.getApiCommonGson().toJson(list));

      out.print(JsonUtil.loadTrueResult(data));

   }

	
	
   /**

    * 品牌列表列表

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getListV3", method = RequestMethod.POST)

   public void getListV3(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {

      if (page == null || page < 1) {

         out.print(JsonUtil.loadFalseResult("页码不正确"));

         return;

      }

		
      if (cid != null && cid == 0) {

         cid = null;

      }

		
      JSONObject data = new JSONObject();

      if (page == 1 && cid != null) {

         List<BrandInfo> brandlist = brandInfoService.listValidByCidToApp(cid);

         if(brandlist == null)

            brandlist = new ArrayList<BrandInfo>();

         data.put("brandlist", JsonUtil.getApiCommonGson().toJson(brandlist));

      }

		
		
      long count = brandInfoService.countValidByCidToApp(cid);

		
      List<BrandInfoVO> list = brandInfoService.listValidToApp((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid);

      if (list == null)

         list = new ArrayList<BrandInfoVO>();

		
      GsonBuilder gb = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());

      gb.excludeFieldsWithoutExposeAnnotation();

      Gson gson = gb.create();

		
      data.put("count", count);

      data.put("list", gson.toJson(list));

      out.print(JsonUtil.loadTrueResult(data));

   }

	
	
	
   /**

    * 店铺详情过渡页

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getShopInfoV3", method = RequestMethod.POST)

   public void getShopInfoV3(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {

      if (id == null) {

         out.print(JsonUtil.loadFalseResult("缺失店铺id"));

         return;

      }

		
      // 添加足迹

      if (page == 1) {

         brandInfoRecordService.addRecord(id, uid, acceptData.getDevice());

      }

		
      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

		
      JSONArray array = new JSONArray();

      List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId((page - 1) * 50, 50,id);

      for (BrandGoodsCahe brandGoods: listGoods) {

         JDGoods goodsJD = brandGoods.getGoodsJD();

         if (goodsJD != null) {

            array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goodsJD, fanLiRate, shareRate)));

            continue;

         }

			
         TaoBaoGoodsBrief goodsTB = brandGoods.getGoodsTB();

         if (goodsTB != null) {

            array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsTB, null, fanLiRate, shareRate)));

            continue;

         }

			
         PDDGoodsDetail goodsPDD = brandGoods.getGoodsPDD();

         if (goodsPDD != null) {

            array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goodsPDD, fanLiRate, shareRate)));

            continue;

         }

      }

		
      JSONObject data = new JSONObject();

      if (page == 1 && array.size() > 0) {

         // 2、顶部轮播图

         List<SwiperPicture> topPicList = new ArrayList<>();

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");

         if (oldtopPicList != null && oldtopPicList.size() > 0)

            topPicList.addAll(oldtopPicList);

			
         List<ShopInfoVO> shopList = new ArrayList<ShopInfoVO>();

         List<BrandShopCahe> listshopCahe = brandShopCaheService.getByBrandId(id);

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

            for (BrandShopCahe brandShopCahe: listshopCahe) {

               shopList.add(brandShopCahe.getShop());

            }

         }

         data.put("picList", JsonUtil.getApiCommonGson().toJson(topPicList));

         data.put("shopList", JsonUtil.getApiCommonGson().toJson(shopList));

      }

		
      data.put("count", 50);

      data.put("list", array);

      out.print(JsonUtil.loadTrueResult(data));

   }

	
	
	
   /**

    * 店铺足迹

    * 
    * @param acceptData

    * @param type

    *            精选1， 足迹列表2

    * @param out

    */

   @RequestMapping(value = "getHistoryV3", method = RequestMethod.POST)

   public void getHistoryV3(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {

      if (type == null) {

         out.print(JsonUtil.loadFalseResult("类型不正确"));

         return;

      }



      if (page == null || page < 1) {

         out.print(JsonUtil.loadFalseResult("页码不正确"));

         return;

      }



      int pageSize;

      if (type == 1) {

         pageSize = 4;

      } else {

         pageSize = Constant.PAGE_SIZE;

      }

		
      List<BrandInfoRecord> listRecord = brandInfoRecordService.listRecord((page - 1) * pageSize, pageSize, uid, acceptData.getDevice());

      List<BrandInfo> list = new ArrayList<BrandInfo>();

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

         for (BrandInfoRecord history : listRecord) {

             list.add(history.getBrandInfo());

         }

      }

		
      JSONObject data = new JSONObject();

      data.put("count", brandInfoRecordService.countRecord(uid, acceptData.getDevice()));

      data.put("list", JsonUtil.getApiCommonGson().toJson(list));

      out.print(JsonUtil.loadTrueResult(data));

   }

}