admin
2020-07-29 c338aa60df58bee9f4c25afedf94fe6930a119c1
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
@@ -19,10 +19,11 @@
import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
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.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.goods.facade.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.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -65,7 +66,7 @@
         out.print(JsonUtil.loadFalseResult(1, "请传入Key"));
         return;
      }
      List<CommonContentNav> list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key));
      List<CommonContentNav> list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key),acceptData.getSystem());
      out.print(JsonUtil.loadTrueResult(new Gson().toJson(list)));
   }
@@ -91,7 +92,7 @@
      }
      CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
            cid, page, 10);
            cid, page, 10,acceptData.getSystem());
      // 保留暂时不开启,待后续开启
      List<SwiperPicture> bannerList = new ArrayList<>();
@@ -102,12 +103,18 @@
      JSONArray array = new JSONArray();
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
      BigDecimal pro = hongBaoManageService.getFanLiRate();
      BigDecimal pro = hongBaoManageService.getFanLiRate(acceptData.getSystem());
      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());