Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java

@@ -26,6 +26,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.util.StringUtil;

@@ -42,6 +43,9 @@


   @Resource

   private HongBaoManageService hongBaoManageService;

	
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private TaoBaoShopService taoBaoShopService;

@@ -296,7 +300,7 @@
      int fh = sf.getHongbao();

      boolean ft = sf.isTmall();



       ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(platform, version);

       ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version);



      if (fq == 0 && fh == 0 && !ft) {

         if (result != null && result.getTaoBaoGoodsBriefs() != null)