冲突提交

yujian

2019-03-12 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02

 fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java

@@ -15,6 +15,8 @@
import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.multipart.commons.CommonsMultipartFile;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.entity.bus.recommend.DynamicRecommend;

import com.yeshi.fanli.entity.bus.recommend.MaskKey;

@@ -34,8 +36,6 @@
import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

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

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.tencentcloud.COSManager;



import net.sf.json.JSONObject;



@@ -295,10 +295,10 @@
            return;

         }

         taoBaoGoodsBrief = taoBaoGoodsBriefs.get(0);

         String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

         BigDecimal proportion = hongBaoManageService.getFanLiRate();

         BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();

         BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();

         BigDecimal tkp = new BigDecimal(proportion).divide(BigDecimal.valueOf(100))

         BigDecimal tkp = proportion.divide(BigDecimal.valueOf(100))

               .multiply(tkRate.divide(BigDecimal.valueOf(100)));

         BigDecimal hongbao = MoneyBigDecimalUtil.mul(zkPrice, tkp);

         dynamicRecommend.setHongbao(hongbao);