fanli-server.git

			@@ -26,6 +26,7 @@
			import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
			import com.yeshi.fanli.service.inter.user.UserInfoService;
			import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
			import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.VersionUtil;
			import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
			@@ -54,6 +55,9 @@

			@Resource
			private UserInfoExtraService userInfoExtraService;

			@Resource
			private UserVIPInfoService userVIPInfoService;

			@RequestMapping("getMianDanGoodsList")
			public void getMianDanGoodsList(AcceptData acceptData, PrintWriter out, int page, int pageSize, String callback) {
			@@ -180,6 +184,7 @@
			userJson.put("nickName", user.getNickName());
			userJson.put("portrait", user.getPortrait());
			userJson.put("id", user.getId());
			userJson.put("vip", userVIPInfoService.isVIP(user.getId()));

			JSONObject data = new JSONObject();
			data.put("user", userJson);

			@@ -65,7 +65,7 @@
			</update>

			<select id="listValid" resultMap="BaseResultVOMap">
			SELECT p.*,u.`nick_name`,u.`portrait`,e.`uie_invite_code` FROM
			SELECT p.*,u.`nick_name`,u.`portrait`,IF(e.uie_invite_code_vip is null, e.`uie_invite_code`,uie_invite_code_vip) as uie_invite_code FROM
			yeshi_ec_code_publish_record p
			LEFT JOIN `yeshi_ec_user` u ON u.`id` =
			p.`pr_uid`

			@@ -728,6 +728,10 @@
			return value;
			}
			}
			String id = JDUtil.getJDGoodsId(realLink);
			if (!StringUtil.isNullOrEmpty(id)) {
			return id;
			}
			LogHelper.error("京东短接解析失败:" + url);
			return null;
			}

			@@ -2145,7 +2145,7 @@
			Matcher m = r.matcher(str);
			while (m.find()) {
			String group = m.group(0);
			if (!StringUtil.isNullOrEmpty(group))
			if (!StringUtil.isNullOrEmpty(group) && group.length() >= 10)
			return group;
			}
			return null;

	fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史