admin
2020-11-25 604be616a6ba9e2604c8616be562c5a1c49f073c
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
@@ -22,8 +22,8 @@
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
import com.yeshi.fanli.entity.push.PushGoodsRecord;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
import com.yeshi.fanli.service.inter.push.PushGoodsRecordService;
@@ -95,8 +95,8 @@
         if (list != null && list.size() > 0) {
            Map<String, String> map = manageService.convertMap();
            BigDecimal proportion = hongBaoManageService.getFanLiRate();
            Map<String, String> map = manageService.convertMap(acceptData.getSystem());
            BigDecimal proportion = hongBaoManageService.getFanLiRate(acceptData.getSystem());
            for (PushGoodsGroup pushGoodsGroup : list) {
               CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();