配置文件修改

admin

2019-11-23 51a4ff5d777028d52a19c314a99f796334cb7b51

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

@@ -9,6 +9,7 @@


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;

@@ -47,13 +48,14 @@
   /**

    * 淘宝商品组织

    * 

    * @param goods     淘宝商品

    * @param goods

    *            淘宝商品

    * @param pid

    * @param fanLiRate 返利比例

    * @param fanLiRate

    *            返利比例

    * @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.setTitle(goods.getTitle());

@@ -87,30 +89,41 @@
      if (goodsType == Constant.SOURCE_TYPE_JD) {

         // 月销量

         goodsInfo.setSalesType(1);

			


         Integer isFreeShipping = otherDTO.getIsFreeShipping();

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

            goodsInfo.setBaoyou(true);

         }

			


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

         // 自营

         String owner = otherDTO.getOwner();

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

            List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();

            if (labels == null) {

               labels = new ArrayList<ClientTextStyleVO>();

            }

            ClientTextStyleVO textStyleVO = new ClientTextStyleVO();

            textStyleVO.setContent("京东自营");

            textStyleVO.setColor("#E42219");

            labels.add(textStyleVO);

            goodsInfo.setLabels(labels);

         }

         // 拼团价

         JDPingouInfo pinGouInfo = otherDTO.getPinGouInfo();

         if (pinGouInfo != null) {

            goods.setPrice(pinGouInfo.getPingouPrice());

            goodsInfo.setPriceName("拼购价");



            if (labels == null) {

               labels = new ArrayList<ClientTextStyleVO>();

            }

            ClientTextStyleVO textStyleVO = new ClientTextStyleVO();

            textStyleVO.setContent("拼购");

            textStyleVO.setColor("#E42219");

            labels.add(textStyleVO);

         } else {

            goodsInfo.setPriceName("京东价");

         }

         goodsInfo.setLabels(labels);

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

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

         goodsInfo.setPriceName("拼团价");

@@ -122,7 +135,12 @@


      goodsInfo.setGoodsType(goodsType);

      goodsInfo.setZkPrice(goods.getPrice());

      goodsInfo.setState(goods.getState());

      Integer state = goods.getState();

      if (state == null) {

         goodsInfo.setState(0);

      } else {

         goodsInfo.setState(goods.getState());

      }

      goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getSales()));



      if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {

@@ -139,12 +157,15 @@
      // 资金信息

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

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

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

      goodsInfo.setMoneyInfo(moneyInfoVO);



      // 券信息

      if (goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {

      if (goods.getCouponAmount() != null && goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {

         // 计算券后价

         BigDecimal sub = goods.getPrice().subtract(goods.getCouponStartPrice());

         if (sub.compareTo(BigDecimal.valueOf(0)) >= 0) {

@@ -163,29 +184,51 @@
         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 (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;

   }



   /**

    * 淘宝商品组织

    * 

    * @param goods     淘宝商品

    * @param goods

    *            淘宝商品

    * @param pid

    * @param fanLiRate 返利比例

    * @param fanLiRate

    *            返利比例

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

@@ -215,9 +258,14 @@
         TaoBaoHongBaoInfo taoBaoHongBaoInfo = goods.getTaoBaoHongBaoInfo();

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

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

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

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

      } else {

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

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

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

         moneyInfoVO.setFanliMoney("¥" + commission);

         moneyInfoVO

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

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

      }

      goodsInfo.setMoneyInfo(moneyInfoVO);



@@ -243,13 +291,34 @@


      // 店铺信息

      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;

   }

@@ -257,13 +326,14 @@
   /**

    * 淘宝商品组织

    * 

    * @param goods     淘宝商品

    * @param goods

    *            淘宝商品

    * @param pid

    * @param fanLiRate 返利比例

    * @param fanLiRate

    *            返利比例

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

@@ -271,6 +341,12 @@
      goodsInfo.setTitle(goods.getTitle());

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

      goodsInfo.setZkPrice(goods.getZkPrice());



      String provcity = goods.getProvcity();

      if (!StringUtil.isNullOrEmpty(provcity)) {

         String[] arr = provcity.split("\\s+");

         goodsInfo.setProvcity(arr[arr.length - 1]);

      }



      List<String> imgList = goods.getImgList();

      if (imgList != null) {

@@ -290,6 +366,8 @@


      goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getBiz30day()));



      // 白底图可能有错误

      // https://img.alicdn.com/bao/uploaded/TB1LVqmVZbpK1RjSZFyXXX_qFXa.png

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

         goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPictUrlWhite()));

      } else {

@@ -308,8 +386,10 @@
      // 资金信息

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

      moneyInfoVO.setFanliMoney("¥" + commission);

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

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

      goodsInfo.setMoneyInfo(moneyInfoVO);



      // 券信息

@@ -335,7 +415,7 @@
            coupon.setStartTime(goods.getCouponEffectiveStartTime().replace("-", "."));

         }



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

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

         coupon.setStartFee(goods.getCouponStartFee());



         goodsInfo.setHasCoupon(true);

@@ -343,25 +423,64 @@
      }



      // 店铺信息

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

   }



   private static GoodsDetailVO loadYuShouInfo(GoodsDetailVO goodsInfo, TaoBaoGoodsBrief goods, String pid,

         BigDecimal fanLiRate, BigDecimal shareRate) {



      if (goodsInfo != null && goods != null) {

         // 添加标签

         if (goodsInfo.getLabels() == null)

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

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

      }

      return goodsInfo;

   }



   /**

    * 淘宝商品组织

    * 

    * @param goods     淘宝商品

    * @param goods

    *            淘宝商品

    * @param pid

    * @param fanLiRate 返利比例

    * @param fanLiRate

    *            返利比例

    * @return

    */

   public static GoodsDetailVO convertJDGoods(JDGoods goods, String pid, 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());

@@ -382,23 +501,16 @@
      }

      goodsInfo.setSalesCount(salesCountMidea);



      JDPingouInfo pinGouInfo = goods.getPinGouInfo();

      if (pinGouInfo != null) {

         goodsInfo.setZkPrice(pinGouInfo.getPingouPrice());

         goodsInfo.setPriceName("拼购价");

      } else {

         goodsInfo.setZkPrice(goods.getPrice());

         goodsInfo.setPriceName("京东价");

      }



      // 资金信息

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

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

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

         // 计算券后价

@@ -407,6 +519,8 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");

         CouponInfoVO coupon = new CouponInfoVO();

         coupon.setAmount(discount);

         coupon.setLink(couponInfo.getLink());

         coupon.setStartFee(couponInfo.getQuota());



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

            coupon.setStartTime(sdf.format(new Date(couponInfo.getGetStartTime())));

@@ -416,26 +530,43 @@
            coupon.setEndTime(sdf.format(new Date(couponInfo.getGetEndTime())));

         }



         coupon.setLink(couponInfo.getLink());

         coupon.setStartFee(couponInfo.getQuota());



         goodsInfo.setHasCoupon(true);

         goodsInfo.setCouponInfo(coupon);

      }



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

      // 京东自营标签

      String owner = goods.getOwner();

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

         List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();

         goodsInfo.setShopType(21); // 京东自营

         if (labels == null) {

            labels = new ArrayList<ClientTextStyleVO>();

         }

         ClientTextStyleVO textStyleVO = new ClientTextStyleVO();

         textStyleVO.setContent("京东自营");

         textStyleVO.setColor("#E42219");

         labels.add(textStyleVO);

         goodsInfo.setLabels(labels);

         goodsInfo.setShopType(21); // 京东自营

      } else {

         goodsInfo.setShopType(20); // 京东

      }



      JDPingouInfo pinGouInfo = goods.getPinGouInfo();

      if (pinGouInfo != null) {

         goodsInfo.setZkPrice(pinGouInfo.getPingouPrice());

         goodsInfo.setPriceName("拼购价");



         if (labels == null) {

            labels = new ArrayList<ClientTextStyleVO>();

         }

         ClientTextStyleVO textStyleVO = new ClientTextStyleVO();

         textStyleVO.setContent("拼购");

         textStyleVO.setColor("#E42219");

         labels.add(textStyleVO);

      } else {

         goodsInfo.setZkPrice(goods.getPrice());

         goodsInfo.setPriceName("京东价");

      }

      goodsInfo.setLabels(labels);



      // 店铺信息

      JDShopInfo shopInfo = goods.getShopInfo();

@@ -443,6 +574,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 {

@@ -450,25 +582,27 @@
         }

         goodsInfo.setShopInfo(shop);

      }

		


      // 是否包邮

      Integer isFreeShipping = goods.getIsFreeShipping();

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

         goodsInfo.setBaoyou(true);

      }



      return goodsInfo;

   }



   /**

    * 拼多多商品

    * 

    * @param goods     拼多多商品

    * @param goods

    *            拼多多商品

    * @param pid

    * @param fanLiRate 返利比例

    * @param fanLiRate

    *            返利比例

    * @return

    */

   public static GoodsDetailVO convertPDDGoods(PDDGoodsDetail goods, String pid, 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);

@@ -503,8 +637,10 @@
      // 资金信息

      MoneyInfoVO moneyInfoVO = new MoneyInfoVO();

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

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

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

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

      moneyInfoVO.setFanliMoney("¥" + commission);

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

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

      goodsInfo.setMoneyInfo(moneyInfoVO);



      Boolean hasCoupon = goods.getHasCoupon();

@@ -526,6 +662,7 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");

         CouponInfoVO coupon = new CouponInfoVO();

         coupon.setAmount(amount);

         coupon.setStartFee(startFree);



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

            coupon.setStartTime(sdf.format(new Date(goods.getCouponStartTime() * 1000)));

@@ -534,9 +671,6 @@
         if (goods.getCouponEndTime() != null) {

            coupon.setEndTime(sdf.format(new Date(goods.getCouponEndTime() * 1000)));

         }



         coupon.setLink(null);

         coupon.setStartFee(startFree);



         if (goods.getCouponTotalQuantity() != null)

            coupon.setTotalCount(Integer.parseInt(goods.getCouponTotalQuantity().toString()));

@@ -556,9 +690,21 @@
         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;

   }