Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

watero-common-tool/src/main/java/com/iamberry/wechat/tools/payUtil/DatetimeUtil.java

@@ -172,4 +172,21 @@ public class DatetimeUtil {
 		calendar.set(Calendar.DAY_OF_MONTH, 0);
 		return DatetimeUtil.formatDate(calendar.getTime()) + " 23:59:59";
 	}
+	public static Date getDayBegin(Date date) throws ParseException {
+		Calendar todayStart = Calendar.getInstance();
+		todayStart.setTime(date);
+		todayStart.set(Calendar.HOUR_OF_DAY, 0);
+		todayStart.set(Calendar.MINUTE, 0);
+		todayStart.set(Calendar.SECOND, 0);
+		return new Date(todayStart.getTime().getTime());
+	}
+
+	public static Date getDayEnd(Date date) throws ParseException {
+		Calendar todayStart = Calendar.getInstance();
+		todayStart.setTime(date);
+		todayStart.set(Calendar.HOUR_OF_DAY, 23);
+		todayStart.set(Calendar.MINUTE, 59);
+		todayStart.set(Calendar.SECOND, 59);
+		return new Date(todayStart.getTime().getTime());
+	}
 }