订单管理完成

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/OrderController.java

@@ -67,7 +67,9 @@ public class OrderController extends BaseController {
         totalData.setRevenueMoney(new BigDecimal(0));
         totalData.setSettlementAmount(new BigDecimal(0));
         totalData.setTotalPrice(new BigDecimal(0));
-        totalData.setRefundMoney(new BigDecimal(0));
+        totalData.setActualMailPrice(new BigDecimal(0));
+        totalData.setMailRevenueMoney(new BigDecimal(0));
+        totalData.setTotalRevenueMoney(new BigDecimal(0));
         for (OrderVo vo : list) {
             totalData.setSellingPrice(totalData.getSellingPrice().add(vo.getSellingPrice()));
             totalData.setMailPrice(totalData.getMailPrice().add(vo.getMailPrice()));
@@ -75,7 +77,9 @@ public class OrderController extends BaseController {
             totalData.setRevenueMoney(totalData.getRevenueMoney().add(vo.getRevenueMoney()));
             totalData.setSettlementAmount(totalData.getSettlementAmount().add(vo.getSettlementAmount()));
             totalData.setTotalPrice(totalData.getTotalPrice().add(vo.getTotalPrice()));
-            totalData.setRefundMoney(totalData.getRefundMoney().add(vo.getRefundMoney()));
+            totalData.setActualMailPrice(totalData.getActualMailPrice().add(vo.getActualMailPrice()));
+            totalData.setMailRevenueMoney(totalData.getMailRevenueMoney().add(vo.getMailRevenueMoney()));
+            totalData.setTotalRevenueMoney(totalData.getTotalRevenueMoney().add(vo.getTotalRevenueMoney()));
 
         }
         list.add(totalData);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java

@@ -1,6 +1,8 @@
 package org.dromara.system.domain.vo;
 
 import cn.idev.excel.annotation.ExcelIgnore;
+import cn.idev.excel.annotation.format.DateTimeFormat;
+import org.dromara.common.excel.annotation.ExcelRequired;
 import org.dromara.common.translation.annotation.Translation;
 
 import java.math.BigDecimal;
@@ -60,6 +62,7 @@ public class OrderVo implements Serializable {
     /**
      * 顾客电话
      */
+    @ExcelIgnore
     @ExcelProperty(value = "顾客电话")
     private String customerPhone;
 
@@ -73,6 +76,7 @@ public class OrderVo implements Serializable {
     /**
      * 产品名称
      */
+    @ExcelIgnore
     @ExcelProperty(value = "产品名称")
     private String productName;
 
@@ -93,12 +97,6 @@ public class OrderVo implements Serializable {
      */
     @ExcelProperty(value = "销售价格")
     private BigDecimal sellingPrice;
-
-    /**
-     * 邮费
-     */
-    @ExcelProperty(value = "邮费")
-    private BigDecimal mailPrice;
     /**
      * 结账金额
      */
@@ -109,36 +107,41 @@ public class OrderVo implements Serializable {
      */
     @ExcelProperty(value = "收益额")
     private BigDecimal revenueMoney;
+
     /**
-     * 实收价格
+     * 邮费付款
      */
-    @ExcelProperty(value = "实收价格")
+    @ExcelProperty(value = "邮费付款")
-    private BigDecimal actualPrice;
+    private BigDecimal mailPrice;
     /**
-     * 邮费实收
+     * 邮费收款
      */
-    @ExcelProperty(value = "邮费实收")
+    @ExcelProperty(value = "邮费收款")
     private BigDecimal actualMailPrice;
     /**
      *     邮费收益
      */
     @ExcelProperty(value = "邮费收益")
     private BigDecimal mailRevenueMoney;
-    /**
-     * 总收益
-     */
-    @ExcelProperty(value = "总收益")
-    private BigDecimal totalRevenueMoney;
     /**
      * 订单总额
      */
     @ExcelProperty(value = "订单总额")
     private BigDecimal totalPrice;
 
+    /**
+     * 实收价格
+     */
+    @ExcelProperty(value = "实收价格")
+    private BigDecimal actualPrice;
+    /**
+     * 总收益
+     */
+    @ExcelProperty(value = "总收益")
+    private BigDecimal totalRevenueMoney;
     /**
      * 退款金额
      */
-    @ExcelProperty(value = "退款金额")
     private BigDecimal refundMoney;
 
     /**
@@ -153,6 +156,12 @@ public class OrderVo implements Serializable {
      */
     @ExcelProperty(value = "购买日期")
     private String buyData;
+    /**
+     * 购买时间
+     */
+    @ExcelProperty(value = "购买时间")
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     /**
      * 支付时间

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrderServiceImpl.java

@@ -88,7 +88,7 @@ public class OrderServiceImpl implements IOrderService {
     private LambdaQueryWrapper<Order> buildQueryWrapper(OrderBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Order::getId);
+        lqw.orderByAsc(Order::getCreateTime);
         lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), Order::getCustomerName, bo.getCustomerName());
         lqw.like(StringUtils.isNotBlank(bo.getBaozhuName()), Order::getBaozhuName, bo.getBaozhuName());
         lqw.like(StringUtils.isNotBlank(bo.getOrderNo()), Order::getOrderNo, bo.getOrderNo());
@@ -107,6 +107,17 @@ public class OrderServiceImpl implements IOrderService {
         lqw.eq(bo.getShipmentTime() != null, Order::getShipmentTime, bo.getShipmentTime());
         lqw.eq(StringUtils.isNotBlank(bo.getShipmentImage()), Order::getShipmentImage, bo.getShipmentImage());
         lqw.eq(StringUtils.isNotBlank(bo.getTrackingNumber()), Order::getTrackingNumber, bo.getTrackingNumber());
+        if(bo.getParams() != null){
+            if(bo.getParams().get("buyDataBeginTime")!=null && !"".equals(bo.getParams().get("buyDataBeginTime"))){
+                lqw.between(Order::getBuyData,bo.getParams().get("buyDataBeginTime"),bo.getParams().get("buyDataEndTime"));
+            }
+            if(bo.getParams().get("payTimeBeginTime")!=null && !"".equals(bo.getParams().get("payTimeEndTime"))){
+                lqw.between(Order::getBuyData,bo.getParams().get("payTimeBeginTime"),bo.getParams().get("payTimeEndTime"));
+            }
+            if(bo.getParams().get("shipmentTimeBeginTime")!=null && !"".equals(bo.getParams().get("shipmentTimeEndTime"))){
+                lqw.between(Order::getBuyData,bo.getParams().get("shipmentTimeBeginTime"),bo.getParams().get("shipmentTimeEndTime"));
+            }
+        }
         return lqw;
     }