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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java

@@ -1,14 +1,12 @@
package com.yeshi.fanli.controller.apph5;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.Date;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

@@ -19,19 +17,22 @@
import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.push.DeviceActive;

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.goods.CommonGoods;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

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;

import com.yeshi.fanli.service.inter.push.PushGoodsService;

import com.yeshi.fanli.util.StringUtil;

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



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



/**

 * 今日推送

@@ -60,6 +61,9 @@


   @Resource

   private PushGoodsRecordService pushGoodsRecordService;

	
   @Resource

   private HongBaoManageService hongBaoManageService;



   /**

    * 推送商品详情页

@@ -92,8 +96,7 @@
         if (list != null && list.size() > 0) {



            Map<String, String> map = manageService.convertMap();

            String proportion = map.get("hongbao_goods_proportion");

            String fcRate = map.get("hongbao_fc_ratio");

            BigDecimal proportion = hongBaoManageService.getFanLiRate();



            for (PushGoodsGroup pushGoodsGroup : list) {

               CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();

@@ -117,7 +120,7 @@
                  commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));

               }



               array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, fcRate, null)));

               array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null)));

            }

         }