足迹、收藏订单兼容新需求

yujian

2020-05-23 28cf328a098334b51a3e9d2d56f983fb8c862211

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

@@ -2,7 +2,6 @@


import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Date;

@@ -21,6 +20,7 @@
import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dto.ConfigParamsDTO;

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

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

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

@@ -34,10 +34,11 @@
import com.yeshi.fanli.service.inter.config.BusinessSystemService;

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

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

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

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;

import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

@@ -63,7 +64,7 @@
   private BusinessSystemService businessSystemService;



   @Resource

   private HongBaoManageService hongBaoManageService;

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private CollectionGoodsV2Service collectionGoodsV2Service;

@@ -83,9 +84,9 @@
   @Resource

   private RedisManager redisManager;



	
   /**

    * 收藏商品

    * 
    * @param acceptData

    * @param uid

    * @param id

@@ -203,10 +204,14 @@
         return;

      }



      boolean notBackSuVip = false;

      if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))

         notBackSuVip = true;

		
      List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page,

            Constant.PAGE_SIZE, goodsType);

            Constant.PAGE_SIZE, goodsType, notBackSuVip);



      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType);

      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType, notBackSuVip);



      JSONObject data = new JSONObject();

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

@@ -235,8 +240,8 @@
            }

         }



         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

         ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

               acceptData.getVersion());



         for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {

            CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();

@@ -258,8 +263,7 @@
               commonGoods.setState(state);

            }



            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate,

                  shareRate);

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);

            detailVO.setId(commonGoods.getId());

            detailVO.setCreatetime(collectionGoodsV2.getCreateTime());

            list.add(detailVO);

@@ -330,8 +334,13 @@
         return;

      }



      boolean notBackSuVip = false;

      if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))

         notBackSuVip = true;

		
		
      List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(uid, acceptData.getDevice(), page,

            20, goodsType);

            20, goodsType, notBackSuVip);



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

      gsonBuilder.excludeFieldsWithoutExposeAnnotation();

@@ -346,21 +355,20 @@
         }

      });



      long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType);

      long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType, notBackSuVip);



      JSONArray array = new JSONArray();

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

         Gson gson = gsonBuilder.create();

         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

         ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

               acceptData.getVersion());

         for (ScanHistoryV2 sh : list) {

            CommonGoods commonGoods = sh.getCommonGoods();

            if (commonGoods == null) {

               continue;

            }



            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate,

                  shareRate);

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);



            detailVO.setId(commonGoods.getId());

            detailVO.setCreatetime(sh.getCreateTime());