fanli-server.git

			@@ -238,6 +238,17 @@
			return;
			} else {
			tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);

			if (tb == null) {
			String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);
			if (!StringUtil.isNullOrEmpty(goodsId)) {
			tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);
			if (tb != null)
			type = 4;
			}
			}


			if (tb == null)// 淘宝是空值
			{
			String jdId = JDUtil.getJDGoodsId(text);

			@@ -27,6 +27,7 @@
			import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
			import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
			import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
			import com.yeshi.fanli.service.inter.user.BindRemindService;
			import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
			import com.yeshi.fanli.service.inter.user.ShamUserService;
			import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
			@@ -127,6 +128,9 @@

			@Resource
			private DeviceActiveService deviceActiveService;

			@Resource
			private BindRemindService bindRemindService;



			@@ -287,4 +291,23 @@
			}
			}

			/**
			* 绑定电话号码 V2.0.1 微信登录
			*
			* @param acceptData
			* @param vcode
			* @param phone
			* @param out
			*/
			@RequestMapping(value = "recordBind")
			public void recordBind(AcceptData acceptData, Long uid, PrintWriter out) {
			if (uid == null \|\| uid <= 0) {
			out.print(JsonUtil.loadFalseResult("用户id为空"));
			return;
			}

			bindRemindService.addBindPhone(uid);
			out.print(JsonUtil.loadTrueResult("记录成功"));
			}

			}

			@@ -114,6 +114,29 @@
			}
			}


			/**
			* 判断是否同一个月
			* @param date1
			* @param date2
			* @return
			*/
			public static boolean isSameMonth(Date date1, Date date2) {
			Calendar calendar1 = Calendar.getInstance();
			calendar1.setTime(date1);
			Calendar calendar2 = Calendar.getInstance();
			calendar2.setTime(date2);
			int year1 = calendar1.get(Calendar.YEAR);
			int year2 = calendar2.get(Calendar.YEAR);
			int month1 = calendar1.get(Calendar.MONTH);
			int month2 = calendar2.get(Calendar.MONTH);
			System.out.println(year1 + " " + month1);
			System.out.println(year2 + " " + month2);
			return calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR) && calendar1.get(Calendar.MONTH) == calendar2.get(Calendar.MONTH);
			}



			/**
			* 指定日期加上天数后的日期
			*

	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	utils/src/main/java/org/yeshi/utils/DateUtil.java	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史