fanli-server.git

			@@ -1636,14 +1636,8 @@

			listswiper = swiperPictureService.getByBannerCard(swiperCard);

			if (listswiper != null && listswiper.size() > 0) {
			for (SwiperPicture swiperPicture : listswiper) {
			swiperPicture.setBannerId(null);
			swiperPicture.setCreatetime(null);
			swiperPicture.setUpdatetime(null);
			swiperPicture.setState(null);
			swiperPicture.setRemark(null);
			}
			if (listswiper == null) {
			listswiper = new ArrayList<SwiperPicture>();
			}

			} catch (Exception e) {
			@@ -1661,12 +1655,6 @@

			if (listSpecial != null && listSpecial.size() > 0) {
			for (Special special : listSpecial) {
			special.setCreatetime(null);
			special.setUpdatetime(null);
			special.setState(null);
			special.setRemark(null);
			special.setCard(null);
			special.setCardId(null);

			if ("限时秒杀".equals(special.getName())) {
			miaoShaSpecial = special;
			@@ -1680,6 +1668,7 @@
			// 其他专题
			specialList.add(special);
			}

			}
			}

			@@ -1713,10 +1702,12 @@
			}

			JSONObject root = new JSONObject();
			root.put("banner", listswiper);
			root.put("honest", honestList);
			root.put("special", specialList);

			root.put("banner", JsonUtil.getApiCommonGson().toJson(listswiper));
			root.put("honest", JsonUtil.getApiCommonGson().toJson(honestList));
			root.put("special", JsonUtil.getApiCommonGson().toJson(specialList));
			root.put("miaoSha", msJSON);


			// 增加邀请有奖
			JSONObject invite = new JSONObject();

			@@ -12,6 +12,7 @@
			import javax.persistence.ManyToOne;
			import javax.persistence.Table;

			import com.google.gson.annotations.Expose;
			import com.yeshi.fanli.entity.common.JumpDetailV2;

			@Entity
			@@ -31,15 +32,18 @@
			@org.yeshi.utils.mybatis.Column(name = "pic_banner_id")
			private Long bannerId;

			@Expose
			@JoinColumn(name = "pic_src")
			@org.yeshi.utils.mybatis.Column(name = "pic_src")
			private String src;

			@Expose
			@ManyToOne(fetch = FetchType.EAGER)
			@JoinColumn(name = "pic_jumpid")
			@org.yeshi.utils.mybatis.Column(name = "pic_jumpid")
			private JumpDetailV2 jumpDetail;

			@Expose
			@JoinColumn(name = "pic_params")
			@org.yeshi.utils.mybatis.Column(name = "pic_params")
			private String params;

			@@ -113,6 +113,7 @@


			@Override
			@Cacheable(value = "configCache", key = "'listPageBySystemAndCard-'+#start+'-'+#count+'-'+#card+'-'+#systemId")
			public List<Special> listPageBySystemAndCard(long start, int count, String card, Long systemId) {
			return specialMapper.listPageBySystemAndCard(start, count, card, systemId);
			}

	fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史