Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java

@@ -20,13 +20,12 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



import net.sf.json.JSONArray;

@@ -105,9 +104,17 @@
      JSONArray array = new JSONArray();

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

      BigDecimal pro = hongBaoManageService.getFanLiRate();

      if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 免单商品

         pro = new BigDecimal(100);

      List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();

      for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {

         array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, pro.toString(), "")));

         TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, pro.toString(), "");

         if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 免单商品

         {

            extra.getTaoBaoHongBaoInfo().setRate("¥" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));

            extra.getTaoBaoHongBaoInfo().setHongbao(TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));

         }

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

      }

      root.put("goodsList", array);

      root.put("goodsCount", result.getCount());