|
@@ -840,19 +840,19 @@ public class WmPayOffController {
|
|
|
return R.failed("必填参数为空");
|
|
|
}
|
|
|
|
|
|
+ WmScorePackage scorePackage = wmScorePackageMapper.selectById(input.getId());
|
|
|
// 查询结算详情(用于拼接notes数据)
|
|
|
R<?> queryR = wmPayOffService.settleById(input.getId());
|
|
|
|
|
|
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");
|
|
|
|
|
|
WmScorePackageSettleNote settleNote = notes.get(0);
|
|
|
|
|
|
input.setSubjectLocation(settleNote.getSubjectLocation());
|
|
|
input.setInvoiceCategory(settleNote.getInvoiceType());
|
|
|
- input.setScorePackageName(wsp.getScorePackageName());
|
|
|
+ input.setScorePackageName(scorePackage.getScorePackageName());
|
|
|
input.setNotes(notes);
|
|
|
// 调用单个复核
|
|
|
R<?> settleR = wmPayOffService.financialReview(input);
|
|
@@ -867,14 +867,14 @@ public class WmPayOffController {
|
|
|
|
|
|
if (failFlag) {
|
|
|
Map<String, String> msgMap = new HashMap<>(2);
|
|
|
- msgMap.put("packageName", input.getScorePackageName());
|
|
|
+ msgMap.put("packageName", scorePackage.getScorePackageName());
|
|
|
msgMap.put("reason", settleR.getMsg());
|
|
|
msgList.add(msgMap);
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
Map<String, String> msgMap = new HashMap<>(2);
|
|
|
- msgMap.put("packageName", input.getScorePackageName());
|
|
|
+ msgMap.put("packageName", scorePackage.getScorePackageName());
|
|
|
msgMap.put("reason", queryR.getMsg());
|
|
|
msgList.add(msgMap);
|
|
|
}
|