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

Mp server test

See merge request quanshu/mp-server!398

mp-admin/pom.xml

@@ -17,6 +17,13 @@
 
     <dependencies>
 
+        <!-- swagger 增强-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>2.0.8</version>
+        </dependency>
+
         <!-- spring-boot-devtools -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -24,19 +31,6 @@
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
 
-        <!-- swagger3-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-        </dependency>
-
-        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
          <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>

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

@@ -450,41 +450,46 @@ public class IndexMgrController extends BaseApiController {
 	// @PreAuthorize("@ss.hasPermi('business:channel:list')")
 	public AjaxResult listDailyData(@RequestBody IndexQueryParam indeQueryParam) {
 		
+		// 今天
 		IndexQueryParam queryParam = new IndexQueryParam();
-		queryParam.setStartTime(DateUtils.getPreDayOfNowZero(1));  // 昨天
+		queryParam.setStartTime(DateUtils.getPreDayOfNowZero(0));  // 今天0点
 		queryParam.setEndTime(new Date());  // 今天
 		
-		List<IndexVO> list = new ArrayList<IndexVO>();
-		List<IndexVO> siteList = new ArrayList<IndexVO>();
+		List<IndexVO> todayList = new ArrayList<IndexVO>();
+		List<IndexVO> yestodayList = new ArrayList<IndexVO>();
+		List<IndexVO> todaySiteList = new ArrayList<IndexVO>();
+		List<IndexVO> yetodaySiteList = new ArrayList<IndexVO>();
 		
-		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
-		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<UserTicketOrder> queryWrapper1 = new QueryWrapper<>();
+		queryWrapper1.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		queryWrapper1.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
+		queryWrapper1.gt("t1.`status`", 0);
+		todayList = userTicketOrderService.selectIndexDailyInfoList(queryWrapper1);
 		
-
-		QueryWrapper<Channel> siteQueryWrapper = new QueryWrapper<>();
-		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);
+		QueryWrapper<Channel> siteQueryWrapper1 = new QueryWrapper<>();
+		siteQueryWrapper1.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		siteQueryWrapper1.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
+		siteQueryWrapper1.eq("t1.`level`", 0);
+		todaySiteList = channelService.selectIndexSiteIncreaseList(siteQueryWrapper1);
 		
-//		Long channelId = SecurityUtils.getLoginUser().getChannelId();
-//		if(null != channelId && 0 != channelId) {
-//			Channel channel = channelService.getById(channelId);
-//			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
-//				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
-//						.or().eq("t2.channel_no", channel.getChannelNo()));
-//				
-//				siteQueryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
-//						.or().eq("t2.channel_no", channel.getChannelNo()));
-//			}
-//		}
-	
-		list = userTicketOrderService.selectIndexDailyInfoList(queryWrapper);
-	
-		siteList = channelService.selectIndexSiteIncreaseList(siteQueryWrapper);
+		// 昨天
+		queryParam.setStartTime(DateUtils.getPreDayOfNowZero(1));  // 昨天0点
+		queryParam.setEndTime(DateUtils.getPreDayOfNow(1));  // 今天减去24小时
+		
+		QueryWrapper<UserTicketOrder> queryWrapper2 = new QueryWrapper<>();
+		queryWrapper2.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		queryWrapper2.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
+		queryWrapper2.gt("t1.`status`", 0);
+		yestodayList = userTicketOrderService.selectIndexDailyInfoList(queryWrapper2);
 		
-		return  AjaxResult.success(getDailyInfoData(list, siteList));
+
+		QueryWrapper<Channel> siteQueryWrapper2 = new QueryWrapper<>();
+		siteQueryWrapper2.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		siteQueryWrapper2.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
+		siteQueryWrapper2.eq("t1.`level`", 0);
+		yetodaySiteList = channelService.selectIndexSiteIncreaseList(siteQueryWrapper2);
+		
+		return  AjaxResult.success(calcDailyInfoData(todayList, yestodayList, todaySiteList, yetodaySiteList));
 	}
 	
 	
@@ -551,6 +556,82 @@ public class IndexMgrController extends BaseApiController {
 		return map;
 	} 
 	
+	
+	@SuppressWarnings("unused")
+	private Map<String,Object> calcDailyInfoData(List<IndexVO> todayList, List<IndexVO> yetodayList,  List<IndexVO> todaySiteList, List<IndexVO> yetodaySiteList){
+		Map<String,Object> payAmt = new HashMap<String,Object>();
+		Map<String,Object> payUser = new HashMap<String,Object>();
+		Map<String,Object> ticketNum = new HashMap<String,Object>();
+		Map<String,Object> newSite = new HashMap<String,Object>();
+		
+		String today = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,new Date());
+		
+		int todayPayAmt = 0;
+		int todayPayUserCnt = 0;
+		int todayTicketNum = 0;
+		int todayNewSiteCnt = 0;
+		
+		int yesterdayPayAmt = 0;
+		int yesterdayPayUserCnt = 0;
+		int yesterdayTicketNum = 0;
+		int yesterdayNewSiteCnt = 0;
+		
+		if(null != todayList && todayList.size() > 0) {
+			for(IndexVO indexVo : todayList) {
+				if(null != indexVo 
+						&& StringUtils.isNotBlank(indexVo.getTime())) {
+					todayPayAmt +=  null != indexVo.getPayAmt()?indexVo.getPayAmt():0;
+					todayPayUserCnt +=  null != indexVo.getPayUserCnt()?indexVo.getPayUserCnt():0;
+					todayTicketNum += null != indexVo.getTicketNum()?indexVo.getTicketNum():0;
+				}
+			}
+		}
+		
+		if(null != yetodayList && yetodayList.size() > 0) {
+			for(IndexVO indexVo : yetodayList) {
+				if(null != indexVo) {
+					yesterdayPayAmt += null != indexVo.getPayAmt()?indexVo.getPayAmt():0;
+					yesterdayPayUserCnt += null != indexVo.getPayUserCnt()?indexVo.getPayUserCnt():0;
+					yesterdayTicketNum +=  null != indexVo.getTicketNum()?indexVo.getTicketNum():0;
+				}
+			}
+		}
+		
+		if(null != todaySiteList && todaySiteList.size() > 0) {
+			for(IndexVO indexVo : todaySiteList) {
+				if(null != indexVo 
+						&& null != indexVo.getNewSiteCnt()) {
+					todayNewSiteCnt += null != indexVo.getNewSiteCnt()?indexVo.getNewSiteCnt():0;
+				}
+			}
+		}
+		
+		if(null != yetodaySiteList && yetodaySiteList.size() > 0) {
+			for(IndexVO indexVo : yetodaySiteList) {
+				if(null != indexVo 
+						&& null != indexVo.getNewSiteCnt()) {
+					yesterdayNewSiteCnt += null != indexVo.getNewSiteCnt()?indexVo.getNewSiteCnt():0;
+				}
+			}
+		}
+		
+		payAmt.put("today", todayPayAmt);
+		payAmt.put("yesterday", yesterdayPayAmt);
+		payUser.put("today", todayPayUserCnt);
+		payUser.put("yesterday", yesterdayPayUserCnt);
+		ticketNum.put("today", todayTicketNum);
+		ticketNum.put("yesterday", yesterdayTicketNum);
+		newSite.put("today", todayNewSiteCnt);
+		newSite.put("yesterday", yesterdayNewSiteCnt);
+		
+		Map<String,Object> map = new HashMap<String,Object>();
+		map.put("payAmt", payAmt);
+		map.put("payUser", payUser);
+		map.put("ticketNum", ticketNum);
+		map.put("newSite", newSite);
+		return map;
+	} 
+	
 	/**
 	 * 查询统计统计票组销售TOP10
 	 * @return

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

@@ -75,6 +75,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		QueryWrapper<UserDeliverOrder> queryWrapper = new QueryWrapper<UserDeliverOrder>();
 		queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getOrderId()), "t1.order_id", queryParam.getOrderId());
 		queryWrapper.eq(null != queryParam && null != queryParam.getStatus(), "t1.`status`", queryParam.getStatus());
+		queryWrapper.eq(null != queryParam && null != queryParam.getTel(), "t1.`tel`", queryParam.getTel());
 		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.like(null != queryParam && StringUtils.isNotBlank(queryParam.getNickName()), "t2.nick_name", queryParam.getNickName());

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

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
+import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
 import com.qs.mp.admin.domain.Ticket;
 import com.qs.mp.admin.domain.TicketAwardsPrize;
 import com.qs.mp.admin.domain.TicketBox;
@@ -242,6 +244,10 @@ public class UserTicketController extends BaseApiController {
 
   @PostMapping("/ticket/hitPrizeBarrage")
   @ApiOperation(value = "中奖弹幕", notes = "获取最近中奖的 20-22 条信息")
+  @DynamicResponseParameters(properties = {
+    @DynamicParameter(name = "listOne", value = "列表 1",required = true, dataTypeClass = TicketHitPrizeBarrageVO.class),
+    @DynamicParameter(name = "listTwo", value = "列表 2",required = true, dataTypeClass = TicketHitPrizeBarrageVO.class)
+  })
   public AjaxResult hitPrizeBarrage() {
 
     // 获取用户 id

mp-admin/src/main/java/com/qs/mp/web/core/config/SwaggerConfig.java

@@ -21,6 +21,7 @@ import springfox.documentation.service.SecurityScheme;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 /**
  * Swagger2的接口配置
@@ -28,6 +29,7 @@ import springfox.documentation.spring.web.plugins.Docket;
  * @author ygp
  */
 @Configuration
+@EnableSwagger2WebMvc
 public class SwaggerConfig
 {
     /** 系统基础配置 */
@@ -42,68 +44,109 @@ public class SwaggerConfig
     @Value("${swagger.pathMapping}")
     private String pathMapping;
 
-    /**
-     * 创建API
-     */
+
+
     @Bean
-    public Docket createRestApi()
-    {
-        return new Docket(DocumentationType.OAS_30)
-                // 是否启用Swagger
+    public Docket defaultApi1() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .enable(enabled)
+                .apiInfo(apiInfo())
+                .groupName("管理端接口")
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.qs.mp.web.controller.api.admin"))
+                .paths(PathSelectors.any())
+                .build();
+
+    }
+
+    @Bean
+    public Docket defaultApi2() {
+        return new Docket(DocumentationType.SWAGGER_2)
                 .enable(enabled)
-                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
                 .apiInfo(apiInfo())
-                // 设置哪些接口暴露给Swagger展示
+                .groupName("用户端接口")
                 .select()
-                // 扫描所有有注解的api，用这种方式更灵活
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                // 扫描指定包中的swagger注解
-                // .apis(RequestHandlerSelectors.basePackage("com.qs.mp.project.tool.swagger"))
-                // 扫描所有 .apis(RequestHandlerSelectors.any())
+                .apis(RequestHandlerSelectors.basePackage("com.qs.mp.web.controller.api.user"))
                 .paths(PathSelectors.any())
-                .build()
-                /* 设置安全模式，swagger可以设置访问token */
-                .securitySchemes(securitySchemes())
-                .securityContexts(securityContexts())
-                .pathMapping(pathMapping);
+                .build();
+
     }
 
+    @Bean
+    public Docket defaultApi3() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .enable(enabled)
+                .apiInfo(apiInfo())
+                .groupName("渠道端接口")
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.qs.mp.web.controller.api.channel"))
+                .paths(PathSelectors.any())
+                .build();
+
+    }
+
+
+
     /**
-     * 安全模式，这里指定token通过Authorization头请求头传递
+     * 创建API
      */
-    private List<SecurityScheme> securitySchemes()
-    {
-        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
-        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
-        return apiKeyList;
-    }
+//    @Bean
+//    public Docket createRestApi()
+//    {
+//        return new Docket(DocumentationType.SWAGGER_2)
+//                // 是否启用Swagger
+//                .enable(enabled)
+//                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
+//                .apiInfo(apiInfo())
+//                // 设置哪些接口暴露给Swagger展示
+//                .select()
+//                // 扫描所有有注解的api，用这种方式更灵活
+//                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+//                // 扫描指定包中的swagger注解
+//                // .apis(RequestHandlerSelectors.basePackage("com.qs.mp.project.tool.swagger"))
+//                // 扫描所有 .apis(RequestHandlerSelectors.any())
+//                .paths(PathSelectors.any())
+//                .build()
+//
+//                .pathMapping(pathMapping);
+//    }
 
     /**
-     * 安全上下文
+     * 安全模式，这里指定token通过Authorization头请求头传递
      */
-    private List<SecurityContext> securityContexts()
-    {
-        List<SecurityContext> securityContexts = new ArrayList<>();
-        securityContexts.add(
-                SecurityContext.builder()
-                        .securityReferences(defaultAuth())
-                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
-                        .build());
-        return securityContexts;
-    }
+//    private List<SecurityScheme> securitySchemes()
+//    {
+//        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
+//        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
+//        return apiKeyList;
+//    }
 
     /**
-     * 默认的安全上引用
+     * 安全上下文
      */
-    private List<SecurityReference> defaultAuth()
-    {
-        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
-        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
-        authorizationScopes[0] = authorizationScope;
-        List<SecurityReference> securityReferences = new ArrayList<>();
-        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
-        return securityReferences;
-    }
+//    private List<SecurityContext> securityContexts()
+//    {
+//        List<SecurityContext> securityContexts = new ArrayList<>();
+//        securityContexts.add(
+//                SecurityContext.builder()
+//                        .securityReferences(defaultAuth())
+//                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
+//                        .build());
+//        return securityContexts;
+//    }
+//
+//    /**
+//     * 默认的安全上引用
+//     */
+//    private List<SecurityReference> defaultAuth()
+//    {
+//        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+//        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+//        authorizationScopes[0] = authorizationScope;
+//        List<SecurityReference> securityReferences = new ArrayList<>();
+//        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
+//        return securityReferences;
+//    }
 
     /**
      * 添加摘要信息
@@ -113,9 +156,9 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：旺铺管家_接口文档")
+                .title("标题：盲票_接口文档")
                 // 描述
-                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+                .description("描述：用于管理盲票各端接口信息...")
                 // 作者信息
                 .contact(new Contact(mpConfig.getName(), null, null))
                 // 版本

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

@@ -99,6 +99,11 @@ server:
   # 环境标识
   env: test
 
+# Swagger配置
+swagger:
+  # 请求前缀
+  pathMapping: /test-api
+
 
 #API访问
 client:

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

@@ -87,7 +87,9 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping: /
+knife4j:
+  enable: true
 
 # 防止XSS攻击
 xss:

mp-common/pom.xml

@@ -18,11 +18,17 @@
      <properties>
         <hutool.version>5.3.1</hutool.version>
         <lombok.version>1.18.10</lombok.version>
-         <swagger.version>3.0.0</swagger.version>
     </properties>
 
     <dependencies>
 
+        <!-- swagger 增强-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>2.0.8</version>
+        </dependency>
+
         <!-- Spring框架基本的核心工具 -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -210,18 +216,6 @@
            <scope>compile</scope>
         </dependency>
 
-         <!-- Swagger3依赖 -->
-         <dependency>
-             <groupId>io.springfox</groupId>
-             <artifactId>springfox-boot-starter</artifactId>
-             <version>${swagger.version}</version>
-             <exclusions>
-                 <exclusion>
-                     <groupId>io.swagger</groupId>
-                     <artifactId>swagger-models</artifactId>
-                 </exclusion>
-             </exclusions>
-         </dependency>
 
     </dependencies>
 

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

@@ -1,6 +1,7 @@
 package com.qs.mp.common.utils;
 
 import java.security.MessageDigest;
+import java.util.Iterator;
 /** 
  * 说明：MD5处理
  * 创建人：FH Q313596790

mp-quartz/src/main/java/com/qs/mp/quartz/task/PictureTask.java

@@ -0,0 +1,78 @@
+package com.qs.mp.quartz.task;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.qs.mp.admin.domain.Goods;
+import com.qs.mp.admin.service.IGoodsService;
+import com.qs.mp.admin.service.impl.GoodsServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 图片相关处理任务
+ *
+ * @author Cup
+ * @date 2022/4/18
+ */
+@Component("pictureTask")
+public class PictureTask {
+
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+
+
+    @Autowired
+    private IGoodsService goodsService;
+
+
+    public void detailPictureReplace(Long goodsId) {
+        List<Goods> goodsList = new ArrayList<>();
+        Goods goods = goodsService.getById(goodsId);
+        if (goods != null) {
+            goodsList.add(goods);
+            pictureReplace(goodsList);
+        }
+    }
+
+    public void detailPictureReplace() {
+        List<Goods> goodsList = goodsService.list();
+        if (CollectionUtils.isNotEmpty(goodsList)) {
+            pictureReplace(goodsList);
+        }
+
+    }
+
+    /**
+     * 商品详情图片处理方法
+     */
+    private void pictureReplace(List<Goods> goodsList) {
+        if (CollectionUtils.isNotEmpty(goodsList)) {
+            List<Goods> params = new ArrayList<>();
+            for (Goods goods : goodsList) {
+                String desc = goods.getDescription();
+                if (StringUtils.isBlank(desc)) {
+                    continue;
+                }
+                // 将字符串中所有的.jpg和.png 替换为.jpg_s和.png_s
+                String result = desc.replaceAll(".jpg\"", ".jpg_s\"").replaceAll(".jpeg\"", ".jpeg_s\"").replaceAll(".png\"", ".png_s\"");
+                Goods param = new Goods();
+                param.setGoodsId(goods.getGoodsId());
+                param.setDescription(result);
+                params.add(param);
+            }
+
+            // 批量修改商品详情图片
+            if (CollectionUtils.isNotEmpty(params)) {
+                goodsService.updateBatchById(params);
+            }
+        }
+    }
+
+
+
+}

mp-service/src/main/java/com/qs/mp/admin/domain/param/UserDeliverOrderQueryParam.java

@@ -31,6 +31,9 @@ public class UserDeliverOrderQueryParam {
 	@ApiModelProperty(value = "订单状态", required = false)
 	private Integer status;
 
+	@ApiModelProperty(value = "收货人手机号", required = false)
+	private String tel;
+
 	/**
 	 * 下单区间-开始时间
 	 */

mp-service/src/main/resources/mapper/user/UserTicketOrderMapper.xml

@@ -54,7 +54,7 @@
 		select 
           DATE_FORMAT(t1.created_time, '%Y%m%d') AS time,
           SUM(t1.pay_amt) AS payAmt,
-          SUM(IFNULL(t1.ticket_num,0)) AS 'ticketNum',
+          SUM(IFNULL(t1.ticket_num,0)) AS ticketNum,
           COUNT(DISTINCT t1.user_id) AS payUserCnt
 	     from `mp_user_ticket_order` t1
 		${ew.customSqlSegment}

pom.xml

@@ -20,7 +20,6 @@
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.6</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
-        <swagger.version>3.0.0</swagger.version>
         <orika.version>1.5.4</orika.version>
 		    <kaptcha.version>2.3.2</kaptcha.version>
 		    <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
@@ -147,18 +146,6 @@
                 <artifactId>orika-core</artifactId>
                 <version>${orika.version}</version>
             </dependency>
-            <!-- Swagger3依赖 -->
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-boot-starter</artifactId>
-                <version>${swagger.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-models</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
 
             <!-- io常用工具类 -->
             <dependency>