数据中心查询和导出增加时间段筛选

src/main/java/com/sqx/modules/datacentre/query/DataCenterQuery.java

@@ -12,5 +12,11 @@ public class DataCenterQuery extends PageQuery {
 
     @ApiModelProperty(value = "结束时间")
     private String endTime;
+
+    @ApiModelProperty(value = "日期")
+    private String date;
+
+    @ApiModelProperty(value = "类型")
+    private String dateType;
 }
 

src/main/java/com/sqx/modules/datacentre/query/ShopCenterQuery.java

@@ -25,7 +25,9 @@ public class ShopCenterQuery extends DataCenterQuery {
         stringBuilder
                 .append(StringUtils.hasText(getStartTime())?"开始时间："+getStartTime()+";":"")
                 .append(StringUtils.hasText(getEndTime())?"结束时间："+getEndTime()+";":"")
-                .append(StringUtils.hasText(shopType)?"商铺类型："+shopTypeName+";":"");
+                .append(StringUtils.hasText(shopType)?"商铺类型编号："+shopType+";":"")
+                .append(StringUtils.hasText(getDate())?"日期："+getDate()+";":"")
+                .append(StringUtils.hasText(getDateType())?"查询类型："+getDateType()+";":"");
         return stringBuilder.toString();
     }
 
@@ -34,6 +36,8 @@ public class ShopCenterQuery extends DataCenterQuery {
                 ","+(getStartTime()==null?"":getStartTime())
                 +","+(getEndTime()==null?"":getEndTime())
                 +","+(shopType==null?"":shopType)
+                +","+(getDate()==null?"":getDate())
+                +","+(getDateType()==null?"":getDateType())
                 +",";
     }
 }

src/main/java/com/sqx/modules/exportExecl/controller/ExportExeclController.java

@@ -159,7 +159,7 @@ public class ExportExeclController {
     @GetMapping("excelDeposit")
     @ApiOperation("导出保证金记录")
     public Result excelDeposit(WalletDetailQuery queryDTO) throws Exception{
-        if(queryDTO.getUserId()==null){
+        if(!StringUtils.hasText(queryDTO.getUserId())){
             return Result.error("用户id不能为空");
         }
         ExportJob exportJob =new ExportJob();
@@ -247,7 +247,7 @@ public class ExportExeclController {
     @GetMapping("excelShopCenter")
     @ApiOperation("导出商户收益统计")
     public Result excelShopCenter(ShopCenterQuery queryDTO) throws Exception{
-        if(queryDTO.getUserId()==null){
+        if(!StringUtils.hasText(queryDTO.getUserId())){
             return Result.error("用户id不能为空");
         }
         ExportJob exportJob =new ExportJob();

src/main/java/com/sqx/modules/pay/controller/query/CashOutQueryDTO.java

@@ -71,15 +71,15 @@ public class CashOutQueryDTO extends PageQuery {
                 .append(endTime==null||endTime==""?"":"结束时间："+endTime+";");
         if(state!=null){
             switch (state){
-                case 0: stringBuffer.append("状态：待转账;");
-                case 1: stringBuffer.append("状态：已转账;");
-                case 2: stringBuffer.append("状态：已拒绝;");
+                case 0: stringBuffer.append("状态：待转账;");break;
+                case 1: stringBuffer.append("状态：已转账;");break;
+                case 2: stringBuffer.append("状态：已拒绝;");break;
             }
         }
         if(StringUtils.hasText(type)){
             switch (type){
-                case "1": stringBuffer.append("状态：用户提现;");
-                case "2": stringBuffer.append("状态：退保证金;");
+                case "1": stringBuffer.append("状态：用户提现;");break;
+                case "2": stringBuffer.append("状态：退保证金;");break;
             }
         }
         return stringBuffer.toString();

src/main/java/com/sqx/modules/pay/controller/query/WalletDetailQuery.java

@@ -38,20 +38,20 @@ public class WalletDetailQuery extends PageQuery {
 
     public String toStrMessage() {
         StringBuilder stringBuilder=new StringBuilder();
-        stringBuilder.append(StringUtils.hasText(shopName)?"":"店铺名称："+shopName+";")
-                .append(StringUtils.hasText(startTime)?"":"开始时间："+startTime+";")
-                .append(StringUtils.hasText(endTime)?"":"截止时间："+endTime+";");
+        stringBuilder.append(!StringUtils.hasText(shopName)?"":"店铺名称："+shopName+";")
+                .append(!StringUtils.hasText(startTime)?"":"开始时间："+startTime+";")
+                .append(!StringUtils.hasText(endTime)?"":"截止时间："+endTime+";");
         if(StringUtils.hasText(type)){
             switch (type){
-                case "1": stringBuilder.append("状态：充值;");
-                case "2": stringBuilder.append("状态：提现;");
+                case "1": stringBuilder.append("状态：充值;");break;
+                case "2": stringBuilder.append("状态：提现;");break;
             }
         }
         if(StringUtils.hasText(classify)){
             switch (classify){
-                case "1": stringBuilder.append("明细类别：骑手保证金;");
-                case "2": stringBuilder.append("明细类别：商户保证金;");
-                case "3": stringBuilder.append("明细类别：钱包明细;");
+                case "1": stringBuilder.append("明细类别：骑手保证金;");break;
+                case "2": stringBuilder.append("明细类别：商户保证金;");break;
+                case "3": stringBuilder.append("明细类别：钱包明细;");break;
             }
         }
         return stringBuilder.toString();

src/main/java/com/sqx/modules/pay/vo/WalletDetailVO.java

@@ -33,5 +33,5 @@ public class WalletDetailVO {
     private BigDecimal money;
 
     @ApiModelProperty("创建时间")
-    private Date createTime;
+    private String createTime;
 }

src/main/java/com/sqx/scheduler/export/ExportScheduler.java

@@ -75,7 +75,7 @@ public class ExportScheduler {
     @GetMapping("excelOrder")
     public void orderExport() throws Exception {
         List<ExportJob> exportJobList=exportJobService.list(new QueryWrapper<ExportJob>()
-                .eq("flag",0).last("order by create_time limit 10"));
+                .eq("flag",3).last("order by create_time limit 10"));
         log.info("本次导出数据exportJobList==========="+exportJobList);
         if (null == exportJobList ||exportJobList.isEmpty()){
             return;
@@ -269,9 +269,11 @@ public class ExportScheduler {
     private ExcelData getShopCenterExcelData(ExportJob exportJob){
         String[] conditions=exportJob.getConditions().split(",",-1);
         ShopCenterQuery query =new ShopCenterQuery();
-        query.setShopType(conditions[1]);
-        query.setStartTime(conditions[2]);
-        query.setEndTime(conditions[3]);
+        query.setShopType(conditions[3]);
+        query.setStartTime(conditions[1]);
+        query.setEndTime(conditions[2]);
+        query.setDate(conditions[4]);
+        query.setDateType(conditions[5]);
         return dataCentreService.excelShopCenter(query);
     }
 }

src/main/resources/mapper/dataCentre/dataCenterMapper.xml

@@ -186,12 +186,21 @@
 
     <select id="selectNewShopCount" resultType="int">
         select count(*) from goods_shop where 1 = 1
-        <if test="query.startTime != null and query.startTime != ''">
-            and create_time >= #{query.startTime}
+        <if test="query.dateType=='day'">
+            and date_format(create_time,'%Y-%m-%d')=date_format(#{query.date},'%Y-%m-%d')
+        </if>
+        <if test="query.dateType=='month'">
+            and date_format(create_time,'%Y-%m')=date_format(#{query.date},'%Y-%m')
+        </if>
+        <if test="query.dateType=='year'">
+            and date_format(create_time,'%Y')=date_format(#{query.date},'%Y')
         </if>
         <if test="query.endTime != null and query.endTime != ''">
             and create_time <![CDATA[<=]]> #{query.endTime}
         </if>
+        <if test="query.startTime != null and query.startTime != ''">
+            and create_time >= #{query.startTime}
+        </if>
     </select>
 
     <select id="selectRankingList" resultType="com.sqx.modules.order.entity.TbOrder">
@@ -213,6 +222,15 @@
         <if test="query.shopType != null and query.shopType != '' ">
             and gp.id = #{query.shopType}
         </if>
+        <if test="query.dateType=='day'">
+            and date_format(tor.pay_time,'%Y-%m-%d')=date_format(#{query.date},'%Y-%m-%d')
+        </if>
+        <if test="query.dateType=='month'">
+            and date_format(tor.pay_time,'%Y-%m')=date_format(#{query.date},'%Y-%m')
+        </if>
+        <if test="query.dateType=='year'">
+            and date_format(tor.pay_time,'%Y')=date_format(#{query.date},'%Y')
+        </if>
         GROUP BY tor.shop_id ) a
         ORDER BY shopMoney DESC
     </select>
@@ -220,7 +238,7 @@
     <select id="excelShopCenter" resultType="com.sqx.modules.order.entity.TbOrder">
         SELECT
         *,
-        @rank_num := @rank_num + 1 AS rankNum
+        @rank_num := @rank_num + 1 AS Rank
         FROM
         ( SELECT @rank_num := 0 ) r,
         ( SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney, tor.shop_id , u.shop_name,gp.id as shopType,gp.shop_type_name as shopTypeName

src/main/resources/mapper/userMoney/UserMoneyDetailsMapper.xml

@@ -29,11 +29,11 @@
                 and umd.classify = #{query.classify}
             </if>
 
-            <if test="query.startTime != null">
+            <if test="query.startTime != null and query.startTime != ''">
                 and umd.create_time >= #{query.startTime}
             </if>
 
-            <if test="query.endTime != null">
+            <if test="query.endTime != null and query.endTime != ''">
                 and umd.create_time <![CDATA[<=]]> #{query.endTime}</if>
         </where>
     </sql>