Browse Source

下单时间去tradeTime 32590

lyhzzz 2 years ago
parent
commit
9dd6b71947

+ 3 - 0
src/main/java/com/fdkankan/manage/service/impl/DownloadOrderServiceImpl.java

@@ -36,6 +36,9 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     public PageInfo pageList(OrderParam param) {
         CacheUtil.orderParam = param;
         Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        for (DownOrderVo record : page.getRecords()) {
+            record.setCreateTime(record.getTradeTime());
+        }
         return PageInfo.PageInfo(page);
     }
 

+ 3 - 0
src/main/java/com/fdkankan/manage/service/impl/IncrementOrderServiceImpl.java

@@ -36,6 +36,9 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
     public PageInfo pageList(OrderParam param) {
         CacheUtil.orderParam = param;
         Page<IncrementOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        for (IncrementOrderVo record : page.getRecords()) {
+            record.setCreateTime(record.getTradeTime());
+        }
         return PageInfo.PageInfo(page);
     }
 

+ 3 - 1
src/main/java/com/fdkankan/manage/vo/response/DownOrderVo.java

@@ -11,9 +11,11 @@ public class DownOrderVo {
     @ExcelProperty("ID")
     private Long id;
 
-    @ExcelProperty("下单时间")
     private String createTime;               //下单时间
 
+    @ExcelProperty("下单时间")
+    private String tradeTime;               //下单时间
+
     @ExcelProperty("订单号")
     private String orderSn;                 //订单号
 

+ 3 - 1
src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -11,9 +11,11 @@ public class IncrementOrderVo {
     @ExcelProperty("ID")
     private Long id;
 
-    @ExcelProperty("下单时间")
     private String createTime;               //下单时间
 
+    @ExcelProperty("下单时间")
+    private String tradeTime;               //下单时间
+
     @ExcelProperty("订单号")
     private String orderSn;                 //订单号
 

+ 2 - 2
src/main/resources/mapper/manage/DownloadOrderMapper.xml

@@ -18,10 +18,10 @@
             and o.number like concat ('%',#{param.tradeNum},'%')
         </if>
         <if test="param.startTime != null and param.startTime !='' ">
-            and o.create_time &gt;= #{param.startTime}
+            and o.trade_time &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null and param.endTime !='' ">
-            and o.create_time &lt;= #{param.endTime}
+            and o.trade_time &lt;= #{param.endTime}
         </if>
         order by o.create_time desc
     </select>

+ 2 - 2
src/main/resources/mapper/manage/IncrementOrderMapper.xml

@@ -16,10 +16,10 @@
             and o.number like concat ('%',#{param.tradeNum},'%')
         </if>
         <if test="param.startTime != null and param.startTime !='' ">
-            and o.create_time &gt;= #{param.startTime}
+            and o.trade_time &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null and param.endTime !='' ">
-            and o.create_time &lt;= #{param.endTime}
+            and o.trade_time &lt;= #{param.endTime}
         </if>
         order by o.create_time desc
     </select>