订单查询和导出退款时间条件字段修改

src/main/java/com/sqx/modules/order/dto/OrderQueryDto.java

@@ -48,9 +48,9 @@ public class OrderQueryDto extends PageQuery {
     @ApiModelProperty("优惠券类型 0 平台 1商家 不选查所有")
     private String couponType;
     @ApiModelProperty("退款开始时间")
-    private String updateStartTime;
+    private String refundStartTime;
     @ApiModelProperty("退款结束时间")
-    private String updateEndTime;
+    private String refundEndTime;
 
     public String toStrMessage() {
         StringBuilder stringBuffer=new StringBuilder();
@@ -69,8 +69,8 @@ public class OrderQueryDto extends PageQuery {
         if(shopTypeId!=null&&!shopTypeId.trim().equals("")){stringBuffer.append("商铺类型id："+shopTypeId+";");}
         if(couponType!=null&&!couponType.trim().equals("")){stringBuffer.append(couponType.equals("0")?"优惠券类型:平台;":"优惠券类型:商家;");}
         if(indentStatus!=null&&!indentStatus.trim().equals("")){stringBuffer.append("跑腿订单状态："+getIndentStateStr(indentStatus)+";");}
-        if(updateStartTime!=null&&!updateStartTime.trim().equals("")){stringBuffer.append("退款开始时间："+updateStartTime+";");}
-        if(updateEndTime!=null&&!updateEndTime.trim().equals("")){stringBuffer.append("退款结束时间："+updateEndTime+";");}
+        if(refundStartTime!=null&&!refundStartTime.trim().equals("")){stringBuffer.append("退款开始时间："+refundStartTime+";");}
+        if(refundEndTime!=null&&!refundEndTime.trim().equals("")){stringBuffer.append("退款结束时间："+refundEndTime+";");}
         return stringBuffer.toString();
     }
 
@@ -107,8 +107,8 @@ public class OrderQueryDto extends PageQuery {
                 ","+(shopTypeId==null?"":shopTypeId)+
                 ","+(couponType==null?"":couponType)+
                 ","+(indentStatus==null?"":indentStatus)+
-                ","+(updateStartTime==null?"":updateStartTime)+
-                ","+(updateEndTime==null?"":updateEndTime)+
+                ","+(refundEndTime==null?"":refundEndTime)+
+                ","+(refundEndTime==null?"":refundEndTime)+
                 ",";
     }
 

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

@@ -204,8 +204,8 @@ public class ExportScheduler {
         queryDto.setShopTypeId(conditions[14]);
         queryDto.setCouponType(conditions[15]);
         queryDto.setIndentStatus(conditions[16]);
-        queryDto.setUpdateStartTime(conditions[17]);
-        queryDto.setUpdateEndTime(conditions[18]);
+        queryDto.setRefundStartTime(conditions[17]);
+        queryDto.setRefundEndTime(conditions[18]);
 
         return appOrderService.excelAllOrderAdmin(queryDto);
     }

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

@@ -182,11 +182,11 @@
         <if test='query.couponType== "1"'>
             and tcu.shop_id !=0
         </if>
-        <if test="query.updateStartTime != null and query.updateStartTime != ''">
-            and tor.update_time >= #{query.updateStartTime}
+        <if test="query.refundStartTime != null and query.refundStartTime != ''">
+            and tor.update_time >= #{query.refundStartTime}
         </if>
-        <if test="query.updateEndTime != null and query.updateEndTime != '' ">
-            and tor.update_time &lt;= #{query.updateEndTime}
+        <if test="query.refundEndTime != null and query.refundEndTime != '' ">
+            and tor.update_time &lt;= #{query.refundEndTime}
         </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>
@@ -285,11 +285,11 @@
         <if test='query.couponType== "1"'>
             and tcu.shop_id !=0
         </if>
-        <if test="query.updateStartTime != null and query.updateStartTime != ''">
-            and tor.update_time >= #{query.updateStartTime}
+        <if test="query.refundStartTime != null and query.refundStartTime != ''">
+            and tor.update_time >= #{query.refundStartTime}
         </if>
-        <if test="query.updateEndTime != null and query.updateEndTime != '' ">
-            and tor.update_time &lt;= #{query.updateEndTime}
+        <if test="query.refundEndTime != null and query.refundEndTime != '' ">
+            and tor.update_time &lt;= #{query.refundEndTime}
         </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>
@@ -359,11 +359,11 @@
         <if test='query.couponType== "1"'>
             and tcu.shop_id !=0
         </if>
-        <if test="query.updateStartTime != null and query.updateStartTime != ''">
-            and tor.update_time >= #{query.updateStartTime}
+        <if test="query.refundStartTime != null and query.refundStartTime != ''">
+            and tor.update_time >= #{query.refundStartTime}
         </if>
-        <if test="query.updateEndTime != null and query.updateEndTime != '' ">
-            and tor.update_time &lt;= #{query.updateEndTime}
+        <if test="query.refundEndTime != null and query.refundEndTime != '' ">
+            and tor.update_time &lt;= #{query.refundEndTime}
         </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>