Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!343

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/IndexMgrController.java

@@ -59,8 +59,8 @@ public class IndexMgrController extends BaseApiController {
 		
 		List<IndexVO> list = new ArrayList<IndexVO>();
 		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
-		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
-		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getEndTime());
+		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
 		Long channelId = SecurityUtils.getLoginUser().getChannelId();
 		if(null != channelId && 0 != channelId) {
@@ -182,8 +182,8 @@ public class IndexMgrController extends BaseApiController {
 		
 		List<IndexVO> list = new ArrayList<IndexVO>();
 		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
-		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
-		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getEndTime());
+		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
 		Long channelId = SecurityUtils.getLoginUser().getChannelId();
 		if(null != channelId && 0 != channelId) {
@@ -305,7 +305,7 @@ public class IndexMgrController extends BaseApiController {
 		if(queryParam.getDays() == 0) { // 自定义
 			if(null != indeQueryParam.getStartTime() && null != indeQueryParam.getEndTime()) {
 				queryParam.setStartTime(indeQueryParam.getStartTime());
-				queryParam.setEndTime(indeQueryParam.getEndTime());
+				queryParam.setEndTime(DateUtils.getEndTimeOfNow(indeQueryParam.getEndTime()));
 			}else {
 				queryParam.setStartTime(DateUtils.getPreDayOfNowZero(6));
 				queryParam.setEndTime(new Date());
@@ -330,8 +330,8 @@ public class IndexMgrController extends BaseApiController {
 		
 		List<IndexVO> list = new ArrayList<IndexVO>();
 		QueryWrapper<Channel> queryWrapper = new QueryWrapper<>();
-		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
-		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getEndTime());
+		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.eq("t1.`level`", 0);
 		Long channelId = SecurityUtils.getLoginUser().getChannelId();
 		if(null != channelId && 0 != channelId) {

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserShareController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.domain.AjaxResult.Type;
 import com.qs.mp.framework.service.IWxUrlLinkService;
+import com.qs.mp.user.domain.vo.UserShareVO;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
@@ -42,6 +43,11 @@ public class UserShareController extends BaseApiController {
 		String boxId = jsonObject.getString("boxId"); // 票组ID
 		String type = jsonObject.getString("type"); // 分享类型，1/2
 		Long userId = SecurityUtils.getUserId();
+		if (UserShareVO.SHARE_TYPE_SITE.equals(type)) {
+			// 经销商分享，默认到盲票小程序首页
+			String rst = wxUrlLinkService.generateUnlimitCode("", userId + "&" + type, userAppId);
+			return new AjaxResult(Type.SUCCESS, "", rst);
+		}
 		String rst = wxUrlLinkService.generateUnlimitCode("pages/ticketBox/detail", boxId + "&" + userId + "&" + type, userAppId);
 		return new AjaxResult(Type.SUCCESS, "", rst);
 	}

mp-common/src/main/java/com/qs/mp/common/utils/DateUtils.java

@@ -280,6 +280,24 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 			return null;
 		}
   	 }
+  	 
+  	/** 
+   	 * 取得指定日期的最晚时间
+   	 */ 
+   	 public static Date getEndTimeOfNow(Date endDate) { 
+   		try {
+ 			Calendar c = Calendar.getInstance();
+ 		   	c.setTime(endDate);
+ 		   	c.set(Calendar.HOUR_OF_DAY, 23);
+ 		   	c.set(Calendar.MINUTE, 59);
+ 		   	c.set(Calendar.SECOND, 59);
+ 		    c.set(Calendar.MILLISECOND, 59);
+ 		   	return c.getTime(); 
+ 		} catch (Exception e) {
+ 			e.printStackTrace();
+ 			return null;
+ 		}
+   	 }
     
     /** 
      * @Title: getDateOfWeek