yujian
2019-03-01 9dedfa92c34c92d42230e151766726a8e4a7806f
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
@@ -17,8 +17,10 @@
import com.yeshi.fanli.entity.taobao.TBPid;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONObject;
@@ -42,6 +44,9 @@
   @Resource
   private TaoBaoUnionConfigService taoBaoUnionConfigService;
   @Resource
   private CommonOrderCountService commonOrderCountService;
   /**
    * 首页配置信息
    * 
@@ -49,11 +54,26 @@
    * @param out
    */
   @RequestMapping(value = "getHomeConfig", method = RequestMethod.POST)
   public void getHomeConfig(AcceptData acceptData, PrintWriter out) {
   public void getHomeConfig(AcceptData acceptData, Long uid, PrintWriter out) {
      AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
      if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST)
         appHomeFloatImg = null;
      JSONObject data = new JSONObject();
      if (appHomeFloatImg != null)
         data.put("floatImg", appHomeFloatImg);
      String notifyImg = configService.getAppHomeFloatNotifyImg();
      if (!StringUtil.isNullOrEmpty(notifyImg)) {
         data.put("floatNotifyImg", notifyImg);
      }
      //
      String config = configService.get("home_float_img_new");
      if (!StringUtil.isNullOrEmpty(config)) {
         if (uid != null) {
            if (!commonOrderCountService.hasRebateAndShareOrder(uid))
               data.put("floatImgDetail", config);
         } else
            data.put("floatImgDetail", config);
      }
      out.print(JsonUtil.loadTrueResult(data));
   }