Merge remote-tracking branch 'origin/dev' into dev

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;
+
 }

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);
 
 }

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,"系统异常");
+		}
+	}
+
 
 }

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);
+
 }

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);
+	}
+
 
 }