首页悬浮图mapperbug修改，增加商品详情中的比例展示

admin

2020-01-01 c8f11c229b87d1652b6da0b15576c166cd51eb8b

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java

@@ -1,6 +1,8 @@
package com.yeshi.fanli.controller.client.v1;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;



import javax.annotation.Resource;



@@ -12,6 +14,8 @@


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

import com.yeshi.fanli.entity.bus.homemodule.FloatAD;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.homemodule.FloatAD.FloatADTypeEnum;

import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;

import com.yeshi.fanli.entity.bus.user.UserActiveLog;

import com.yeshi.fanli.entity.config.AppHomeFloatImg;

@@ -19,6 +23,7 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.homemodule.FloatADService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;

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

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

@@ -28,6 +33,7 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;



import net.sf.json.JSONObject;



@@ -67,6 +73,10 @@


   @Resource

   private UserActiveLogService userActiveLogService;

	
   @Resource

   private SwiperPictureService swiperPictureService;





   /**

    * s 首页配置信息

@@ -97,8 +107,7 @@


      // 无新人弹框 则查询默认

      FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);



      if (floatAD != null) {

      if (floatAD != null && floatAD.getTypeEnum() != FloatADTypeEnum.newUserRedPack) {

         JSONObject detail = new JSONObject();

         detail.put("img", floatAD.getPicture());

         detail.put("jumpDetail", floatAD.getJumpDetail());

@@ -242,6 +251,14 @@
         JSONObject source = JSONObject.fromObject(configService.getByVersion("taobao_cart_jump_detail",

               acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())));

         data.put("taoBaoCart", source);

			
         if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {

            // 我的界面banner

            List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

            if (banner == null)

               banner = new ArrayList<SwiperPicture>();

            data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));

         } 
         out.print(JsonUtil.loadTrueResult(data));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("获取失败"));