lyhzzz 4 months ago
parent
commit
483ec7f5d4

+ 1 - 0
src/main/java/com/fdkankan/manage/service/impl/IncrementOrderMgServiceImpl.java

@@ -60,6 +60,7 @@ public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMa
     public IncrementOrderMg getByIncrementId(Long id) {
         LambdaQueryWrapper<IncrementOrderMg> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IncrementOrderMg::getIncrementId,id);
+        wrapper.orderByDesc(IncrementOrderMg::getId);
         List<IncrementOrderMg> list = this.list(wrapper);
         if(ObjectUtils.isEmpty(list)){
             return null;

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

@@ -14,10 +14,10 @@ public class DownOrderVo {
     @ExcelIgnore
     private Long id;
 
-    @ExcelIgnore
+    @ExcelProperty("下单时间")
     private String createTime;               //下单时间
 
-    @ExcelProperty("下单时间")
+    @ExcelIgnore
     private String tradeTime;               //下单时间
 
     @ExcelProperty("订单号")

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

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