From 77889fe08a3267da2dcf654da757ff99303eadda Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Mon, 20 Jan 2025 18:47:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E5=B9=BF?=
 =?UTF-8?q?=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改订单成本报表未生成问题
---
 .../receiver/report/ReportListener.java       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java
index bf8ffe6d4..35b542b81 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java
@@ -1,8 +1,9 @@
 package com.logpm.distribution.receiver.report;
 
-import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.logpm.distribution.pros.DistributionProperties;
 import com.logpm.distribution.service.IQualityDeliverService;
@@ -534,9 +535,11 @@ public class ReportListener {
 	public void orderExpenseDispatchDetailFinal(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag) {
 		log.info("生成订单总成本报表: {}", msg);
 		try {
-			JSONArray objects = JSONUtil.parseArray(msg);
-			if(CollUtil.isNotEmpty(objects)){
-				qualityDeliverService.orderExpenseDispatchDetailFinal(objects);
+			JSONObject objects = JSONUtil.parseObj(msg);
+			if(ObjectUtil.isNotEmpty(objects)){
+				JSONArray jas = new JSONArray();
+				jas.add(objects);
+				qualityDeliverService.orderExpenseDispatchDetailFinal(jas);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -557,9 +560,11 @@ public class ReportListener {
 	public void expenseWarehouseOrder(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag) {
 		log.info("生成仓储订单总成本报表: {}", msg);
 		try {
-			JSONArray objects = JSONUtil.parseArray(msg);
-			if(CollUtil.isNotEmpty(objects)){
-				qualityDeliverService.expenseWarehouseOrder(objects);
+			JSONObject objects = JSONUtil.parseObj(msg);
+			if(ObjectUtil.isNotEmpty(objects)){
+				JSONArray jas = new JSONArray();
+				jas.add(objects);
+				qualityDeliverService.expenseWarehouseOrder(jas);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();