From 2c8d555fd384ed7be1d06122a3b73cd911f6aadc Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Wed, 25 Sep 2024 19:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/RepairOrderInfoController.java      | 13 +++++++++-
 .../order/mapper/RepairOrderInfoMapper.java   |  9 +++++++
 .../order/service/RepairOrderInfoService.java | 10 +++++++
 .../impl/RepairOrderInfoServiceImpl.java      | 15 ++++++++---
 .../module/order/vo/RepairOrderCensusVO.java  | 26 +++++++++++++++++++
 .../mapper/order/RepairOrderInfoMapper.xml    | 11 ++++++++
 6 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderCensusVO.java

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
index 3a84dad1..64e62ee8 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
@@ -84,5 +84,16 @@ public class RepairOrderInfoController {
         return success(repairOrderInfoService.queryListPage(pageReqVO,page));
     }
 
-
+    /**
+     * 统计未入账和已入账(最简版)
+     *
+     * @author 小李
+     * @date 18:52 2024/9/25
+    **/
+    @GetMapping("/census")
+    @Operation(summary = "统计未入账和已入账")
+    @PreAuthorize("@ss.hasPermission('repair:order-info:query')")
+    public CommonResult<?> census() {
+        return success(repairOrderInfoService.census());
+    }
 }
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/mapper/RepairOrderInfoMapper.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/mapper/RepairOrderInfoMapper.java
index 0e05c523..1f8cc69b 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/mapper/RepairOrderInfoMapper.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/mapper/RepairOrderInfoMapper.java
@@ -35,4 +35,13 @@ public interface RepairOrderInfoMapper extends BaseMapper<RepairOrderInfo> {
      * @param respVO 查询对象
      **/
     IPage<RepairOrderInfoRespVO> getOrderPageByStatus(@Param("map") RepairOrderInfoRespVO respVO, Page<RepairOrderInfo> page);
+
+    /**
+     * 统计未入账和已入账(最简版)
+     *
+     * @author 小李
+     * @date 18:52 2024/9/25
+     **/
+    RepairOrderCensusVO census();
+
 }
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java
index 3feb5323..bf3dc0ca 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.order.service;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
+import cn.iocoder.yudao.module.order.vo.RepairOrderCensusVO;
 import cn.iocoder.yudao.module.order.vo.RepairOrderInfoPageReqVO;
 import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
 import cn.iocoder.yudao.module.order.vo.RepairOrderInfoSaveReqVO;
@@ -114,4 +115,13 @@ public interface RepairOrderInfoService extends IService<RepairOrderInfo> {
      * @date 15:50 2024/9/24
      **/
     IPage<RepairOrderInfo> getAppraisePage(Page<RepairOrderInfo> page);
+
+
+    /**
+     * 统计未入账和已入账(最简版)
+     *
+     * @author 小李
+     * @date 18:52 2024/9/25
+     **/
+    RepairOrderCensusVO census();
 }
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
index 9514b50e..0c907c3f 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
@@ -10,10 +10,8 @@ import cn.iocoder.yudao.module.custom.service.CustomerBalanceService;
 import cn.iocoder.yudao.module.custom.service.CustomerCouponService;
 import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
 import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
+import cn.iocoder.yudao.module.order.vo.*;
 import cn.iocoder.yudao.module.order.vo.RepairOrderInfoMapper;
-import cn.iocoder.yudao.module.order.vo.RepairOrderInfoPageReqVO;
-import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
-import cn.iocoder.yudao.module.order.vo.RepairOrderInfoSaveReqVO;
 import cn.iocoder.yudao.module.tickets.entity.Tickets;
 import cn.iocoder.yudao.module.tickets.service.TicketsService;
 import cn.iocoder.yudao.util.WechatPayConfig;
@@ -236,4 +234,15 @@ public class RepairOrderInfoServiceImpl extends ServiceImpl<RepairOrderInfoMappe
                     .isNotNull(RepairOrderInfo::getCommentDesc);
         }));
     }
+
+    /**
+     * 统计未入账和已入账(最简版)
+     *
+     * @author 小李
+     * @date 18:52 2024/9/25
+     **/
+    @Override
+    public RepairOrderCensusVO census(){
+        return baseMapper.census();
+    }
 }
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderCensusVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderCensusVO.java
new file mode 100644
index 00000000..2c465883
--- /dev/null
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderCensusVO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.order.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 统计用
+ *
+ * @author 小李
+ * @date 18:54 2024/9/25
+**/
+@Data
+public class RepairOrderCensusVO {
+
+    /** 已入账 */
+    private BigDecimal credited;
+    /** 未入账 */
+    private BigDecimal notCredited;
+    /** 线上支付 */
+    private BigDecimal onlinePay;
+    /** 现金支付 */
+    private BigDecimal cashPay;
+    /** 签单、挂账 */
+    private BigDecimal signedPay;
+}
diff --git a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
index 92c826e1..b203889f 100644
--- a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
@@ -57,4 +57,15 @@
         </if>
         order by roi.create_time desc
     </select>
+    <select id="census" resultType="cn.iocoder.yudao.module.order.vo.RepairOrderCensusVO">
+        SELECT
+            -- 统计已入账和未入账的数量
+            SUM(CASE WHEN order_status = '1' THEN pay_money ELSE 0 END)                     AS credited,
+            SUM(CASE WHEN order_status = '0' THEN goods_price ELSE 0 END)                   AS notCredited,
+            -- 统计已入账的细分情况
+            SUM(CASE WHEN order_status = '1' AND pay_type = '01' THEN pay_money ELSE 0 END) AS onlinePay,
+            SUM(CASE WHEN order_status = '1' AND pay_type = '02' THEN pay_money ELSE 0 END) AS cashPay,
+            SUM(CASE WHEN order_status = '1' AND pay_type = '03' THEN pay_money ELSE 0 END) AS signedPay
+        FROM repair_order_info;
+    </select>
 </mapper>
\ No newline at end of file