From ab6a8d70986c284d27c8bb9059973889c6fc5805 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 7 Feb 2025 15:00:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderDetailResultController.java       | 11 +++++++++--
 .../api/res/inout/IoOrderDetailResultResponse.java |  6 ++++++
 .../api/task/ScanThrOrderGenerateOrderTask.java    | 14 +++++++-------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
index 79e616266..d4e789332 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
@@ -271,15 +271,22 @@ public class IoOrderDetailResultController extends BaseController {
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderList(orderDetailResultRequest);
 
         for (IoOrderDetailResultResponse orderDetailResultResponse : list) {
+            BigDecimal totalPrice = BigDecimal.ZERO;
+            BigDecimal price = orderDetailResultResponse.getPrice();
+            int reCount = orderDetailResultResponse.getReCount();
+            if (price != null){
+                totalPrice = price.multiply(BigDecimal.valueOf(reCount));
+            }
             if (orderDetailResultResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                orderDetailResultResponse.setOutCount(orderDetailResultResponse.getReCount());
+                orderDetailResultResponse.setOutCount(reCount);
                 orderDetailResultResponse.setInCount(0);
             } else {
                 orderDetailResultResponse.setOutCount(0);
-                orderDetailResultResponse.setInCount(orderDetailResultResponse.getReCount());
+                orderDetailResultResponse.setInCount(reCount);
             }
             String fromName = orderDetailResultResponse.getFromName();
             orderDetailResultResponse.setFromName(fromName);
+            orderDetailResultResponse.setSumPrice(totalPrice);
         }
         return list;
     }
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
index 83c49f26a..a8375f4ca 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
@@ -233,4 +233,10 @@ public class IoOrderDetailResultResponse {
     }
 
 
+
+    /**
+     * 价格
+     */
+    private BigDecimal sumPrice;
+
 }
diff --git a/src/main/java/com/glxp/api/task/ScanThrOrderGenerateOrderTask.java b/src/main/java/com/glxp/api/task/ScanThrOrderGenerateOrderTask.java
index 109e8e5c0..22b7825f9 100644
--- a/src/main/java/com/glxp/api/task/ScanThrOrderGenerateOrderTask.java
+++ b/src/main/java/com/glxp/api/task/ScanThrOrderGenerateOrderTask.java
@@ -47,13 +47,13 @@ public class ScanThrOrderGenerateOrderTask implements SchedulingConfigurer {
 
     private void process() {
 //=======================================================================================
-//        log.info("定时扫描三方的明细表-收费明细类型开开始");
-//        try {
-//            thrInvOrderService.scanInvSfOrderGenerateSfOrder();
-//        } catch (Exception e) {
-//            log.error(ExceptionUtils.getStackTrace(e));
-//        }
-//        log.info("定时扫描三方的明细表-收费明细类型结束");
+        log.info("定时扫描三方的明细表-收费明细类型开开始");
+        try {
+            thrInvOrderService.scanInvSfOrderGenerateSfOrder();
+        } catch (Exception e) {
+            log.error(ExceptionUtils.getStackTrace(e));
+        }
+        log.info("定时扫描三方的明细表-收费明细类型结束");
 //=======================================================================================
         log.info("定时扫描三方的明细表-普耗明细类型开开始");
         try {