系统区分BUG修复

admin

2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d

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

@@ -15,7 +15,6 @@


import com.yeshi.fanli.dto.WXMPAcceptData;

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

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

import com.yeshi.fanli.entity.common.JumpDetailV2;

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

import com.yeshi.fanli.entity.system.BusinessSystem;

@@ -30,6 +29,7 @@
import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.vo.homemodule.BannerVO;

import com.yeshi.fanli.vo.homemodule.FloatImgDetailVO;



import net.sf.json.JSONArray;

@@ -64,13 +64,12 @@
    * 获取系统配置信息

    * 

    * @param acceptData

    * @param code

    * @param out

    */

   @RequestMapping("getSystemClientConfig")

   public void getOpenId(WXMPAcceptData acceptData, HttpServletRequest request, PrintWriter out) {

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getAppId());

            acceptData.getAppId(),acceptData.getSystem());

      if (system == null) {

         out.print("系统不存在");

         return;

@@ -114,18 +113,18 @@
   public void getUserConfig(WXMPAcceptData acceptData, PrintWriter out) {

      try {

         // 用户协议链接

         String serviceProtocol = configService.get(ConfigKeyEnum.serviceProtocolLink.getKey());

         String serviceProtocol = configService.getValue(ConfigKeyEnum.serviceProtocolLink.getKey(),acceptData.getSystem());

         // 隐私条款链接

         String privacyProtocol = configService.get(ConfigKeyEnum.privacyProtocolLink.getKey());

         String privacyProtocol = configService.getValue(ConfigKeyEnum.privacyProtocolLink.getKey(),acceptData.getSystem());

         JSONObject data = new JSONObject();

         data.put("serviceProtocolLink", serviceProtocol);

         data.put("privacyProtocolLink", privacyProtocol);



         // 我的界面banner

         List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",

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

         List<BannerVO> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",

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

         if (banner == null)

            banner = new ArrayList<SwiperPicture>();

            banner = new ArrayList<BannerVO>();

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



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

@@ -154,7 +153,7 @@
      List<FloatAD> listAD = new ArrayList<FloatAD>();

      List<FloatImgDetailVO> listVO = new ArrayList<FloatImgDetailVO>();

      List<FloatAD> list = floatADService.getValidFloatADCache(FloatAD.POSITION_INDEX, null, platform,

            Integer.parseInt(version));

            Integer.parseInt(version),acceptData.getSystem());

      if (list != null && !list.isEmpty())

         listAD.addAll(list);