券推送插入

yujian

2019-04-22 b6c37e4bc38db88a360d0f2c6099183f9bb75bdc

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -1309,8 +1309,11 @@
    *            用户再次分成比例（0-100）

    * @return

    */

   public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {

      return "¥" + getGoodsHongBaoMoney(goodsBrief, rate).toString();

   public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
      if (goodsBrief != null && goodsBrief.getMaterialLibType() != null && goodsBrief.getMaterialLibType() == 0)

         return "¥0.00";

      else
         return "¥" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
   }



   /**

@@ -1323,8 +1326,10 @@
   public static BigDecimal getGoodsHongBaoMoney(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {

      if (StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())

            || goodsBrief.getCouponInfo().trim().equalsIgnoreCase("无")) {

         return goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000)).multiply(rate)

               .setScale(2, BigDecimal.ROUND_DOWN);

         return MoneyBigDecimalUtil.mul(

               MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(goodsBrief.getZkPrice(), goodsBrief.getTkRate()),

                     new BigDecimal("0.01")),

               MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));

      } else// 有券

      {

         List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goodsBrief.getCouponInfo());

@@ -1333,11 +1338,14 @@
         if (startFee.compareTo(goodsBrief.getZkPrice()) <= 0

               && goodsBrief.getZkPrice().compareTo(couponAccount) > 0) {

            BigDecimal finalPrice = goodsBrief.getZkPrice().subtract(couponAccount);

            return finalPrice.multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000)).multiply(rate)

                  .setScale(2, BigDecimal.ROUND_DOWN);

            return MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil

                  .mul(MoneyBigDecimalUtil.mul(finalPrice, goodsBrief.getTkRate()), new BigDecimal("0.01")),

                  MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));



         } else {// 不能用券

            return goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000))

                  .multiply(rate).setScale(2, BigDecimal.ROUND_DOWN);

            return MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(

                  MoneyBigDecimalUtil.mul(goodsBrief.getZkPrice(), goodsBrief.getTkRate()),

                  new BigDecimal("0.01")), MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));

         }

      }

   }

@@ -1717,6 +1725,12 @@
            goods.setPictUrl(picture.startsWith("http") ? picture : "https:" + picture);

         }

         goods.setSellerId(seller.optLong("shopId"));

         String shopType = seller.optString("shopType");

         if ("B".equalsIgnoreCase(shopType)) {

            goods.setUserType(1);

         } else

            goods.setUserType(0);



         goods.setShopTitle(seller.optString("shopName"));

         return goods;

      }