From 561ab63245a722f7588e1bed53fbcb4d7a3455ac Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Thu, 12 Oct 2023 17:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E5=90=88=E8=AE=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VtbVerificationDataController.java        | 51 +++++++++++++++++++
 .../vtb/entity/dto/VtbVerificationDTO.java    |  8 +--
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java
index 839f000f..ff663fed 100644
--- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java
+++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,6 +62,29 @@ public class VtbVerificationDataController {
         return R.byEmptyList();
     }
 
+    /**
+     * 获取活动的核销情况合计
+     * @param query
+     * @return
+     */
+    @GetMapping("pageActivityCheckSum")
+    public R<?> getActivityDataSum(VtbActivityCheckSo query){
+        VtbActivityCheckDTO dto = new VtbActivityCheckDTO();
+        List<VtbActivityCheckDTO> list = new ArrayList<>();
+        Long count = verReportMapper.countActiveAndVtbDataAmount(query);
+        if(count>0) {
+            List<Long> activityIds = verReportMapper.getActiveIdsForDataAmount(query);
+            query.setActivityIds(activityIds);
+            list = verReportMapper.pageActiveAndVtbDataAmount(query);
+            dto.setActivityAmount(list.stream().map(a->a.getActivityAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
+            dto.setCheckedAmount(list.stream().map(a->a.getCheckedAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
+            dto.setCheckingAmount(list.stream().map(a->a.getCheckingAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
+            dto.setNotCheckAmount(list.stream().map(a->a.getNotCheckAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
+            dto.setReleaseAmount(list.stream().map(a->a.getReleaseAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
+        }
+        return R.ok(dto);
+    }
+
     /**
      * 获取活动的核销情况(导出)
      * @param query
@@ -106,6 +130,33 @@ public class VtbVerificationDataController {
         return R.byEmptyList();
     }
 
+    /**
+     * 获取核销的支付信息合计
+     * @param query
+     * @return
+     */
+    @GetMapping("pageVerificationCheckSum")
+    public R<?> getVerificationDataSum(VtbVerificationCheckSo query){
+        VtbVerificationDTO dto = new VtbVerificationDTO();
+        List<VtbVerificationDTO> list = new ArrayList<>();
+
+        Long count = verPayReportMapper.countVerificationCheck(query);
+        if(count>0) {
+            List<Long> ids = verPayReportMapper.getVerificationIdsForPay(query);
+            if(ids.size()==0){
+                ids.add(0L);
+            }
+            query.setVtbIds(ids);
+
+            list = verPayReportMapper.pageVerificationCheck(query);
+            dto.setAmount(list.stream().map(a->a.getAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
+            dto.setPayAmount(list.stream().map(a->a.getPayAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
+            dto.setNotPayAmount(list.stream().map(a->a.getNotPayAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
+            dto.setUnpayAmount(list.stream().map(a->a.getUnpayAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
+        }
+        return R.ok(dto);
+    }
+
     /**
      * 获取核销的支付信息(导出)
      * @param query
diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java
index ceec18fb..58621546 100644
--- a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java
+++ b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java
@@ -40,13 +40,13 @@ public class VtbVerificationDTO {
     /** 支付方式 */
     private String wayTitle;
     /** 核销金额 */
-    private String amount;
+    private BigDecimal amount;
     /** 支付金额 */
-    private String payAmount;
+    private BigDecimal payAmount;
     /** 不再支付金额 */
-    private String notPayAmount;
+    private BigDecimal notPayAmount;
 
-    private String unpayAmount;
+    private BigDecimal unpayAmount;
 
     /** 费用编码 */
     private String costApplyCode;