fanli-server.git

			@@ -102,6 +102,7 @@
			import com.yeshi.fanli.service.inter.user.TBPidService;
			import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
			import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
			import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
			import com.yeshi.fanli.service.inter.user.UserInfoService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.RedisManager;
			@@ -233,6 +234,9 @@

			@Resource
			private ShareGoodsActivityOrderService shareGoodsActivityOrderService;

			@Resource
			private UserInfoExtraService userInfoExtraService;

			@RequestMapping(value = "getrecommendsection")
			public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
			@@ -2214,9 +2218,8 @@
			out.print(JsonUtil.loadTrueResult(data));
			}


			/**
			* 活动列表
			* 活动列表
			*
			* @param acceptData
			* @param out
			@@ -2229,13 +2232,13 @@
			out.print(JsonUtil.loadFalseResult(1, "系统不存在"));
			return;
			}


			try {
			// 专题活动
			String specialCard = "special_activities";

			List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE,
			specialCard, system.getId());

			List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
			system.getId());

			if (listSpecial != null && listSpecial.size() > 0) {
			for (Special special : listSpecial) {
			@@ -2245,12 +2248,19 @@
			special.setRemark(null);
			special.setCard(null);
			special.setCardId(null);


			// 手动替换参数
			if (special.getName() != null && special.getName().contains("邀请")) {
			// userInfoExtraService

			}

			JumpDetailV2 jumpDetail = special.getJumpDetail();
			if (jumpDetail != null) {
			jumpDetail.setId(null);
			jumpDetail.setName(null);
			}

			}
			}

			@@ -361,13 +361,21 @@
			}

			String key = "recommend-goods-user-" + uid;
			if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
			redisManager.cacheCommonString(key, "1", 20);
			if (Constant.IS_OUTNET) {
			if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
			if (Constant.IS_OUTNET)
			redisManager.cacheCommonString(key, "1", 20);
			if (hour < 12)
			addRecommendGoods(uid);
			else
			addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
			session.removeAttribute("recommendgoods");
			}
			} else {
			if (hour < 12)
			addRecommendGoods(uid);
			else
			addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
			session.removeAttribute("recommendgoods");
			}
			}

	fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史