优化订单记录导出表

src/main/java/com/szwl/controller/TOrderController.java

@@ -1382,9 +1382,12 @@ public class TOrderController {
     }
 
     @RequestMapping(value = "/orderExport", method = RequestMethod.GET)
-    public Object orderExport(HttpServletResponse response, String adminId,String adminType,String type,String userName,String payType,String productNo,String clientId,String dateType, String startDate, String endDate, long current, long size) {
-        current = 1l;
-        size = 1000l;
+    public Object orderExport(HttpServletResponse response, String adminId, String adminType,
+                              String type, String userName, String payType, String productNo,
+                              String clientId, String dateType, String startDate, String endDate,
+                              String status, String equipmentId, long current, long size) throws ParseException {
+        current = 1L;
+        size = 1000L;
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date begin = null;
         Date end = null;
@@ -1395,7 +1398,7 @@ public class TOrderController {
             e.printStackTrace();
         }
         long time = end.getTime() - begin.getTime();
-        if(time>31*24*60*60*1000l){
+        if(time>31*24*60*60*1000L){
             return JsonMessage.success("时间跨度过长");
         }
         //判断当前账号状态
@@ -1552,7 +1555,7 @@ public class TOrderController {
                     }
                 }
             }
-                if(StringUtils.isNotEmpty(payType)){
+            if(StringUtils.isNotEmpty(payType)){
                 query.eq(TOrder::getFrpCode,payType);
             }
             if(StringUtils.isNotEmpty(productNo)){
@@ -1570,6 +1573,12 @@ public class TOrderController {
                     query.eq(TOrder::getEquipmentId,equipment.getId());
                 }
             }
+            if(StringUtils.isNotEmpty(equipmentId)) {
+                query.eq(TOrder::getEquipmentId,equipmentId);
+            }
+            if (StringUtils.isNotEmpty(status)) {
+                query.eq(TOrder::getStatus,status);
+            }
             if(StringUtils.isNotEmpty(dateType)){
                 if(dateType.equals("0")){
                     //创建时间

src/main/java/com/szwl/model/excel/OrderTarget.java

@@ -43,13 +43,13 @@ public class OrderTarget {
      * 支付时间
      */
     @Excel(name = "支付时间", width = 20.0D)
-    private Date payDate;
+    private String payDate;
 
     /**
      * 退款时间
      */
     @Excel(name = "退款时间", width = 20.0D)
-    private Date refundDate;
+    private String refundDate;
 
 
     /**
@@ -140,19 +140,19 @@ public class OrderTarget {
         this.name = name;
     }
 
-    public Date getPayDate() {
+    public String getPayDate() {
         return payDate;
     }
 
-    public void setPayDate(Date payDate) {
+    public void setPayDate(String payDate) {
         this.payDate = payDate;
     }
 
-    public Date getRefundDate() {
+    public String getRefundDate() {
         return refundDate;
     }
 
-    public void setRefundDate(Date refundDate) {
+    public void setRefundDate(String refundDate) {
         this.refundDate = refundDate;
     }
 

src/main/java/com/szwl/model/utils/DateUtils.java

@@ -69,12 +69,11 @@ public class DateUtils
     return sdf.format(date);
   }
 
-  public static Date parseDate(String source, String pattern) throws ParseException
-  {
+  public static Date parseDate(String source, String pattern) throws ParseException {
     SimpleDateFormat sdf = null;
-    if (pattern == null)
+    if (pattern == null) {
       sdf = new SimpleDateFormat();
-    else {
+    } else {
       sdf = new SimpleDateFormat(pattern);
     }
     return sdf.parse(source);
@@ -99,9 +98,9 @@ public class DateUtils
   public static Date parseDate(String source, String pattern, Date defaultDate) {
     try {
       SimpleDateFormat sdf = null;
-      if (pattern == null)
+      if (pattern == null) {
         sdf = new SimpleDateFormat();
-      else {
+      } else {
         sdf = new SimpleDateFormat(pattern);
       }
       return sdf.parse(source);

src/main/java/com/szwl/service/TOrderService.java

@@ -9,6 +9,7 @@ import com.szwl.model.excel.OrderTarget;
 import com.szwl.model.query.Pageable;
 import com.szwl.model.query.StatisticsParam;
 
+import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
 
@@ -28,5 +29,5 @@ public interface TOrderService extends IService<TOrder> {
 
     List<OrderDaoChuDTO> orderDaoChu(String begin, String end, Long adminId, String clientId, String type, long current, long size);
 
-    List<OrderTarget> findById(TAdmin admin, List<TOrder> list);
+    List<OrderTarget> findById(TAdmin admin, List<TOrder> list) throws ParseException;
 }

src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -15,6 +15,7 @@ import com.szwl.model.excel.OrderTarget;
 import com.szwl.model.query.OrderDaoChuParam;
 import com.szwl.model.query.Pageable;
 import com.szwl.model.query.StatisticsParam;
+import com.szwl.model.utils.DateUtils;
 import com.szwl.service.TOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
@@ -138,7 +139,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     }
 
     @Override
-    public List<OrderTarget> findById(TAdmin admin, List<TOrder> list) {
+    public List<OrderTarget> findById(TAdmin admin, List<TOrder> list) throws ParseException {
 
 
         List<OrderTarget> list1 = new ArrayList<>();
@@ -150,12 +151,36 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 orderTarget.setPrice(order.getPrice());
                 orderTarget.setClientId(order.getClientId());
                 orderTarget.setName(admin.getUsername());
-                orderTarget.setPayDate(order.getPayDate());
-                orderTarget.setRefundDate(order.getRefundDate());
-                orderTarget.setStatus(String.valueOf(order.getStatus()));
-                orderTarget.setAgencyProportion(String.valueOf(order.getAgencyProportion()));
-                orderTarget.setMerchantProportion(String.valueOf(order.getMerchantProportion()));
-                orderTarget.setPersonageProportion(String.valueOf(order.getPersonageProportion()));
+                // 格式化时间
+                if(order.getPayDate()!=null) {
+                    String formatPayDate = DateUtils.formatDate(order.getPayDate(), DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss);
+                    orderTarget.setPayDate(formatPayDate);
+                }
+                if(order.getRefundDate()!=null) {
+                    String formatRefundDate = DateUtils.formatDate(order.getRefundDate(), DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss);
+                    orderTarget.setRefundDate(formatRefundDate);
+                }
+                Integer status = order.getStatus();
+                if (status == 0) {
+                    orderTarget.setStatus("未支付");
+                } else if (status == 1) {
+                    orderTarget.setStatus("已支付");
+                } else if (status == 3) {
+                    orderTarget.setStatus("已退款");
+                } else {
+                    orderTarget.setStatus(String.valueOf(status));
+                }
+
+                if (order.getAgencyProportion()!=null) {
+                    orderTarget.setAgencyProportion(String.valueOf(order.getAgencyProportion()));
+                }
+                if (order.getMerchantProportion()!=null) {
+                    orderTarget.setMerchantProportion(String.valueOf(order.getMerchantProportion()));
+                }
+                if (order.getPersonageProportion()!=null) {
+                    orderTarget.setPersonageProportion(String.valueOf(order.getPersonageProportion()));
+                }
+
                 if ("WEIXIN_NATIVE".equals(order.getFrpCode())) {
                     orderTarget.setFrp_code("微信主扫支付");
                 } else if("ALIPAY_NATIVE".equals(order.getFrpCode())){
@@ -167,6 +192,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 }else {
                     orderTarget.setFrp_code(order.getFrpCode());
                 }
+
                 if(StringUtils.isEmpty(orderTarget.getFrp_code())){
                     orderTarget.setFrp_code(order.getFrpCode());
                 }