订单

yujian

2020-06-09 554de444b87aab5f93cb1593a8095612cf9479a7

 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java

@@ -65,7 +65,7 @@
    */

   public static GoodsDetailVO convertCommonGoods(CommonGoods goods, ConfigParamsDTO params) {

      GoodsDetailVO goodsInfo = new GoodsDetailVO();

      goodsInfo.setGoodsId(goods.getGoodsId());

      goodsInfo.setGoodsId(goods.getGoodsId() + "");

      goodsInfo.setTitle(goods.getTitle());



      Integer shopType = goods.getShopType();

@@ -136,9 +136,19 @@
         goodsInfo.setSalesType(4); // 总销量

         goodsInfo.setPriceName("拼团价");

         goodsInfo.setBaoyou(true);

      } else if (goodsType == Constant.SOURCE_TYPE_SUNING) {

         goodsInfo.setSalesType(1); 
         goodsInfo.setGoodsId(SuningUtil.getConcatGoodsIId(SuningUtil.getFullSupplierCode(goods.getSellerId() + ""),

               goods.getGoodsId() + ""));

      } else {

         goodsInfo.setSalesType(1); // 月销量

         goodsInfo.setBaoyou(true);

      }



      if (goodsType == Constant.SOURCE_TYPE_VIP) {

         goodsInfo.setDiscount(goods.getCouponInfo());

         goodsInfo.setPriceName("折后价");

         goodsInfo.setCouponPrice(goods.getCouponStartPrice());

      }



      goodsInfo.setGoodsType(goodsType);

@@ -225,6 +235,10 @@
         goodsInfo.setShopInfo(shop);

      }



      if (goodsType == Constant.SOURCE_TYPE_VIP) {

         goodsInfo.setShopInfo(null);

      }



      // if (Constant.IS_TEST) {

      // // 添加标签

      // List<ClientTextStyleVO> labels = goodsInfo.getLabels();

@@ -254,7 +268,7 @@
      GoodsDetailVO goodsInfo = new GoodsDetailVO();

      goodsInfo.setBaoyou(true);

      goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

      goodsInfo.setGoodsId(goods.getAuctionId());

      goodsInfo.setGoodsId(goods.getAuctionId() + "");

      goodsInfo.setTitle(goods.getTitle());

      goodsInfo.setSalesType(1); // 默认月销量

      goodsInfo.setZkPrice(goods.getZkPrice());

@@ -285,16 +299,16 @@
            moneyInfoVO.setMaxMoney("¥" + taoBaoHongBaoInfo.getHongbao()

                  .add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));

         else

            moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));

            moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false));

      } else {

         BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());

         BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(),false);

         moneyInfoVO.setFanliMoney("¥" + commission);

         if (params.getMaxRewardRate() != null)

            moneyInfoVO.setMaxMoney(

                  "¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

         else

            moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));

         moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));

            moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false));

         moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(),true));

      }

      goodsInfo.setMoneyInfo(moneyInfoVO);



@@ -367,7 +381,7 @@
      GoodsDetailVO goodsInfo = new GoodsDetailVO();

      goodsInfo.setBaoyou(true);

      goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

      goodsInfo.setGoodsId(goods.getAuctionId());

      goodsInfo.setGoodsId(goods.getAuctionId() + "");

      goodsInfo.setTitle(goods.getTitle());

      goodsInfo.setSalesType(1); // 默认月销量

      goodsInfo.setZkPrice(goods.getZkPrice());

@@ -418,10 +432,10 @@
      MoneyInfoVO moneyInfoVO = new MoneyInfoVO();

      moneyInfoVO.setMoneyType(1); // 默认显示：返 ¥6.6



      BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());

      BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(),false);

      BigDecimal baseCommisstion = null;

      if (params.getBaseFanliRate() != null)

         baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate());

         baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate(),false);

      moneyInfoVO.setFanliMoney("¥" + commission);

      if (params.getMaxRewardRate() != null)

         moneyInfoVO

@@ -432,7 +446,7 @@
         BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);

         moneyInfoVO.setRateInfo("返利比 " + rate + "%");



         BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate());

         BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false);

         BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);

         moneyInfoVO.setMaxRateInfo("返利比 " + maxRate + "%");

         moneyInfoVO.setMaxMoney("¥" + maxCommission);

@@ -446,7 +460,7 @@
         }

      }



      moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));

      moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(),true));



      goodsInfo.setMoneyInfo(moneyInfoVO);



@@ -590,7 +604,7 @@
   public static GoodsDetailVO convertJDGoods(JDGoods goods, ConfigParamsDTO params) {

      GoodsDetailVO goodsInfo = new GoodsDetailVO();

      goodsInfo.setGoodsType(Constant.SOURCE_TYPE_JD);

      goodsInfo.setGoodsId(goods.getSkuId());

      goodsInfo.setGoodsId(goods.getSkuId() + "");

      goodsInfo.setTitle(goods.getSkuName());

      goodsInfo.setSalesType(1); // 默认月销量

      goodsInfo.setPicUrl(goods.getPicUrl());

@@ -746,7 +760,7 @@
      GoodsDetailVO goodsInfo = new GoodsDetailVO();

      goodsInfo.setBaoyou(true);

      goodsInfo.setGoodsType(Constant.SOURCE_TYPE_PDD);

      goodsInfo.setGoodsId(goods.getGoodsId());

      goodsInfo.setGoodsId(goods.getGoodsId() + "");

      goodsInfo.setTitle(goods.getGoodsName());

      goodsInfo.setSalesType(4); // 总销量

      goodsInfo.setPriceName("拼团价");

@@ -879,12 +893,13 @@
      GoodsDetailVO goodsInfo = new GoodsDetailVO();

      goodsInfo.setBaoyou(true);

      goodsInfo.setGoodsType(Constant.SOURCE_TYPE_VIP);

      goodsInfo.setGoodsId(Long.parseLong(goods.getGoodsId()));

      goodsInfo.setGoodsId(Long.parseLong(goods.getGoodsId()) + "");

      goodsInfo.setTitle(goods.getGoodsName());

      goodsInfo.setSalesType(5); // 无销量

      goodsInfo.setPriceName("拼团价");

      goodsInfo.setPriceName("原价");

      goodsInfo.setPicUrl(goods.getGoodsThumbUrl()); // 缩略图

      goodsInfo.setZkPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getVipPrice())));

      goodsInfo.setZkPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMarketPrice())));

      goodsInfo.setCouponPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getVipPrice())));

      goodsInfo.setShopType(CommonGoods.SHOP_TYPE_VIP);



      goodsInfo.setImgList(goods.getGoodsDetailPictures());

@@ -936,7 +951,7 @@


      // 店铺信息

      String mallName = goods.getBrandName();

      if (!StringUtil.isMobile(mallName)) {

      if (!StringUtil.isNullOrEmpty(mallName)) {

         ShopInfoVO shop = new ShopInfoVO();

         shop.setShopName(mallName);

         if (goods.getBrandId() != null) {

@@ -946,6 +961,10 @@
         goodsInfo.setShopInfo(shop);

      }



      // 折扣信息

      goodsInfo.setDiscount(MoneyBigDecimalUtil

            .getWithNoZera(MoneyBigDecimalUtil.mul(new BigDecimal(goods.getDiscount()), new BigDecimal(10))) + "折");

      goodsInfo.setShopInfo(null);

      return goodsInfo;

   }



@@ -953,14 +972,20 @@
      GoodsDetailVO goodsInfo = new GoodsDetailVO();

      goodsInfo.setBaoyou(true);

      goodsInfo.setGoodsType(Constant.SOURCE_TYPE_SUNING);

      goodsInfo.setGoodsId(Long.parseLong(goods.getCommodityInfo().getCommodityCode()));

      goodsInfo.setGoodsId(SuningUtil.getConcatGoodsIId(goods.getCommodityInfo().getSupplierCode(),

            goods.getCommodityInfo().getCommodityCode()));

      goodsInfo.setTitle(goods.getCommodityInfo().getCommodityName());

      goodsInfo.setSalesType(5); // 无销量

      goodsInfo.setSalesType(1); // 月销

      goodsInfo.setPriceName("原价");

      if (goods.getCommodityInfo().getPictureUrl().size() > 0)

         goodsInfo.setPicUrl(goods.getCommodityInfo().getPictureUrl().get(0).getPicUrl()); // 缩略图

      goodsInfo.setZkPrice(

            MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getCommodityInfo().getCommodityPrice())));

	
		
      String commodityPrice = goods.getCommodityInfo().getCommodityPrice();

      if (StringUtil.isNullOrEmpty(commodityPrice)) {

         commodityPrice = goods.getCommodityInfo().getSnPrice();

      }

      goodsInfo.setZkPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(commodityPrice)));

      goodsInfo.setShopType(CommonGoods.SHOP_TYPE_SUNING);



      List<String> imgList = new ArrayList<>();

@@ -970,7 +995,17 @@


      goodsInfo.setImgList(imgList);

      goodsInfo.setState(0);

      goodsInfo.setSalesCount(goods.getCommodityInfo().getMonthSales());



      String salesCountMidea = "";

      Integer count = Integer.parseInt(goods.getCommodityInfo().getMonthSales());

      if (count < 10000) {

         salesCountMidea = count + "";

      } else {

         double sales = count;

         salesCountMidea = String.format("%.1f", sales / 10000);

         salesCountMidea = salesCountMidea + "万";

      }

      goodsInfo.setSalesCount(salesCountMidea);



      // 券信息

      if (goods.getCouponInfo() != null && !StringUtil.isNullOrEmpty(goods.getCouponInfo().getCouponUrl())) {// 有券

@@ -994,6 +1029,13 @@


         goodsInfo.setHasCoupon(true);

         goodsInfo.setCouponInfo(coupon);



         if (goodsInfo.getZkPrice().compareTo(coupon.getStartFee()) >= 0) {

            goodsInfo.setCouponPrice(goodsInfo.getZkPrice().subtract(coupon.getAmount()));

         }else{

            goodsInfo.setCouponPrice(goodsInfo.getZkPrice());

         }



      } else {

         goodsInfo.setHasCoupon(false);

      }

@@ -1013,7 +1055,7 @@
         moneyInfoVO

               .setMaxMoney("¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

      else {

         BigDecimal price = new BigDecimal(goods.getCommodityInfo().getCommodityPrice());

         BigDecimal price = new BigDecimal(commodityPrice);

         BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);

         moneyInfoVO.setRateInfo("返利比 " + rate + "%");