feat: 财务复核功能-财务复核/批量财务复核接口2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -696,7 +696,7 @@ public class WmPayOffController {
 	@SysLog("结算-自由选择渠道")
 	@PostMapping("/settleIssueBySubType")
 	public R<?> settleIssueBySubType(@RequestBody WmScorePackageSettleInput input) {
-
+		log.info("结算-自由选择渠道参数:{}", input);
 
 		if (StrUtil.isBlank(input.getId()) || StrUtil.isBlank(input.getScorePackageName()) || input.getSubjectLocation() == null || CollUtil.isEmpty(input.getNotes()) || null == input.getInvoiceCategory()) {
 			return R.failed("数据异常");
@@ -715,6 +715,7 @@ public class WmPayOffController {
 	@PostMapping("/batch-financial-settle")
 	@SuppressWarnings("all")
 	public R<?> batchFinancialSettle(@RequestBody List<WmScorePackageSettleInput> inputList) {
+		log.info("批量财务结算参数:{}", inputList);
 
 		if (CollectionUtil.isEmpty(inputList)) {
 			return R.failed("数据异常");
@@ -783,11 +784,26 @@ public class WmPayOffController {
 	@SysLog("财务复核")
 	@PostMapping("/financial-review")
 	public R<?> financialReview(@RequestBody WmScorePackageSettleInput input) {
+		log.info("财务复核参数:{}", input);
 
-		if (StrUtil.isBlank(input.getId()) || input.getReviewStatus() == null) {
-			return R.failed("id或财务复核状态必填");
+		if (StringUtils.isEmpty(input.getId()) || null == input.getSubjectLocation() || null == input.getInvoiceCategory()) {
+			return R.failed("必填参数为空");
 		}
 
+		// 查询结算详情（用于拼接notes数据）
+		R<?> queryR = wmPayOffService.settleById(input.getId());
+
+		if (queryR.getCode() != 0) {
+			return R.failed("数据异常");
+		}
+
+		Map<String, Object> queryData = (Map<String, Object>) queryR.getData();
+		List<WmScorePackageSettleNote> notes = (List<WmScorePackageSettleNote>) queryData.get("notes");
+		WmScorePackage wsp = (WmScorePackage) queryData.get("wsp");
+
+		input.setScorePackageName(wsp.getScorePackageName());
+		input.setNotes(notes);
+
 		return wmPayOffService.financialReview(input);
 	}
 
@@ -800,6 +816,7 @@ public class WmPayOffController {
 	@SysLog("批量财务复核")
 	@PostMapping("/batch-financial-review")
 	public R<?> batchFinancialReview(@RequestBody List<WmScorePackageSettleInput> inputList) {
+		log.info("批量财务复核参数:{}", inputList);
 
 		if (CollectionUtil.isEmpty(inputList)) {
 			return R.failed("参数为空");
@@ -808,8 +825,8 @@ public class WmPayOffController {
 		List<Map<String, String>> msgList = new ArrayList<>();
 
 		for (WmScorePackageSettleInput input : inputList) {
-			if (StrUtil.isBlank(input.getId()) || input.getReviewStatus() == null) {
-				return R.failed("id或财务复核状态必填");
+			if (StringUtils.isEmpty(input.getId()) || null == input.getSubjectLocation() || null == input.getInvoiceCategory()) {
+				return R.failed("必填参数为空");
 			}
 
 			// 查询结算详情（用于拼接notes数据）
@@ -818,7 +835,9 @@ public class WmPayOffController {
 			if (queryR.getCode() == 0) {
 				Map<String, Object> queryData = (Map<String, Object>) queryR.getData();
 				List<WmScorePackageSettleNote> notes = (List<WmScorePackageSettleNote>) queryData.get("notes");
+				WmScorePackage wsp = (WmScorePackage) queryData.get("wsp");
 
+				input.setScorePackageName(wsp.getScorePackageName());
 				input.setNotes(notes);
 				// 调用单个结算
 				R<?> settleR = wmPayOffService.settleIssueBySubType(input);