帮助中心

yujian

2019-12-19 626d711cb15896055c13fe344eb7fcc824589715

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java

@@ -17,6 +17,7 @@
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.bus.user.UserExtraTaoBaoInfo;

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

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

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

@@ -24,19 +25,22 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

import com.yeshi.fanli.service.inter.redpack.RedPackWinNewUserService;

import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService;

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

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

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.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.jd.JDUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

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



import net.sf.json.JSONObject;

@@ -79,7 +83,13 @@
   private UserActiveLogService userActiveLogService;



   @Resource

   private RedPackWinNewUserService redPackWinNewUserService;

   private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService;



   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



   @Resource

   private RedisManager redisManager;



   /**

    * s 首页配置信息

@@ -159,20 +169,23 @@
      // 活动弹框

      List<FloatAD> listAD = new ArrayList<FloatAD>();

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

		


      List<FloatAD> list = floatADService.getValidByPosition(FloatAD.POSITION_INDEX);

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

         listAD.addAll(list);

	


      for (int i = 0; i < listAD.size(); i++) {

         FloatAD floatAD = listAD.get(i);

         FloatADTypeEnum typeEnum = floatAD.getTypeEnum();

         if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid, acceptData.getDevice())) {

         if (typeEnum == FloatADTypeEnum.newUserRedPack

               && (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())

                     || !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) {



            listAD.remove(i);

            i--;

            continue;

         }

			


         JumpDetailV2 jumpDetail = floatAD.getJumpDetail();

         if (jumpDetail != null) {

            jumpDetail = jumpDetailV2Service.selectByPrimaryKey(jumpDetail.getId());

@@ -196,6 +209,7 @@


      JSONObject data = new JSONObject();

      data.put("listAD", JsonUtil.getApiCommonGson().toJson(listVO));

      data.put("protocol", configService.get("user_protocol_home_data"));



      // 领券帮助链接,1.5.2后生效

      String couponHelp = configService.get("taobao_coupon_help");

@@ -477,9 +491,30 @@
    */

   @RequestMapping(value = "getElemeLink")

   public void getElemeLink(AcceptData acceptData, Long uid, String callback, PrintWriter out) {



      UserExtraTaoBaoInfo userInfoExtra = userExtraTaoBaoInfoService.getByUid(uid);

      if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getRelationId())) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "请绑定淘宝")));

         return;

      }

      String elmeLink = redisManager.getCommonString("elme-link-" + uid);

      if (StringUtil.isNullOrEmpty(elmeLink)) {

         elmeLink = TaoKeApiUtil.officialActivityConvert(TaoBaoConstant.TAOBAO_ELEME_PID.split("_")[3],

               "1571715733668", userInfoExtra.getRelationId());

         if (!StringUtil.isNullOrEmpty(elmeLink)) {

            redisManager.cacheCommonString("elme-link-" + uid, elmeLink, 60 * 60);// 缓存1个小时

         }

      }



      JSONObject data = new JSONObject();

      data.put("hongBao", configService.get("eleme_hongbao_link").replace("{用户ID}", uid + ""));

      data.put("goods", configService.get("eleme_goods_link").replace("{用户ID}", uid + ""));



      // data.put("hongBao",

      // configService.get("eleme_hongbao_link").replace("{用户ID}", uid + ""));

      // data.put("goods",

      // configService.get("eleme_goods_link").replace("{用户ID}", uid + ""));



      data.put("hongBao", elmeLink);

      data.put("goods", elmeLink);



      ClientTBPid clientTBPid1 = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_ELEME_PID,

            null, TaoBaoConstant.TAOBAO_ELEME_PID.split("_")[3]);