Accept Merge Request #79: (dev-首页优化 -> master)

Merge Request: 订单查询拼接开始结束时间

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/79

src/main/java/com/sqx/common/utils/DateUtils.java

@@ -1,5 +1,6 @@
 package com.sqx.common.utils;
 
+import com.sqx.modules.datacentre.query.DataCenterQuery;
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
@@ -156,4 +157,41 @@ public class DateUtils {
         DateTime dateTime = new DateTime(date);
         return dateTime.plusYears(years).toDate();
     }
+    /**
+     * 获取str日期的当天/当月/当年的结束时间
+     *数据中心用
+     */
+    public static DataCenterQuery dateStrEndTime(DataCenterQuery query) {
+        if ("day".equals(query.getDateType())){
+            Date day= DateUtils.stringToDate(query.getDate().substring(0,10),"yyyy-MM-dd");
+            query.setStartTime(query.getDate().substring(0,10)+" 00:00:00");
+            query.setEndTime(format(addDateDays(day,1)));
+        }else if ("month".equals(query.getDateType())){
+            Date day= DateUtils.stringToDate(query.getDate().substring(0,7),"yyyy-MM");
+            query.setStartTime(query.getDate().substring(0,7)+"-01 00:00:00");
+            query.setEndTime(format(addDateMonths(day,1)));
+        }else if ("year".equals(query.getDateType())){
+            Date day= DateUtils.stringToDate(query.getDate().substring(0,4),"yyyy");
+            query.setStartTime(query.getDate().substring(0,4)+"-01-01 00:00:00");
+            query.setEndTime(format(addDateYears(day,1)));
+        }
+        return query;
+    }
+    /**
+     * 获取str日期的当天/当月/当年的结束时间
+     *数据中心用
+     */
+    public static String dateStrEndTime(String dateStr,String dateType) {
+        if ("day".equals(dateType)){
+            Date day= DateUtils.stringToDate(dateStr.substring(0,10),"yyyy-MM-dd");
+            return format(addDateDays(day,1));
+        }else if ("month".equals(dateType)){
+            Date day= DateUtils.stringToDate(dateStr.substring(0,7),"yyyy-MM");
+            return format(addDateMonths(day,1));
+        }else if ("year".equals(dateType)){
+            Date day= DateUtils.stringToDate(dateStr.substring(0,4),"yyyy");
+            return format(addDateYears(day,1));
+        }
+        return dateStr;
+    }
 }

src/main/java/com/sqx/modules/datacentre/dao/DataCentreDao.java

@@ -29,13 +29,13 @@ public interface DataCentreDao {
 
     int findYearAddUser(String format);
 
-    BigDecimal findDayIncome(String format);
+    BigDecimal findDayIncome(String starTime,String endTime);
 
-    BigDecimal findMonthIncome(String format);
+//    BigDecimal findMonthIncome(String format);
 
-    BigDecimal findYearIncome(String format);
+//    BigDecimal findYearIncome(String format);
 
-    int findIndentCount(String format);
+    int findIndentCount(String starTime,String endTime);
 
     IPage<TbOrder> selectPayOrderAnalyze(Page<TbOrder> pages, @Param("query") DataCenterQuery query);
 

src/main/java/com/sqx/modules/datacentre/service/impl/DataCentreServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sqx.common.utils.DateUtils;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.dao.UserDao;
@@ -80,13 +81,13 @@ public class DataCentreServiceImpl implements DataCentreService {
         //本年新增用户数
         int yearAddUser = dataCentreDao.findYearAddUser(format);
         //今日收入
-        BigDecimal dayIncome = dataCentreDao.findDayIncome(format);
+        BigDecimal dayIncome = dataCentreDao.findDayIncome(format.substring(0,10)+" 00:00:00",DateUtils.dateStrEndTime(format,"day"));
         //本月收入
-        BigDecimal monthIncome = dataCentreDao.findMonthIncome(format);
+        BigDecimal monthIncome = dataCentreDao.findDayIncome(format.substring(0,7)+"-01 00:00:00",DateUtils.dateStrEndTime(format,"month"));
         //本年收入
-        BigDecimal yearIncome = dataCentreDao.findYearIncome(format);
+        BigDecimal yearIncome = dataCentreDao.findDayIncome(format.substring(0,4)+"-01-01 00:00:00",DateUtils.dateStrEndTime(format,"year"));
         //今日接单数量
-        int indentCount = dataCentreDao.findIndentCount(format);
+        int indentCount = dataCentreDao.findIndentCount(format.substring(0,10)+" 00:00:00",DateUtils.dateStrEndTime(format,"day"));
         dataCenter.put("allCount", allCount);
         dataCenter.put("dayAddUser", dayAddUser);
         dataCenter.put("monthAddUser", monthAddUser);
@@ -101,7 +102,7 @@ public class DataCentreServiceImpl implements DataCentreService {
     @Override
     public Result selectPayOrderAnalyze(DataCenterQuery query) {
         Page<TbOrder> pages=new Page<>(query.getPage(),query.getLimit());
-        PageUtils pageUtils = new PageUtils(dataCentreDao.selectPayOrderAnalyze(pages, query));
+        PageUtils pageUtils = new PageUtils(dataCentreDao.selectPayOrderAnalyze(pages, DateUtils.dateStrEndTime(query)));
         return Result.success().put("data", pageUtils);
     }
 
@@ -136,7 +137,8 @@ public class DataCentreServiceImpl implements DataCentreService {
     }
 
     @Override
-    public Result selectOrderData(DataCenterQuery query) {
+    public Result selectOrderData(DataCenterQuery oldQuery) {
+        DataCenterQuery query=DateUtils.dateStrEndTime(oldQuery);
         HashMap hashMap = new HashMap();
         BigDecimal sumMoney = appOrderDao.selectSumMoney(query);
         int countOrder = appOrderDao.selectCountOrder(query);
@@ -241,6 +243,11 @@ public class DataCentreServiceImpl implements DataCentreService {
         int newShopCount = dataCentreDao.selectNewShopCount(query);
         //门店收益排行榜
         Page<TbOrder> pages=new Page<>(query.getPage(),query.getLimit());
+        //计算年月日开始结束时间
+        DataCenterQuery dataCenterQuery=query;
+        dataCenterQuery=DateUtils.dateStrEndTime(dataCenterQuery);
+        query.setStartTime(dataCenterQuery.getStartTime());
+        query.setEndTime(dataCenterQuery.getEndTime());
         IPage<TbOrder> tbOrderIPage = dataCentreDao.selectRankingList(pages, query);
         for(int i = 0;i<query.getLimit();i++){
             Integer a = ((query.getPage()-1)*query.getLimit())+i+1;

src/main/java/com/sqx/modules/errand/service/impl/TbIndentServiceImpl.java

@@ -1467,7 +1467,8 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
     }
 
     @Override
-    public Result taskAnalysis(DataCenterQuery query, String indentState) {
+    public Result taskAnalysis(DataCenterQuery oldQuery, String indentState) {
+        DataCenterQuery query=DateUtils.dateStrEndTime(oldQuery);
         HashMap hashMap = new HashMap();
         //发单总金额
         BigDecimal billMoney = tbIndentDao.billMoney(query);
@@ -1489,8 +1490,9 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
     }
 
     @Override
-    public Result selectOrderByStatus(DataCenterQuery query) {
+    public Result selectOrderByStatus(DataCenterQuery oldQuery) {
         HashMap hashMap = new HashMap();
+        DataCenterQuery query=DateUtils.dateStrEndTime(oldQuery);
         //全部
         int i = tbIndentDao.selectOrderByStatus(query, null);
         // 付款

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1357,6 +1357,21 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     @Override
     public Result selectAllOrderAdmin(OrderQueryDto queryDto) {
         Page<TbOrder> pages = new Page<>(queryDto.getPage(), queryDto.getLimit());
+//        pages.setOptimizeCountSql(false);
+//        pages.setSearchCount(false);
+//        pages.setTotal()
+        if(org.springframework.util.StringUtils.hasText(queryDto.getEndTime())){
+            queryDto.setEndTime(queryDto.getEndTime()+" 23:59:59");
+        }
+        if(org.springframework.util.StringUtils.hasText(queryDto.getPayEndTime())){
+            queryDto.setPayEndTime(queryDto.getPayEndTime()+" 23:59:59");
+        }
+        if(org.springframework.util.StringUtils.hasText(queryDto.getStartTime())){
+            queryDto.setStartTime(queryDto.getStartTime()+" 00:00:00");
+        }
+        if(org.springframework.util.StringUtils.hasText(queryDto.getPayStartTime())){
+            queryDto.setPayStartTime(queryDto.getPayStartTime()+" 00:00:00");
+        }
         IPage<TbOrder> tbOrderIPage = appOrderDao.selectAllOrderAdmin(pages, queryDto);
         for (int i = 0; i < tbOrderIPage.getRecords().size(); i++) {
             List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
@@ -1369,6 +1384,18 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
 
     @Override
     public ExcelData excelAllOrderAdmin(OrderQueryDto queryDto) {
+        if(org.springframework.util.StringUtils.hasText(queryDto.getEndTime())){
+            queryDto.setEndTime(queryDto.getEndTime()+" 23:59:59");
+        }
+        if(org.springframework.util.StringUtils.hasText(queryDto.getPayEndTime())){
+            queryDto.setPayEndTime(queryDto.getPayEndTime()+" 23:59:59");
+        }
+        if(org.springframework.util.StringUtils.hasText(queryDto.getStartTime())){
+            queryDto.setStartTime(queryDto.getStartTime()+" 00:00:00");
+        }
+        if(org.springframework.util.StringUtils.hasText(queryDto.getPayStartTime())){
+            queryDto.setPayStartTime(queryDto.getPayStartTime()+" 00:00:00");
+        }
         List<TbOrder> tbOrderIPage = appOrderDao.excelAllOrderAdmin(queryDto);
 //        for (int i = 0; i < tbOrderIPage.size(); i++) {
 //            List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
@@ -2726,6 +2753,18 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
 
     @Override
     public Result selectAllOrderTotalPrice(OrderQueryDto queryDto) {
+        if(org.springframework.util.StringUtils.hasText(queryDto.getEndTime())){
+            queryDto.setEndTime(queryDto.getEndTime()+" 23:59:59");
+        }
+        if(org.springframework.util.StringUtils.hasText(queryDto.getPayEndTime())){
+            queryDto.setPayEndTime(queryDto.getPayEndTime()+" 23:59:59");
+        }
+        if(org.springframework.util.StringUtils.hasText(queryDto.getStartTime())){
+            queryDto.setStartTime(queryDto.getStartTime()+" 00:00:00");
+        }
+        if(org.springframework.util.StringUtils.hasText(queryDto.getPayStartTime())){
+            queryDto.setPayStartTime(queryDto.getPayStartTime()+" 00:00:00");
+        }
         BigDecimal totalPrice = appOrderDao.selectAllOrderTotalPrice(queryDto);
 
         return Result.success().put("data", totalPrice);

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

@@ -41,6 +41,10 @@ public class CashOutQueryDTO extends PageQuery {
 
     @ApiModelProperty("骑手所在站点id")
     private String riderStationId;
+    @ApiModelProperty("操作开始时间")
+    private String outStartTime;
+    @ApiModelProperty("操作结束时间")
+    private String outEndTime;
 
     public String toStrCode() {
         return
@@ -57,7 +61,9 @@ public class CashOutQueryDTO extends PageQuery {
 //                ","+classify+
                 ","+(startTime==null?"":startTime)+
                 ","+(endTime==null?"":endTime)+
-                ","+(riderStationId==null?"":riderStationId)+",";
+                ","+(riderStationId==null?"":riderStationId)+
+                ","+(outStartTime==null?"":outStartTime)+
+                ","+(outEndTime==null?"":outEndTime)+",";
     }
     public String toStrMessage() {
         StringBuffer stringBuffer=new StringBuffer();
@@ -72,7 +78,9 @@ public class CashOutQueryDTO extends PageQuery {
 //                .append(phone==null||phone==""?"":"用户手机号："+phone+";")
 //                .append(classify==null?"":"支付渠道："+classify+";")
                 .append(startTime==null||startTime==""?"":"开始时间："+startTime+";")
-                .append(endTime==null||endTime==""?"":"结束时间："+endTime+";");
+                .append(endTime==null||endTime==""?"":"结束时间："+endTime+";")
+                .append(outStartTime==null||outStartTime==""?"":"操作开始时间："+outStartTime+";")
+                .append(outEndTime==null||outEndTime==""?"":"操作结束时间："+outEndTime+";");
         if(state!=null){
             switch (state){
                 case 0: stringBuffer.append("状态：待转账;");break;

src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.constant.RedisKey;
 import com.sqx.common.exception.SqxException;
 import com.sqx.common.utils.Constant;
+import com.sqx.common.utils.DateUtils;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.dao.UserCashOutDao;
@@ -338,8 +339,9 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
     }
 
     @Override
-    public Result incomeStatistics(DataCenterQuery query) {
+    public Result incomeStatistics(DataCenterQuery oldQuery) {
         HashMap hashMap = new HashMap();
+        DataCenterQuery query= DateUtils.dateStrEndTime(oldQuery);
         //扣除骑手保证金收入
         BigDecimal deductMoneySum = errandComplaintDao.deductMoneySum(query);
         //保价费收入

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

@@ -253,6 +253,8 @@ public class ExportScheduler {
         queryDTO.setStartTime(conditions[6]);
         queryDTO.setEndTime(conditions[7]);
         queryDTO.setRiderStationId(conditions[8]);
+        queryDTO.setOutStartTime(conditions[9]);
+        queryDTO.setOutEndTime(conditions[10]);
         return cashOutService.excelPayDetails(queryDTO);
     }
 

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

@@ -29,33 +29,22 @@
         where status = 1
           and date_format(create_time, '%Y') = date_format(#{date}, '%Y')
     </select>
-    <!--今日收入-->
+    <!--时间范围内收入-->
     <select id="findDayIncome" resultType="java.math.BigDecimal">
         select ifnull(sum(pay_money), 0)
         from tb_order
         where status in (3, 4)
-          and date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
-    </select>
-    <!--本月收入-->
-    <select id="findMonthIncome" resultType="java.math.BigDecimal">
-        select ifnull(sum(pay_money), 0)
-        from tb_order
-        where status in (3, 4)
-          and date_format(pay_time, '%Y-%m') = date_format(#{date}, '%Y-%m')
-    </select>
-    <!--本年收入-->
-    <select id="findYearIncome" resultType="java.math.BigDecimal">
-        select ifnull(sum(pay_money), 0)
-        from tb_order
-        where status in (3, 4)
-          and date_format(pay_time, '%Y') = date_format(#{date}, '%Y')
+          and pay_time >= #{starTime}
+          and pay_time <![CDATA[<=]]> #{endTime}
     </select>
+
     <!--今日发单数量-->
     <select id="findIndentCount" resultType="int">
         select count(*)
         from tb_order
         where status in (3, 4)
-          and date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+          and pay_time >= #{starTime}
+          and pay_time <![CDATA[<=]]> #{endTime}
     </select>
 
     <select id="selectPayOrderAnalyze" resultType="com.sqx.modules.order.entity.TbOrder">
@@ -258,7 +247,7 @@
         ( SELECT @rank_num := 0 ) r,
         ( SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney,ifnull( sum( shop_income_money ), 0 ) AS shopIncomeMoney, tor.shop_id , u.shop_name,gp.id as
         shopType,gp.shop_type_name as shopTypeName
-        FROM tb_order tor left join goods_shop u on tor.shop_id = u.shop_id
+        FROM tb_order tor force index(tb_order_pay_time_IDX) left join goods_shop u on tor.shop_id = u.shop_id
         left join shop_type gp on gp.id=u.shop_type_id
         WHERE tor.shop_id IS NOT NULL and tor.status = 4
         <if test="query.startTime != null and query.startTime !=''">
@@ -270,22 +259,13 @@
         <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>
 
     <select id="selectRankingListAmount" resultType="com.sqx.modules.order.entity.TbOrder">
         SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney,ifnull( sum( shop_income_money ), 0 ) AS shopIncomeMoney
-        FROM tb_order tor left join goods_shop u on tor.shop_id = u.shop_id
+        FROM tb_order tor force index(tb_order_pay_time_IDX) left join goods_shop u on tor.shop_id = u.shop_id
         left join shop_type gp on gp.id=u.shop_type_id
         WHERE tor.shop_id IS NOT NULL and tor.status = 4
         <if test="query.startTime != null and query.startTime !=''">
@@ -297,15 +277,6 @@
         <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>
     </select>
 
     <select id="excelShopCenter" resultType="com.sqx.modules.order.entity.TbOrder">
@@ -516,15 +487,6 @@
         <if test="query.shopId!=null">
             and shop_id = #{query.shopId}
         </if>
-        <if test="query.dateType=='day'">
-            and date_format(pay_time,'%Y-%m-%d')=date_format(#{query.date},'%Y-%m-%d')
-        </if>
-        <if test="query.dateType=='month'">
-            and date_format(pay_time,'%Y-%m')=date_format(#{query.date},'%Y-%m')
-        </if>
-        <if test="query.dateType=='year'">
-            and date_format(pay_time,'%Y')=date_format(#{query.date},'%Y')
-        </if>
         <if test="query.startTime!=null and query.startTime!=''">
             and pay_time>=#{query.startTime}
         </if>
@@ -540,15 +502,6 @@
         <if test="query.shopId!=null">
             and shop_id = #{query.shopId}
         </if>
-        <if test="query.dateType=='day'">
-            and date_format(pay_time,'%Y-%m-%d')=date_format(#{query.date},'%Y-%m-%d')
-        </if>
-        <if test="query.dateType=='month'">
-            and date_format(pay_time,'%Y-%m')=date_format(#{query.date},'%Y-%m')
-        </if>
-        <if test="query.dateType=='year'">
-            and date_format(pay_time,'%Y')=date_format(#{query.date},'%Y')
-        </if>
         <if test="query.startTime!=null and query.startTime!=''">
             and pay_time>=#{query.startTime}
         </if>
@@ -562,15 +515,6 @@
         <if test="query.shopId!=null">
             and shop_id = #{query.shopId}
         </if>
-        <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.startTime!=null and query.startTime!=''">
             and create_time>=#{query.startTime}
         </if>
@@ -584,15 +528,6 @@
         <if test="query.shopId!=null">
             and shop_id = #{query.shopId}
         </if>
-        <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.startTime!=null and query.startTime!=''">
             and create_time>=#{query.startTime}
         </if>

src/main/resources/mapper/errand/ErrandComplaintMapper.xml

@@ -62,15 +62,6 @@
 
     <select id="deductMoneySum" resultType="java.math.BigDecimal">
         select ifnull(sum(deduct_money), 0) from errand_complaint where 1 = 1
-        <if test="query.dateType=='day'">
-            and date_format(complaint_time,'%Y-%m-%d')=date_format(#{query.date},'%Y-%m-%d')
-        </if>
-        <if test="query.dateType=='month'">
-            and date_format(complaint_time,'%Y-%m')=date_format(#{query.date},'%Y-%m')
-        </if>
-        <if test="query.dateType=='year'">
-            and date_format(complaint_time,'%Y')=date_format(#{query.date},'%Y')
-        </if>
         <if test="query.startTime!=null and query.startTime!=''">
             and complaint_time>=#{query.startTime}
         </if>

src/main/resources/mapper/errand/TbIndentMapper.xml

@@ -597,15 +597,6 @@
         left join tb_user t on s.user_id = t.user_id
         left join tb_user u on s.rider_user_id = u.user_id
         where indent_state = "6"
-        <if test="query.dateType=='day'">
-            and date_format(s.create_time,'%Y-%m-%d')=date_format(#{query.date},'%Y-%m-%d')
-        </if>
-        <if test="query.dateType=='month'">
-            and date_format(s.create_time,'%Y-%m')=date_format(#{query.date},'%Y-%m')
-        </if>
-        <if test="query.dateType=='year'">
-            and date_format(s.create_time,'%Y')=date_format(#{query.date},'%Y')
-        </if>
         <if test="indentState!=null and indentState!=''">
             and s.indent_state = #{status}
         </if>
@@ -677,15 +668,6 @@
         <if test="status!=null">
             and indent_state = #{status}
         </if>
-        <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.startTime!=null and query.startTime!=''">
             and create_time>=#{query.startTime}
         </if>

src/main/resources/mapper/order/OrderMapper.xml

@@ -140,16 +140,16 @@
             and tor.reservation_flag = #{query.reservationFlag}
         </if>
         <if test="query.startTime!=null and query.startTime!=''">
-            and date_format(tor.create_time,'%Y-%m-%d') >= date_format(#{query.startTime},'%Y-%m-%d')
+            and tor.create_time >= #{query.startTime}
         </if>
         <if test="query.endTime!=null and query.endTime!='' ">
-            and date_format(tor.create_time,'%Y-%m-%d') &lt;= date_format(#{query.endTime},'%Y-%m-%d')
+            and tor.create_time &lt;= #{query.endTime}
         </if>
         <if test="query.payStartTime != null and query.payStartTime != ''">
-            and date_format(tor.pay_time,'%Y-%m-%d') >= date_format(#{query.payStartTime},'%Y-%m-%d')
+            and tor.pay_time >= #{query.payStartTime}
         </if>
         <if test="query.payEndTime != null and query.payEndTime != '' ">
-            and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{query.payEndTime},'%Y-%m-%d')
+            and tor.pay_time &lt;= #{query.payEndTime}
         </if>
         <if test="query.riderStationId!=null and query.riderStationId!=''">
             and tiu.rider_station_id=#{query.riderStationId}
@@ -224,16 +224,16 @@
             and tor.reservation_flag = #{query.reservationFlag}
         </if>
         <if test="query.startTime!=null and query.startTime!=''">
-            and date_format(tor.create_time,'%Y-%m-%d') >= date_format(#{query.startTime},'%Y-%m-%d')
+            and tor.create_time >= #{query.startTime}
         </if>
         <if test="query.endTime!=null and query.endTime!='' ">
-            and date_format(tor.create_time,'%Y-%m-%d') &lt;= date_format(#{query.endTime},'%Y-%m-%d')
+            and tor.create_time &lt;= #{query.endTime}
         </if>
         <if test="query.payStartTime != null and query.payStartTime != ''">
-            and date_format(tor.pay_time,'%Y-%m-%d') >= date_format(#{query.payStartTime},'%Y-%m-%d')
+            and tor.pay_time >= #{query.payStartTime}
         </if>
         <if test="query.payEndTime != null and query.payEndTime != '' ">
-            and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{query.payEndTime},'%Y-%m-%d')
+            and tor.pay_time &lt;= #{query.payEndTime}
         </if>
         <if test="query.riderStationId!=null and query.riderStationId!=''">
             and tiu.rider_station_id=#{query.riderStationId}
@@ -292,16 +292,16 @@
             and tor.reservation_flag = #{query.reservationFlag}
         </if>
         <if test="query.startTime!=null and query.startTime!=''">
-            and date_format(tor.create_time,'%Y-%m-%d') >= date_format(#{query.startTime},'%Y-%m-%d')
+            and tor.create_time >= #{query.startTime}
         </if>
         <if test="query.endTime!=null and query.endTime!='' ">
-            and date_format(tor.create_time,'%Y-%m-%d') &lt;= date_format(#{query.endTime},'%Y-%m-%d')
+            and tor.create_time &lt;= #{query.endTime}
         </if>
         <if test="query.payStartTime != null and query.payStartTime != ''">
-            and date_format(tor.pay_time,'%Y-%m-%d') >= date_format(#{query.payStartTime},'%Y-%m-%d')
+            and tor.pay_time >= #{query.payStartTime}
         </if>
         <if test="query.payEndTime != null and query.payEndTime != '' ">
-            and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{query.payEndTime},'%Y-%m-%d')
+            and tor.pay_time &lt;= #{query.payEndTime}
         </if>
         <if test="query.riderStationId!=null and query.riderStationId!=''">
             and tiu.rider_station_id=#{query.riderStationId}
@@ -433,15 +433,6 @@
         <if test="query.shopId!=null">
             and shop_id=#{query.shopId}
         </if>
-        <if test="query.dateType=='day'">
-            and date_format(pay_time,'%Y-%m-%d')=date_format(#{query.date},'%Y-%m-%d')
-        </if>
-        <if test="query.dateType=='month'">
-            and date_format(pay_time,'%Y-%m')=date_format(#{query.date},'%Y-%m')
-        </if>
-        <if test="query.dateType=='year'">
-            and date_format(pay_time,'%Y')=date_format(#{query.date},'%Y')
-        </if>
         <if test="query.startTime!=null and query.startTime!=''">
             and pay_time>=#{query.startTime}
         </if>
@@ -455,15 +446,6 @@
         <if test="query.shopId!=null">
             and shop_id=#{query.shopId}
         </if>
-        <if test="query.dateType=='day'">
-            and date_format(pay_time,'%Y-%m-%d')=date_format(#{query.date},'%Y-%m-%d')
-        </if>
-        <if test="query.dateType=='month'">
-            and date_format(pay_time,'%Y-%m')=date_format(#{query.date},'%Y-%m')
-        </if>
-        <if test="query.dateType=='year'">
-            and date_format(pay_time,'%Y')=date_format(#{query.date},'%Y')
-        </if>
         <if test="query.startTime!=null and query.startTime!=''">
             and pay_time>=#{query.startTime}
         </if>
@@ -667,16 +649,16 @@
             and tor.reservation_flag = #{query.reservationFlag}
         </if>
         <if test="query.startTime!=null and query.startTime!=''">
-            and date_format(tor.create_time,'%Y-%m-%d') >= date_format(#{query.startTime},'%Y-%m-%d')
+            and tor.create_time >= #{query.startTime}
         </if>
         <if test="query.endTime!=null and query.endTime!='' ">
-            and date_format(tor.create_time,'%Y-%m-%d') &lt;= date_format(#{query.endTime},'%Y-%m-%d')
+            and tor.create_time &lt;= #{query.endTime}
         </if>
         <if test="query.payStartTime != null and query.payStartTime != ''">
-            and date_format(tor.pay_time,'%Y-%m-%d') >= date_format(#{query.payStartTime},'%Y-%m-%d')
+            and tor.pay_time >= #{query.payStartTime}
         </if>
         <if test="query.payEndTime != null and query.payEndTime != '' ">
-            and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{query.payEndTime},'%Y-%m-%d')
+            and tor.pay_time &lt;= #{query.payEndTime}
         </if>
         <if test="query.riderStationId!=null and query.riderStationId!=''">
             and tiu.rider_station_id=#{query.riderStationId}

src/main/resources/mapper/pay/CashDao.xml

@@ -189,15 +189,6 @@
 
     <select id="cargoInsurance" resultType="java.math.BigDecimal">
         select ifnull(sum(cargo_insurance), 0) from tb_indent where 1 = 1
-        <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.startTime!=null and query.startTime!=''">
             and create_time>=#{query.startTime}
         </if>
@@ -209,15 +200,6 @@
 
     <select id="MoneySumByIndentType" resultType="java.math.BigDecimal">
         select ifnull(sum(platform_money), 0) from tb_indent where 1 = 1
-        <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.startTime!=null and query.startTime!=''">
             and create_time>=#{query.startTime}
         </if>
@@ -229,15 +211,6 @@
 
     <select id="cashDepositMoney" resultType="java.math.BigDecimal">
         select ifnull(sum(money), 0) from pay_details where 1 = 1
-        <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.startTime!=null and query.startTime!=''">
             and create_time>=#{query.startTime}
         </if>
@@ -279,6 +252,12 @@
             <if test="params.endTime != null and params.endTime != '' and params.endTime != 'null'">
                 and co.create_at <![CDATA[ <= ]]> #{params.endTime}
             </if>
+            <if test="params.outStartTime != null and params.outStartTime != '' and params.outStartTime != 'null'">
+                and co.out_at <![CDATA[ >= ]]> #{params.outStartTime}
+            </if>
+            <if test="params.outEndTime != null and params.outEndTime != '' and params.outEndTime != 'null'">
+                and co.out_at <![CDATA[ <= ]]> #{params.outEndTime}
+            </if>
             <if test="params.shopName != null and params.shopName != '' and params.shopName != 'null'">
                 and gh.shop_name like concat('%',#{params.shopName},'%')
             </if>