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

Dev

See merge request quanshu/mp-server!342

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

@@ -458,14 +458,14 @@ public class IndexMgrController extends BaseApiController {
 		List<IndexVO> siteList = 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);
 		
 
 		QueryWrapper<Channel> siteQueryWrapper = new QueryWrapper<>();
-		siteQueryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
-		siteQueryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getEndTime());
+		siteQueryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		siteQueryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		siteQueryWrapper.eq("t1.`level`", 0);
 		
 		Long channelId = SecurityUtils.getLoginUser().getChannelId();

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

@@ -136,7 +136,7 @@ public class UserMineController extends BaseApiController {
     JSONObject result = new JSONObject();
     result.put("prizeNum", Integer.valueOf(String.valueOf(null != storageMap ? storageMap.get("total") : 0)) + couponCnt);
 
-    int ticketNum = userTicketOrderItemService.countMyTicket(userId, TicketStatusEnum.ACTIVATED);
+    int ticketNum = userTicketOrderItemService.countMyTicket(userId, null);
     result.put("ticketNum", ticketNum);
 
     UserCoin userCoin = userCoinService.getById(userId);

mp-admin/src/main/resources/application-dev.yml

@@ -29,7 +29,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://110.40.236.236:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=UTC
+                url: jdbc:mysql://110.40.236.236:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: mptest
                 password: wan789*@dfhzHu518!dr2xosn
                 # 从库数据源

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderItemServiceImpl.java

@@ -47,7 +47,7 @@ public class UserTicketOrderItemServiceImpl extends ServiceImpl<UserTicketOrderI
   public int countMyTicket(Long userId, TicketStatusEnum status) {
     return getBaseMapper().countMyTicket(new QueryWrapper<UserTicketOrderItem>()
         .eq("t1.user_id", userId).eq("t2.status", UserTicketOrderStatusEnum.FINISHED)
-        .eq("t3.status", status));
+        .eq(null != status, "t3.status", status));
   }
 
   @Override