Merge branch 'hurx'

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/OrderMainController.java

@@ -16,6 +16,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.order.domain.bo.OrderMainBo;
 import org.dromara.order.domain.vo.OrderMainVo;
+import org.dromara.order.domain.vo.OrderStatusStats;
 import org.dromara.order.service.IOrderMainService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -45,6 +46,14 @@ public class OrderMainController extends BaseController {
         return orderMainService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 查询订单状态数量
+     */
+    @GetMapping("/queryOrderStatusStats")
+    public OrderStatusStats queryOrderStatusStats() {
+        return orderMainService.queryOrderStatusStats();
+    }
+
     /**
      * 导出订单主信息列表
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderDeliver.java

@@ -100,6 +100,8 @@ public class OrderDeliver extends TenantEntity {
      */
     private String consigneePhone;
 
+    private String dataSource;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderDeliverProduct.java

@@ -62,6 +62,8 @@ public class OrderDeliverProduct extends TenantEntity {
      */
     private Long deliverNum;
 
+    private String dataSource;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderMain.java

@@ -60,6 +60,11 @@ public class OrderMain extends TenantEntity {
      */
     private Long customerId;
 
+    /**
+     * 客户编号
+     */
+    private String customerCode;
+
     /**
      * 用户ID（关联用户表）
      */
@@ -245,11 +250,6 @@ public class OrderMain extends TenantEntity {
      */
     private String expenseType;
 
-    /**
-     * 客户编号
-     */
-    private String customerNo;
-
     /**
      * 用户编号
      */
@@ -260,6 +260,8 @@ public class OrderMain extends TenantEntity {
      */
     private String status;
 
+    private String dataSource;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderProduct.java

@@ -4,9 +4,13 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.math.BigDecimal;
+
 import org.dromara.common.translation.annotation.Translation;
+
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.common.translation.constant.TransConstant;
 
@@ -142,6 +146,8 @@ public class OrderProduct extends TenantEntity {
      */
     private String status;
 
+    private String dataSource;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderDeliverBo.java

@@ -97,6 +97,8 @@ public class OrderDeliverBo extends BaseEntity {
      */
     private String consigneePhone;
 
+    private String dataSource;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderDeliverProductBo.java

@@ -60,6 +60,8 @@ public class OrderDeliverProductBo extends BaseEntity {
      */
     private Long deliverNum;
 
+    private String dataSource;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderMainBo.java

@@ -57,6 +57,11 @@ public class OrderMainBo extends BaseEntity {
     @NotNull(message = "客户ID（关联客户主表）不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long customerId;
 
+    /**
+     * 客户编号
+     */
+    private String customerCode;
+
     /**
      * 用户ID（关联用户表）
      */
@@ -247,11 +252,6 @@ public class OrderMainBo extends BaseEntity {
     @NotBlank(message = "费用类型不能为空", groups = {AddGroup.class, EditGroup.class})
     private String expenseType;
 
-    /**
-     * 客户编号
-     */
-    private String customerNo;
-
     /**
      * 用户编号
      */
@@ -262,6 +262,8 @@ public class OrderMainBo extends BaseEntity {
      */
     private String status;
 
+    private String dataSource;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderProductBo.java

@@ -8,9 +8,13 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
 import java.math.BigDecimal;
+
 import org.dromara.common.translation.annotation.Translation;
+
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.common.translation.constant.TransConstant;
 
@@ -33,7 +37,7 @@ public class OrderProductBo extends BaseEntity {
     /**
      * 订单ID
      */
-    @NotNull(message = "订单ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "订单ID不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long orderId;
 
     /**
@@ -141,6 +145,8 @@ public class OrderProductBo extends BaseEntity {
      */
     private String status;
 
+    private String dataSource;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderDeliverProductVo.java

@@ -80,5 +80,7 @@ public class OrderDeliverProductVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private String dataSource;
+
 
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderDeliverVo.java

@@ -125,5 +125,7 @@ public class OrderDeliverVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private String dataSource;
+
     private List<OrderDeliverProductVo> deliverProductList;
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderMainVo.java

@@ -69,6 +69,11 @@ public class OrderMainVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "关=联客户主表")
     private Long customerId;
 
+    /**
+     * 客户编号
+     */
+    private String customerCode;
+
     /**
      * 用户ID（关联用户表）
      */
@@ -299,12 +304,6 @@ public class OrderMainVo implements Serializable {
     @ExcelDictFormat(dictType = "fee_type")
     private String expenseType;
 
-    /**
-     * 客户编号
-     */
-    @ExcelProperty(value = "客户编号")
-    private String customerNo;
-
     /**
      * 用户编号
      */
@@ -324,6 +323,8 @@ public class OrderMainVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private String dataSource;
+
     private List<OrderProductVo> orderProductList;
 
     private List<OrderDeliverProductVo> deliverProductList;

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderProductVo.java

@@ -1,8 +1,11 @@
 package org.dromara.order.domain.vo;
 
 import java.math.BigDecimal;
+
 import org.dromara.common.translation.annotation.Translation;
+
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.order.domain.OrderProduct;
@@ -18,7 +21,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 订单商品明细视图对象 order_product
  *
@@ -189,5 +191,7 @@ public class OrderProductVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private String dataSource;
+
 
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderStatusStats.java

@@ -0,0 +1,40 @@
+package org.dromara.order.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderStatusStats implements Serializable {
+
+
+    /**
+     * 待付款订单数量
+     */
+    private Long pendingPaymentCount;
+
+    /**
+     * 待发货订单数量
+     */
+    private Long pendingShipmentCount;
+
+    /**
+     * 已发货订单数量
+     */
+    private Long shippedCount;
+
+    /**
+     * 已完成订单数量
+     */
+    private Long completedCount;
+
+    /**
+     * 已关闭订单数量
+     */
+    private Long closedCount;
+
+    /**
+     * 订单总数
+     */
+    private Long totalCount;
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/mapper/OrderMainMapper.java

@@ -3,6 +3,7 @@ package org.dromara.order.mapper;
 import org.dromara.order.domain.OrderMain;
 import org.dromara.order.domain.vo.OrderMainVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.order.domain.vo.OrderStatusStats;
 
 /**
  * 订单主信息Mapper接口
@@ -12,4 +13,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface OrderMainMapper extends BaseMapperPlus<OrderMain, OrderMainVo> {
 
+    OrderStatusStats selectOrderStatusCounts();
+
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderMainService.java

@@ -6,6 +6,7 @@ import org.dromara.order.domain.vo.OrderMainVo;
 import org.dromara.order.domain.bo.OrderMainBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.order.domain.vo.OrderStatusStats;
 
 import java.util.Collection;
 import java.util.List;
@@ -43,6 +44,8 @@ public interface IOrderMainService extends IService<OrderMain> {
      */
     List<OrderMainVo> queryList(OrderMainBo bo);
 
+    OrderStatusStats queryOrderStatusStats();
+
     /**
      * 新增订单主信息
      *

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderMainServiceImpl.java

@@ -18,6 +18,7 @@ import org.dromara.order.domain.bo.OrderMainBo;
 import org.dromara.order.domain.bo.OrderProductBo;
 import org.dromara.order.domain.vo.OrderMainVo;
 import org.dromara.order.domain.vo.OrderProductVo;
+import org.dromara.order.domain.vo.OrderStatusStats;
 import org.dromara.order.mapper.OrderDeliverMapper;
 import org.dromara.order.mapper.OrderDeliverProductMapper;
 import org.dromara.order.mapper.OrderMainMapper;
@@ -93,6 +94,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         return TableDataInfo.build(result);
     }
 
+    @Override
+    public OrderStatusStats queryOrderStatusStats() {
+        return baseMapper.selectOrderStatusCounts();
+    }
+
     /**
      * 查询符合条件的订单主信息列表
      *
@@ -110,6 +116,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         LambdaQueryWrapper<OrderMain> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(OrderMain::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), OrderMain::getOrderNo, bo.getOrderNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getCustomerCode()), OrderMain::getCustomerCode, bo.getCustomerCode());
         lqw.eq(StringUtils.isNotBlank(bo.getShipmentNo()), OrderMain::getShipmentNo, bo.getShipmentNo());
         lqw.eq(StringUtils.isNotBlank(bo.getSubOrderNo()), OrderMain::getSubOrderNo, bo.getSubOrderNo());
         lqw.eq(bo.getCompanyId() != null, OrderMain::getCompanyId, bo.getCompanyId());
@@ -151,7 +158,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         lqw.eq(StringUtils.isNotBlank(bo.getProductCode()), OrderMain::getProductCode, bo.getProductCode());
         lqw.eq(StringUtils.isNotBlank(bo.getCancelReason()), OrderMain::getCancelReason, bo.getCancelReason());
         lqw.eq(StringUtils.isNotBlank(bo.getExpenseType()), OrderMain::getExpenseType, bo.getExpenseType());
-        lqw.eq(StringUtils.isNotBlank(bo.getCustomerNo()), OrderMain::getCustomerNo, bo.getCustomerNo());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), OrderMain::getStatus, bo.getStatus());
         return lqw;
     }

ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMainMapper.xml

@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.order.mapper.OrderMainMapper">
-
+    <!-- 查询各订单状态的数量 -->
+    <select id="selectOrderStatusCounts" resultType="org.dromara.order.domain.vo.OrderStatusStats">
+        SELECT SUM(CASE WHEN order_status = '0' THEN 1 ELSE 0 END) AS pendingPaymentCount,
+               SUM(CASE WHEN order_status = '2' THEN 1 ELSE 0 END) AS pendingShipmentCount,
+               SUM(CASE WHEN order_status = '4' THEN 1 ELSE 0 END) AS shippedCount,
+               SUM(CASE WHEN order_status = '5' THEN 1 ELSE 0 END) AS completedCount,
+               SUM(CASE WHEN order_status = '6' THEN 1 ELSE 0 END) AS closedCount,
+               COUNT(*)                                            AS totalCount
+        FROM order_main
+        WHERE del_flag = '0'
+    </select>
 </mapper>