用户统计

yujian

2020-06-11 20bb4f95184453d4addfd27e40a78f3c63bcf6c3

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

@@ -17,7 +17,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

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

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

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

@@ -52,6 +51,7 @@
import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.vo.user.UserDialogBtnVO;

import com.yeshi.fanli.vo.user.UserDialogVO;

import com.yeshi.fanli.vo.user.VIPUpgradedNotifyVO;

@@ -334,10 +334,10 @@
               data.put("banner", new JSONArray());

            } else {

               // 我的界面banner

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

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

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

               if (banner == null)

                  banner = new ArrayList<SwiperPicture>();

                  banner = new ArrayList<BannerVO>();

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

            }

         }

@@ -433,6 +433,16 @@
               }

            }

         }

			
         // 云发单链接

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

            // 验证是否开启

            String cloudState = configService.getByVersion(ConfigKeyEnum.robotCloudOpen.getKey(), acceptData.getPlatform(),

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

            if (!StringUtil.isNullOrEmpty(cloudState) && "1".equals(cloudState)) {

               data.put("cloudLink", configService.get(ConfigKeyEnum.robotCloudLink.getKey())); 
            }

         }

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

      } catch (Exception e) {

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