Merge remote-tracking branch 'origin/master'

admin

2019-06-25 9bc638153a436e30806d16a0c5b8d844d9f812f4

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java

@@ -50,7 +50,6 @@
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

@@ -69,6 +68,7 @@
import com.yeshi.fanli.util.factory.MonitorFactory;

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

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

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

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;



import net.sf.json.JSONArray;

@@ -134,9 +134,6 @@
   

   @Resource

   private ConfigTaoLiJinService configTaoLiJinService;

	
   @Resource

   private GoodsTaoLiJinRateService goodsTaoLiJinRateService;



   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;

@@ -319,10 +316,14 @@
         

         TaoBaoGoodsBrief goods = taoBaoLink.getGoods();

         

         BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods);

			
         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value");

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);

			
         // 推广红包 不能小于1

         if (spreadMoney.compareTo(new BigDecimal(1)) < 0) {

            out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足1元"));

         if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {

            out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足"));

            return;

         }

         

@@ -390,7 +391,7 @@
                  .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")

                  .replace("{优惠券面额}",

                        MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())

                  .replace("{淘礼金面额}", MoneyBigDecimalUtil.getWithNoZera(goodsTaoLiJinRateService.getGoodsSpreadMoney(taoBaoLink.getGoods())).toString())

                  .replace("{淘礼金面额}", MoneyBigDecimalUtil.getWithNoZera(spreadMoney).toString())

                  .replace("{优惠券价}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + "");

         }