2.0.7相关服务端功能添加

admin

2020-02-23 b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458

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

@@ -18,6 +18,8 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

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

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

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

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

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

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

import com.yeshi.fanli.entity.taobao.ClientTBPid;

@@ -31,10 +33,14 @@
import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.notify.UserActivedRecordService;

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 com.yeshi.fanli.vo.user.UserDialogBtnVO;

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



import net.sf.json.JSONObject;



@@ -74,10 +80,15 @@


   @Resource

   private UserActiveLogService userActiveLogService;

	


   @Resource

   private SwiperPictureService swiperPictureService;



   @Resource

   private UserActivedRecordService userActivedRecordService;



   @Resource

   private UserInfoService userInfoService;



   /**

    * s 首页配置信息

@@ -104,7 +115,6 @@
      if (!StringUtil.isNullOrEmpty(notifyImg)) {

         data.put("floatNotifyImg", notifyImg);

      }





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

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

@@ -138,8 +148,8 @@
      } else {// 老人

         data.put("userTimeType", 1);

      }

      data.put("hotFuctionLink",

            configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform, Integer.parseInt(acceptData.getVersion())));//

      data.put("hotFuctionLink", configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform,

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

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

   }



@@ -163,7 +173,8 @@
      }



      // 是否需要购物城转链

      boolean convert = "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoCartConvert.getKey())) ? false : true;

      boolean convert = "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoCartConvert.getKey())) ? false

            : true;



      if (!"cart".equalsIgnoreCase(position) && !convert) {

         out.print(JsonUtil.loadFalseResult(""));

@@ -238,8 +249,37 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



   /**

    * 关闭提醒

    * 
    * @param acceptData

    * @param uid

    * @param id

    * @param type

    *            0-关闭 1-点击右边按钮 2-点击左边按钮

    * @param out

    */

   @RequestMapping(value = "closeDialogNotify", method = RequestMethod.POST)

   public void closeDialogNotify(AcceptData acceptData, Long uid, String id, int type, PrintWriter out) {



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("用户未登录"));

         return;

      }

      if (StringUtil.isNullOrEmpty(id)) {

         out.print(JsonUtil.loadFalseResult("id为空"));

         return;

      }

      if (id.equalsIgnoreCase("tearcherNotify")) {

         userActivedRecordService.setTearcherNotified(uid);

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

      } else {

         out.print(JsonUtil.loadFalseResult("id不存在"));

      }

   }



   @RequestMapping(value = "getUserConfig", method = RequestMethod.POST)

   public void getUserConfig(AcceptData acceptData, PrintWriter out) {

   public void getUserConfig(AcceptData acceptData, Long uid, PrintWriter out) {

      try {

         // 用户协议链接

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

@@ -249,17 +289,55 @@
         data.put("serviceProtocolLink", serviceProtocol);

         data.put("privacyProtocolLink", privacyProtocol);

         // 购物车跳转方式(包含jumpDetail与params)

         JSONObject source = JSONObject.fromObject(configService.getByVersion(ConfigKeyEnum.taobaoCartJumpDetail.getKey(),

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

         JSONObject source = JSONObject

               .fromObject(configService.getByVersion(ConfigKeyEnum.taobaoCartJumpDetail.getKey(),

                     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()));

            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));

         } 
         }



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

            // 转链的网页链接

            String convertLinkUrl = configService.get(ConfigKeyEnum.convertDocWebLink.getKey());

            data.put("convertLinkUrl", convertLinkUrl);

            if (uid != null) {



               String tearcherLink = configService.getByVersion(ConfigKeyEnum.tearcherLink.getKey(),

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

               if (userActivedRecordService.canNotifyAddTearcher(uid)) {

                  UserInfo userInfo = userInfoService.selectAvailableByPrimaryKey(uid);

                  if (userInfo != null) {

                     JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web",

                           Constant.getPlatformCode(acceptData.getPlatform()),

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



                     JSONObject negativeParams = new JSONObject();

                     negativeParams.put("url", configService.getByVersion(ConfigKeyEnum.newerGonglue.getKey(),

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



                     JSONObject positiveParams = new JSONObject();

                     positiveParams.put("url", tearcherLink);



                     UserDialogVO dialog = new UserDialogVO("tearcherNotify", true,

                           "HI," + userInfo.getNickName(),

                           "我是你的导师，为你在省赚过程中解难答疑，对你一对一辅导，倾听你的需求总结并反馈给板栗快省官方运营团队，快来添加我吧。",

                           new UserDialogBtnVO("复制导师微信", jumpDetail, positiveParams),

                           new UserDialogBtnVO("去新手攻略", jumpDetail, negativeParams));

                     data.put("dialog", dialog);

                  }

               }



               data.put("tearcherLink", tearcherLink);

            }



         }

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

      } catch (Exception e) {

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

@@ -306,7 +384,8 @@
   public void getOrderConfig(AcceptData acceptData, PrintWriter out) {

      JSONObject data = new JSONObject();

      // 测试

      data.put("showTaoBaoOrder", "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoOrder.getKey()).trim()) ? false : true);

      data.put("showTaoBaoOrder",

            "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoOrder.getKey()).trim()) ? false : true);

      data.put("taoBaoOrderUrl", "https://main.m.taobao.com/olist/index.html");

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

   }