订单

yujian

2020-06-09 554de444b87aab5f93cb1593a8095612cf9479a7

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

@@ -5,15 +5,21 @@
import java.util.ArrayList;

import java.util.Arrays;

import java.util.Date;

import java.util.HashSet;

import java.util.List;

import java.util.Set;



import org.yeshi.utils.taobao.TbImgUtil;



import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.dto.common.GoodsOtherInfoDTO;

import com.yeshi.fanli.dto.jd.JDCouponInfo;

import com.yeshi.fanli.dto.jd.JDPingouInfo;

import com.yeshi.fanli.dto.jd.JDShopInfo;

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

import com.yeshi.fanli.dto.suning.SuningGoodsImg;

import com.yeshi.fanli.dto.suning.SuningGoodsInfo;

import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;

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

import com.yeshi.fanli.entity.jd.JDGoods;

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

@@ -24,10 +30,13 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.jd.JDUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;

import com.yeshi.fanli.util.suning.SuningUtil;

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

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

import com.yeshi.fanli.util.vipshop.VipShopUtil;

import com.yeshi.fanli.vo.goods.CouponInfoVO;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.goods.MoneyInfoVO;

@@ -54,10 +63,9 @@
    *            返利比例

    * @return

    */

   public static GoodsDetailVO convertCommonGoods(CommonGoods goods, String pid, BigDecimal fanLiRate,

         BigDecimal shareRate) {

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

@@ -128,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);

@@ -157,8 +175,25 @@
      // 资金信息

      MoneyInfoVO moneyInfoVO = new MoneyInfoVO();

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

      moneyInfoVO.setFanliMoney(CommonGoodsUtil.getCommissionInfo(goods, fanLiRate));

      moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, shareRate));



      BigDecimal commission = CommonGoodsUtil.getCommission(goods, params.getFanLiRate());

      moneyInfoVO.setFanliMoney("¥" + commission);



      BigDecimal maxCommission = CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate());

      if (params.getMaxRewardRate() != null)

         moneyInfoVO

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

      else

         moneyInfoVO.setMaxMoney("¥" + maxCommission);



      moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, params.getShareRate()));



      moneyInfoVO.setRateInfo("返利比 " + MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)),

            CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");



      moneyInfoVO.setMaxRateInfo("返利比 " + MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)),

            CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");



      goodsInfo.setMoneyInfo(moneyInfoVO);



      // 券信息

@@ -181,16 +216,41 @@
         goodsInfo.setCouponInfo(coupon);

      }



      if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {

         // 店铺信息

         if (!StringUtil.isNullOrEmpty(goods.getSellerName()) && goods.getSellerId() != null) {

            ShopInfoVO shop = new ShopInfoVO();

            shop.setShopName(goods.getSellerName());

      // 店铺信息

      if (!StringUtil.isNullOrEmpty(goods.getSellerName())) {

         ShopInfoVO shop = new ShopInfoVO();

         shop.setShopName(goods.getSellerName());



         if (goods.getSellerId() != null)

            shop.setId(goods.getSellerId().toString());

            goodsInfo.setShopInfo(shop);



         if (shopType == null || shopType == 0) {

            shop.setUserType(10);

         } else if (shopType == 1) {

            shop.setUserType(11);

         } else {

            shop.setUserType(goods.getShopType());

         }



         goodsInfo.setShopInfo(shop);

      }



      if (goodsType == Constant.SOURCE_TYPE_VIP) {

         goodsInfo.setShopInfo(null);

      }



      // if (Constant.IS_TEST) {

      // // 添加标签

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

      // if (labels == null)

      // labels = new ArrayList<>();

      //

      // labels.add(new ClientTextStyleVO("预售", "#FF2B4E"));

      // labels.add(new ClientTextStyleVO("爆款", "#FF2B4E"));

      // labels.add(new ClientTextStyleVO("超级划算", "#FF2B4E"));

      // goodsInfo.setLabels(labels);

      // }



      return goodsInfo;

   }



@@ -204,12 +264,11 @@
    *            返利比例

    * @return

    */

   public static GoodsDetailVO convertTaoBaoGoodsBriefExtra(TaoBaoGoodsBriefExtra goods, BigDecimal fanLiRate,

         BigDecimal shareRate) {

   public static GoodsDetailVO convertTaoBaoGoodsBriefExtra(TaoBaoGoodsBriefExtra goods, ConfigParamsDTO params) {

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

@@ -217,6 +276,7 @@
      goodsInfo.setState(goods.getState() == null ? 0 : goods.getState());

      goodsInfo.setSalesCount(goods.getSalesCount());

      goodsInfo.setPicUrl(goods.getPictUrl());

      goodsInfo.setDescription(goods.getDescription());



      Integer shopType = goods.getUserType();

      if (shopType != null && shopType == 1) {

@@ -235,9 +295,20 @@
         TaoBaoHongBaoInfo taoBaoHongBaoInfo = goods.getTaoBaoHongBaoInfo();

         moneyInfoVO.setFanliMoney("¥" + taoBaoHongBaoInfo.getHongbao());

         moneyInfoVO.setShareMoney("¥" + taoBaoHongBaoInfo.getHongbao());

         if (params.getMaxRewardRate() != null)

            moneyInfoVO.setMaxMoney("¥" + taoBaoHongBaoInfo.getHongbao()

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

         else

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

      } else {

         moneyInfoVO.setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, fanLiRate));

         moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, shareRate));

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

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

      }

      goodsInfo.setMoneyInfo(moneyInfoVO);



@@ -257,19 +328,41 @@
         coupon.setStartTime(sdf.format(new Date(Long.parseLong(couponEffectiveStartTime))));

         coupon.setLink(taoBaoQuanInfo.getCouponLink());

         coupon.setStartFee(taoBaoQuanInfo.getCouponStartFee());

         coupon.setShopCoupon(goods.isShopCoupon());

         goodsInfo.setHasCoupon(true);

         goodsInfo.setCouponInfo(coupon);

      }



      // 店铺信息

      String shopTitle = goods.getShopTitle();

      Long sellerId = goods.getSellerId();

      if (!StringUtil.isNullOrEmpty(shopTitle) && sellerId != null) {



      if (!StringUtil.isNullOrEmpty(shopTitle)) {

         ShopInfoVO shop = new ShopInfoVO();

         shop.setShopName(shopTitle);

         shop.setId(goods.getSellerId().toString());



         Long sellerId = goods.getSellerId();

         if (sellerId != null)

            shop.setId(goods.getSellerId().toString());



         if (shopType != null && shopType == 1) {

            shop.setUserType(11);

         } else {

            shop.setUserType(10);

         }

         goodsInfo.setShopInfo(shop);

      }



      // if (Constant.IS_TEST) {

      // // 添加标签

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

      // if (labels == null)

      // labels = new ArrayList<>();

      //

      // labels.add(new ClientTextStyleVO("预售", "#FF2B4E"));

      // labels.add(new ClientTextStyleVO("爆款", "#FF2B4E"));

      // labels.add(new ClientTextStyleVO("超级划算", "#FF2B4E"));

      // goodsInfo.setLabels(labels);

      // }



      return goodsInfo;

   }

@@ -284,15 +377,15 @@
    *            返利比例

    * @return

    */

   public static GoodsDetailVO convertTaoBao(TaoBaoGoodsBrief goods, String pid, BigDecimal fanLiRate,

         BigDecimal shareRate) {

   public static GoodsDetailVO convertTaoBao(TaoBaoGoodsBrief goods, ConfigParamsDTO params) {

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

      goodsInfo.setDescription(goods.getDescription());



      String provcity = goods.getProvcity();

      if (!StringUtil.isNullOrEmpty(provcity)) {

@@ -338,8 +431,37 @@
      // 资金信息

      MoneyInfoVO moneyInfoVO = new MoneyInfoVO();

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

      moneyInfoVO.setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, fanLiRate));

      moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, shareRate));



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

      BigDecimal baseCommisstion = null;

      if (params.getBaseFanliRate() != null)

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

      moneyInfoVO.setFanliMoney("¥" + commission);

      if (params.getMaxRewardRate() != null)

         moneyInfoVO

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

      else {// 只有有VIP后的版本才会显示返利比



         BigDecimal price = TaoBaoUtil.getAfterUseCouplePrice(goods);

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

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



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

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

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

         moneyInfoVO.setMaxMoney("¥" + maxCommission);

         if (baseCommisstion != null) {

            String desc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  commission.subtract(baseCommisstion).setScale(2).toString());

            String maxDesc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  maxCommission.subtract(baseCommisstion).setScale(2).toString());

            moneyInfoVO.setCompositionInfo(desc);

            moneyInfoVO.setMaxCompositionInfo(maxDesc);

         }

      }



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



      goodsInfo.setMoneyInfo(moneyInfoVO);



      // 券信息

@@ -365,23 +487,48 @@
            coupon.setStartTime(goods.getCouponEffectiveStartTime().replace("-", "."));

         }



         coupon.setLink(TaoBaoCouponUtil.getCoupleUrl(goods.getCouponActivityId(), pid, goods.getAuctionId() + ""));

         if (!StringUtil.isNullOrEmpty(goods.getCouponLink()))

            coupon.setLink(goods.getCouponLink());

         else

            coupon.setLink(

                  TaoBaoCouponUtil.getCoupleUrl(goods.getCouponActivityId(), null, goods.getAuctionId() + ""));

         coupon.setStartFee(goods.getCouponStartFee());



         coupon.setShopCoupon(goods.isShopCoupon());

         goodsInfo.setHasCoupon(true);

         goodsInfo.setCouponInfo(coupon);

      }



      // 店铺信息

      if (!StringUtil.isNullOrEmpty(goods.getShopTitle()) && goods.getSellerId() != null) {

      if (!StringUtil.isNullOrEmpty(goods.getShopTitle())) {

         ShopInfoVO shop = new ShopInfoVO();

         shop.setShopName(goods.getShopTitle());

         shop.setId(goods.getSellerId().toString());



         if (goods.getSellerId() != null)

            shop.setId(goods.getSellerId().toString());



         if (shopType != null && shopType == 1) {

            shop.setUserType(11);

         } else {

            shop.setUserType(10);

         }



         goodsInfo.setShopInfo(shop);

      }



      if (TaoBaoUtil.isYUShou(goods)) {// 预售商品

         goodsInfo = loadYuShouInfo(goodsInfo, goods, pid, fanLiRate, shareRate);

         goodsInfo = loadYuShouInfo(goodsInfo, goods, null, params.getFanLiRate(), params.getShareRate());

      }



      if (Constant.IS_TEST) {

         // 添加标签

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

         if (labels == null)

            labels = new ArrayList<>();



         labels.add(new ClientTextStyleVO("预售", "#FF2B4E"));

         labels.add(new ClientTextStyleVO("爆款", "#FF2B4E"));

         labels.add(new ClientTextStyleVO("超级划算", "#FF2B4E"));

         goodsInfo.setLabels(labels);

      }



      return goodsInfo;

@@ -395,9 +542,53 @@
         if (goodsInfo.getLabels() == null)

            goodsInfo.setLabels(new ArrayList<>());

         goodsInfo.getLabels().add(new ClientTextStyleVO("预售", "#FF2B4E"));

	
      }

      return goodsInfo;

   }



   private static CouponInfoVO convertJDCouponInfo(JDCouponInfo couponInfo) {

      CouponInfoVO coupon = new CouponInfoVO();

      coupon.setAmount(couponInfo.getDiscount());

      coupon.setLink(couponInfo.getLink());

      coupon.setStartFee(couponInfo.getQuota());



      if (couponInfo.getGetStartTime() != null) {

         coupon.setStartTime(TimeUtil.getGernalTime(couponInfo.getGetStartTime(), "yyyy.MM.dd"));

      }



      if (couponInfo.getGetEndTime() != null) {

         coupon.setEndTime(TimeUtil.getGernalTime(couponInfo.getGetEndTime(), "yyyy.MM.dd"));

      }



      return coupon;

   }



   private static List<CouponInfoVO> filterCouponInfo(List<CouponInfoVO> couponList) {

      if (couponList == null)

         return null;

      long currentTime = System.currentTimeMillis();

      Set<String> sets = new HashSet<>();

      // 过滤掉过期券

      for (int i = 0; i < couponList.size(); i++) {

         if (couponList.get(i).getStartTime() != null && couponList.get(i).getEndTime() != null) {

            long startTime = TimeUtil.convertToTimeTemp(couponList.get(i).getStartTime(), "yyyy.MM.dd");

            long endTime = TimeUtil.convertToTimeTemp(couponList.get(i).getEndTime(), "yyyy.MM.dd")

                  + 1000 * 60 * 60 * 24L;

            if (currentTime < startTime || currentTime >= endTime) {

               couponList.remove(i--);

               continue;

            }

         }

         // 过滤掉面值相同与起始金额相同的

         String key = couponList.get(i).getStartFee() + "-" + couponList.get(i).getAmount();

         if (!sets.contains(key))

            sets.add(key);

         else {

            couponList.remove(i--);

            continue;

         }

      }

      return couponList;

   }



   /**

@@ -410,10 +601,10 @@
    *            返利比例

    * @return

    */

   public static GoodsDetailVO convertJDGoods(JDGoods goods, BigDecimal fanLiRate, BigDecimal shareRate) {

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

@@ -434,11 +625,38 @@
      // 资金信息

      MoneyInfoVO moneyInfoVO = new MoneyInfoVO();

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

      moneyInfoVO.setFanliMoney("¥" + JDUtil.getGoodsFanLiMoney(goods, fanLiRate));

      moneyInfoVO.setShareMoney("¥" + JDUtil.getGoodsFanLiMoney(goods, shareRate));

      BigDecimal commission = JDUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());

      moneyInfoVO.setFanliMoney("¥" + commission);

      BigDecimal baseCommisstion = null;

      if (params.getBaseFanliRate() != null)

         baseCommisstion = JDUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate());



      if (params.getMaxRewardRate() != null)

         moneyInfoVO

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

      else {

         BigDecimal price = JDUtil.getQuanPrice(goods);

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

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



         BigDecimal maxCommission = JDUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());

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

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

         moneyInfoVO.setMaxMoney("¥" + maxCommission);



         if (baseCommisstion != null) {

            String desc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  commission.subtract(baseCommisstion).setScale(2).toString());

            String maxDesc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  maxCommission.subtract(baseCommisstion).setScale(2).toString());

            moneyInfoVO.setCompositionInfo(desc);

            moneyInfoVO.setMaxCompositionInfo(maxDesc);

         }

      }

      moneyInfoVO.setShareMoney("¥" + JDUtil.getGoodsFanLiMoney(goods, params.getShareRate()));

      goodsInfo.setMoneyInfo(moneyInfoVO);



      JDCouponInfo couponInfo = goods.getCouponInfo();

      JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);

      if (couponInfo != null) {

         BigDecimal discount = couponInfo.getDiscount();

         // 计算券后价

@@ -460,6 +678,14 @@


         goodsInfo.setHasCoupon(true);

         goodsInfo.setCouponInfo(coupon);

      }



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

         List<CouponInfoVO> couponList = new ArrayList<>();

         for (JDCouponInfo jdCoupon : goods.getCouponInfoList()) {

            couponList.add(convertJDCouponInfo(jdCoupon));

         }

         goodsInfo.setCouponInfoList(filterCouponInfo(couponList));

      }



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

@@ -502,6 +728,7 @@
         ShopInfoVO shop = new ShopInfoVO();

         shop.setShopName(shopInfo.getShopName());

         shop.setId(shopInfo.getShopId().toString());



         if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {

            shop.setUserType(20);

         } else {

@@ -515,6 +742,7 @@
      if (isFreeShipping != null && isFreeShipping == 1) {

         goodsInfo.setBaoyou(true);

      }



      return goodsInfo;

   }



@@ -528,11 +756,11 @@
    *            返利比例

    * @return

    */

   public static GoodsDetailVO convertPDDGoods(PDDGoodsDetail goods, BigDecimal fanLiRate, BigDecimal shareRate) {

   public static GoodsDetailVO convertPDDGoods(PDDGoodsDetail goods, ConfigParamsDTO params) {

      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("拼团价");

@@ -563,9 +791,9 @@
      // 资金信息

      MoneyInfoVO moneyInfoVO = new MoneyInfoVO();

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

      moneyInfoVO.setFanliMoney("¥" + PinDuoDuoUtil.getGoodsFanLiMoney(goods, fanLiRate));

      moneyInfoVO.setShareMoney("¥" + PinDuoDuoUtil.getGoodsFanLiMoney(goods, shareRate));

      goodsInfo.setMoneyInfo(moneyInfoVO);

      BigDecimal commission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());

      moneyInfoVO.setFanliMoney("¥" + commission);

      moneyInfoVO.setShareMoney("¥" + commission);



      Boolean hasCoupon = goods.getHasCoupon();

      if (hasCoupon != null && hasCoupon) {

@@ -606,6 +834,35 @@
         goodsInfo.setCouponInfo(coupon);

      }



      BigDecimal baseCommisstion = null;

      if (params.getBaseFanliRate() != null)

         baseCommisstion = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate());



      if (params.getMaxRewardRate() != null)

         moneyInfoVO

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

      else {

         BigDecimal price = goodsInfo.getCouponPrice() != null ? goodsInfo.getCouponPrice() : goodsInfo.getZkPrice();

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

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



         BigDecimal maxCommission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());

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

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



         moneyInfoVO.setMaxMoney("¥" + maxCommission);



         if (baseCommisstion != null) {

            String desc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  commission.subtract(baseCommisstion).setScale(2).toString());

            String maxDesc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  maxCommission.subtract(baseCommisstion).setScale(2).toString());

            moneyInfoVO.setCompositionInfo(desc);

            moneyInfoVO.setMaxCompositionInfo(maxDesc);

         }

      }

      goodsInfo.setMoneyInfo(moneyInfoVO);



      // 店铺信息

      String mallName = goods.getMallName();

      if (!StringUtil.isMobile(mallName)) {

@@ -614,6 +871,220 @@
         if (goods.getMallId() != null) {

            shop.setId(goods.getMallId().toString());

         }

         shop.setUserType(30);

         goodsInfo.setShopInfo(shop);

      }



      // if (Constant.IS_TEST) {

      // // 添加标签

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

      // if (labels == null)

      // labels = new ArrayList<>();

      //

      // labels.add(new ClientTextStyleVO("预售", "#FF2B4E"));

      // labels.add(new ClientTextStyleVO("爆款", "#FF2B4E"));

      // labels.add(new ClientTextStyleVO("超级划算", "#FF2B4E"));

      // goodsInfo.setLabels(labels);

      // }

      return goodsInfo;

   }



   public static GoodsDetailVO convertVIPGoods(VIPGoodsInfo goods, ConfigParamsDTO params) {

      GoodsDetailVO goodsInfo = new GoodsDetailVO();

      goodsInfo.setBaoyou(true);

      goodsInfo.setGoodsType(Constant.SOURCE_TYPE_VIP);

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

      goodsInfo.setTitle(goods.getGoodsName());

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

      goodsInfo.setPriceName("原价");

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

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



      Integer state = goods.getStatus();

      if (state == null) {

         goodsInfo.setState(0);

      } else {

         goodsInfo.setState(goods.getStatus() == 1 ? CommonGoods.STATE_OFFLINE : CommonGoods.STATE_NORMAL);

      }



      goodsInfo.setSalesCount("");



      // 资金信息

      MoneyInfoVO moneyInfoVO = new MoneyInfoVO();

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

      BigDecimal commission = VipShopUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());

      moneyInfoVO.setFanliMoney("¥" + commission);

      moneyInfoVO.setShareMoney("¥" + commission);



      BigDecimal baseCommisstion = null;

      if (params.getBaseFanliRate() != null)

         baseCommisstion = VipShopUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate());



      if (params.getMaxRewardRate() != null)

         moneyInfoVO

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

      else {

         BigDecimal price = new BigDecimal(goods.getVipPrice());

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

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



         BigDecimal maxCommission = VipShopUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());

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

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



         moneyInfoVO.setMaxMoney("¥" + maxCommission);



         if (baseCommisstion != null) {

            String desc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  commission.subtract(baseCommisstion).setScale(2).toString());

            String maxDesc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  maxCommission.subtract(baseCommisstion).setScale(2).toString());

            moneyInfoVO.setCompositionInfo(desc);

            moneyInfoVO.setMaxCompositionInfo(maxDesc);

         }

      }

      goodsInfo.setMoneyInfo(moneyInfoVO);



      // 店铺信息

      String mallName = goods.getBrandName();

      if (!StringUtil.isNullOrEmpty(mallName)) {

         ShopInfoVO shop = new ShopInfoVO();

         shop.setShopName(mallName);

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

            shop.setId(goods.getBrandId().toString());

         }

         shop.setUserType(30);

         goodsInfo.setShopInfo(shop);

      }



      // 折扣信息

      goodsInfo.setDiscount(MoneyBigDecimalUtil

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

      goodsInfo.setShopInfo(null);

      return goodsInfo;

   }



   public static GoodsDetailVO convertSuningGoods(SuningGoodsInfo goods, ConfigParamsDTO params) {

      GoodsDetailVO goodsInfo = new GoodsDetailVO();

      goodsInfo.setBaoyou(true);

      goodsInfo.setGoodsType(Constant.SOURCE_TYPE_SUNING);

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

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

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

      goodsInfo.setSalesType(1); // 月销

      goodsInfo.setPriceName("原价");

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

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

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

      for (SuningGoodsImg img : goods.getCommodityInfo().getPictureUrl()) {

         imgList.add(img.getPicUrl());

      }



      goodsInfo.setImgList(imgList);

      goodsInfo.setState(0);



      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())) {// 有券

         CouponInfoVO coupon = new CouponInfoVO();

         coupon.setAmount(new BigDecimal(goods.getCouponInfo().getCouponValue()));

         coupon.setStartFee(new BigDecimal(goods.getCouponInfo().getBounsLimit()));



         if (goods.getCouponInfo().getCouponStartTime() != null) {

            coupon.setStartTime(goods.getCouponInfo().getCouponStartTime());

         }



         if (goods.getCouponInfo().getCouponEndTime() != null) {

            coupon.setEndTime(goods.getCouponInfo().getCouponEndTime());

         }



         if (goods.getCouponInfo().getCouponCount() != null)

            coupon.setTotalCount(Integer.parseInt(goods.getCouponInfo().getCouponCount()));



         if (goods.getCouponInfo().getCouponCount() != null)

            coupon.setLeftCount(Integer.parseInt(goods.getCouponInfo().getCouponCount()));



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

      }



      // 资金信息

      MoneyInfoVO moneyInfoVO = new MoneyInfoVO();

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

      BigDecimal commission = SuningUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());

      moneyInfoVO.setFanliMoney("¥" + commission);

      moneyInfoVO.setShareMoney("¥" + commission);



      BigDecimal baseCommisstion = null;

      if (params.getBaseFanliRate() != null)

         baseCommisstion = SuningUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate());



      if (params.getMaxRewardRate() != null)

         moneyInfoVO

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

      else {

         BigDecimal price = new BigDecimal(commodityPrice);

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

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



         BigDecimal maxCommission = SuningUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());

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

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



         moneyInfoVO.setMaxMoney("¥" + maxCommission);



         if (baseCommisstion != null) {

            String desc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  commission.subtract(baseCommisstion).setScale(2).toString());

            String maxDesc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  maxCommission.subtract(baseCommisstion).setScale(2).toString());

            moneyInfoVO.setCompositionInfo(desc);

            moneyInfoVO.setMaxCompositionInfo(maxDesc);

         }

      }

      goodsInfo.setMoneyInfo(moneyInfoVO);



      // 店铺信息

      String mallName = goods.getCommodityInfo().getSupplierName();

      if (!StringUtil.isMobile(mallName)) {

         ShopInfoVO shop = new ShopInfoVO();

         shop.setShopName(mallName);

         if (goods.getCommodityInfo().getSupplierCode() != null) {

            shop.setId(goods.getCommodityInfo().getSupplierCode());

         }

         shop.setUserType(30);

         goodsInfo.setShopInfo(shop);

      }