金币明细bug

yujian

2019-09-03 d1dccd08a249b830a95eeeb04af25f87d5c056be

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

@@ -12,21 +12,21 @@
import org.yeshi.utils.JsonUtil;



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.bus.clazz.GoodsClass;

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

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

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

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

import com.yeshi.fanli.exception.pdd.PDDOrderException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

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

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;

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

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

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



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -62,6 +62,9 @@
   @Resource

   private SpecialService specialService;



   @Resource

   private PDDGoodsService pddGoodsService;

	


   

   /**

@@ -71,27 +74,8 @@
    */

   @RequestMapping(value = "getClass")

   public void getJDClass(AcceptData acceptData, PrintWriter out) {

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

      list.add(new GoodsClass(1L, "精选"));

      list.add(new GoodsClass(2L, "清仓"));

      list.add(new GoodsClass(3L, "百货"));

      list.add(new GoodsClass(4L, "母婴"));

      list.add(new GoodsClass(5L, "食品"));

      list.add(new GoodsClass(6L, "女装"));

      list.add(new GoodsClass(7L, "电器"));

      list.add(new GoodsClass(8L, "鞋包"));

      list.add(new GoodsClass(9L, "内衣"));

      list.add(new GoodsClass(10L, "美妆"));

      list.add(new GoodsClass(11L, "男装"));

      list.add(new GoodsClass(12L, "汽车"));

      list.add(new GoodsClass(13L, "水果"));

      list.add(new GoodsClass(14L, "家居"));

      list.add(new GoodsClass(15L, "文具"));

      list.add(new GoodsClass(16L, "运动"));

      list.add(new GoodsClass(17L, "虚拟"));

      list.add(new GoodsClass(18L, "医药"));

      JSONObject root = new JSONObject();

      root.put("list", list);

      root.put("list", pddGoodsService.getSpecialClass());

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

   }

   

@@ -102,7 +86,7 @@
    * @param out

    */

   @RequestMapping(value = "getGoodsInfo")

   public void getGoodsInfo(AcceptData acceptData, Integer cid, Integer page, PrintWriter out) {

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

      JSONObject root = new JSONObject();

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

         List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("pinduoduo_special_index");

@@ -118,31 +102,24 @@
         root.put("listSpe", JsonUtil.getApiCommonGson().toJson(listSpecial));

      }

      

      List<QualityFactory> listQuery = qualityGoodsService.listFreeGoods((page - 1) * 20, 20);

      if (listQuery == null) {

         listQuery = new ArrayList<QualityFactory>();

      }



      JSONArray array = new JSONArray();

      if (listQuery.size() > 0) {

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

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

			
         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

         for (QualityFactory qualityFactory : listQuery) {

            TaoBaoGoodsBrief goods = qualityFactory.getTaoBaoGoodsBrief();

            if (goods == null) {

               continue;

      try {

         List<PDDGoodsDetail> goodsList = pddGoodsService.specialSearch(page, cid);

         JSONArray array = new JSONArray();

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

            Gson gson = JsonUtil.getApiCommonGson();

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            for (PDDGoodsDetail goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);

               array.add(gson.toJson(goodsDetailVO));

            }

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

         }

         root.put("list", array);

         root.put("count", 1000);

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

      } catch (PDDOrderException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));

      }

      long count = qualityGoodsService.countFreeGoods();

		
      root.put("count", count);

      root.put("list", array);

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

   }

   

}