商品最高返

yujian

2019-10-29 9b55262bb45c81c997ab04e55e8de13e14b8ca7d

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

@@ -21,6 +21,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;

@@ -237,7 +238,7 @@


         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();



         ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

         for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {

            CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();

            if (commonGoods == null) {

@@ -258,8 +259,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);

@@ -353,14 +353,14 @@
         Gson gson = gsonBuilder.create();

         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

         ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

         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());