From 548f6fab190824ae63ee14a81019f97b0006ba73 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 28 May 2024 18:22:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/trunkline/feign/ITrunklinePackageTrackLogClient.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklinePackageTrackLogClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklinePackageTrackLogClient.java
index 61af39974..c6b909d3a 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklinePackageTrackLogClient.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklinePackageTrackLogClient.java
@@ -16,6 +16,6 @@ public interface ITrunklinePackageTrackLogClient {
 	String API_PREFIX = "trunklinePackageTrackLog/client";
 
 	@PostMapping(API_PREFIX+"/addBatchPackageTrackLog")
-	void addPackageTrackLog(@RequestParam List<JSONObject> addPackageTrackLogList, List<String> orderPackageCodes, Integer workNode);
+	void addPackageTrackLog(@RequestParam List<JSONObject> addPackageTrackLogList, @RequestParam List<String> orderPackageCodes, @RequestParam Integer workNode);
 
 }

From 41fc4c8666a27266c0bec3b18b6aaf2d825f10c0 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 29 May 2024 09:55:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E7=BB=93=E7=AE=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/dto/MerchantStatisticsDTO.java |  2 ++
 .../controller/MerchantBalanceController.java | 25 +++++++++++++++++++
 .../IStatisticsBalanceOrderInfoService.java   |  3 +++
 ...StatisticsBalanceOrderInfoServiceImpl.java |  8 ++++++
 4 files changed, 38 insertions(+)

diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java
index d1ad2df46..2b84490e0 100644
--- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java
+++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java
@@ -23,4 +23,6 @@ public class MerchantStatisticsDTO implements Serializable {
 
 	private List<Long> orderInfoIds;
 
+	private Long balanceOrderId;
+
 }
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantBalanceController.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantBalanceController.java
index a40475a47..5d67944a7 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantBalanceController.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantBalanceController.java
@@ -155,5 +155,30 @@ public class MerchantBalanceController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/findBalanceDetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询异常列表", notes = "传入merchantStatisticsDTO")
+	public R findBalanceDetail(@RequestBody MerchantStatisticsDTO merchantStatisticsDTO) {
+		String method = "############findBalanceDetail: ";
+		log.info(method+"请求参数{}",merchantStatisticsDTO);
+		try{
+
+			Long balanceOrderId = merchantStatisticsDTO.getBalanceOrderId();
+			if(Objects.isNull(balanceOrderId)){
+				log.warn(method+"请选择正确的结算单 balanceOrderId={}",balanceOrderId);
+				return R.fail(405,"请选择正确的结算单");
+			}
+
+			return balanceOrderInfoService.findBalanceDetail(balanceOrderId);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
 
 }
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsBalanceOrderInfoService.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsBalanceOrderInfoService.java
index 15bd8f331..46d550728 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsBalanceOrderInfoService.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsBalanceOrderInfoService.java
@@ -19,4 +19,7 @@ public interface IStatisticsBalanceOrderInfoService extends BaseService<Statisti
 	R addBalanceRecord(StatisticsBalanceRecordDTO balanceRecordDTO);
 
 	R findRecordList(StatisticsBalanceRecordDTO balanceRecordDTO);
+
+    R findBalanceDetail(Long balanceOrderId);
+
 }
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsBalanceOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsBalanceOrderInfoServiceImpl.java
index 9af13a8b6..2181a44ab 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsBalanceOrderInfoServiceImpl.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsBalanceOrderInfoServiceImpl.java
@@ -213,5 +213,13 @@ public class StatisticsBalanceOrderInfoServiceImpl extends BaseServiceImpl<Stati
 		return R.data(list);
 	}
 
+	@Override
+	public R findBalanceDetail(Long balanceOrderId) {
+
+		StatisticsBalanceOrderInfoEntity statisticsBalanceOrderInfoEntity = baseMapper.selectById(balanceOrderId);
+
+		return R.data(statisticsBalanceOrderInfoEntity);
+	}
+
 
 }