fanli-server.git

			@@ -2021,39 +2021,40 @@
			});

			List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();

			try {
			List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id);

			if (listRecommend != null && listRecommend.size() > 1) {
			for (QualityFactory quality : listRecommend) {

			TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
			if (taoBaoGoodsBrief == null) {
			continue;
			}

			int biz30day = taoBaoGoodsBrief.getBiz30day();
			if (biz30day >= 10000) {
			double sales = biz30day;
			String salesCountMidea = String.format("%.1f", sales / 10000);
			taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");
			} else {
			taoBaoGoodsBrief.setSalesCount(biz30day + "");
			}

			// 改变图片尺寸
			String pictUrl = taoBaoGoodsBrief.getPictUrl();
			if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
			taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
			}

			listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));
			}
			}
			} catch (Exception e2) {
			e2.printStackTrace();
			}
			//删除推荐
			//
			// try {
			// List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id);
			//
			// if (listRecommend != null && listRecommend.size() > 1) {
			// for (QualityFactory quality : listRecommend) {
			//
			// TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
			// if (taoBaoGoodsBrief == null) {
			// continue;
			// }
			//
			// int biz30day = taoBaoGoodsBrief.getBiz30day();
			// if (biz30day >= 10000) {
			// double sales = biz30day;
			// String salesCountMidea = String.format("%.1f", sales / 10000);
			// taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");
			// } else {
			// taoBaoGoodsBrief.setSalesCount(biz30day + "");
			// }
			//
			// // 改变图片尺寸
			// String pictUrl = taoBaoGoodsBrief.getPictUrl();
			// if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
			// taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
			// }
			//
			// listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));
			// }
			// }
			// } catch (Exception e2) {
			// e2.printStackTrace();
			// }

			// 取偶数个数据
			if (listExtra.size() % 2 != 0) {

			@@ -476,20 +476,19 @@
			volist.add(vo);
			}

			Long time = System.currentTimeMillis();// userInfoService.selectByPKey(uid).getCreatetime();
			if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd"))
			count++;// 计算欢迎语的数量
			Long time = (uid == null ? System.currentTimeMillis() : userInfoService.selectByPKey(uid).getCreatetime());

			if (volist.size() > 0 && volist.size() < Constant.PAGE_SIZE) {
			// 添加欢迎语
			// 创建时间在28号后的才有新人欢迎
			if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd")) {
			if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") \|\| uid == null)) {
			UserHomeMsgVO vo = new UserHomeMsgVO();
			vo.setContent("恭喜你，成为返利券的用户\n独家优惠券帮你省钱；\n参与奖金活动帮你赚钱；\n让返利券成为你的省钱助手吧！");
			vo.setTitle("新人欢迎");
			vo.setCreateTime(getTimeDesc(now, new Date(time)));
			vo.setType(UserHomeMsgVO.TYPE_WELCOME);
			volist.add(vo);
			count++;
			}
			}

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