Commit 394798ae authored by hongguangwu's avatar hongguangwu

MVP1.7.2 工行4次提交_发放

parent 0f69db4a
...@@ -108,7 +108,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -108,7 +108,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
//bizContent.setTotalAmt("2") //bizContent.setTotalAmt("2")
bizContent.setTotalAmt(totalAmt); bizContent.setTotalAmt(totalAmt);
//总笔数 oprType 为2时,非必输 //总笔数 oprType 为2时,非必输
//bizContent.setTotalCount("2"); //bizContent.setTotalCount("2")
bizContent.setTotalCount(totalCount); bizContent.setTotalCount(totalCount);
//批次号--每日批号不能重复,系统生成批次号 //批次号--每日批号不能重复,系统生成批次号
//bizContent.setAppSerialno("WX203") //bizContent.setAppSerialno("WX203")
...@@ -119,8 +119,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -119,8 +119,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
//{平台编号}_{企业编号}_{批次号}_{代发方式}_yyyyMMdd .zip 压缩文件中,包含代发工资指令文件信息,为xls格式,xls文件名称同zip包文件名称 //{平台编号}_{企业编号}_{批次号}_{代发方式}_yyyyMMdd .zip 压缩文件中,包含代发工资指令文件信息,为xls格式,xls文件名称同zip包文件名称
bizContent.setLocalFilepath("D:/icbcFile/" + url); bizContent.setLocalFilepath("D:/icbcFile/" + url);
//文件md码 //文件md码
// TODO-直接取值mdCode //bizContent.setFileMdcode(getMdCode("D:/icbcFile/020101190_WX203_0_20241112.xls"))
//bizContent.setFileMdcode(getMdCode("D:/icbcFile/020101190_WX203_0_20241112.xls"));
bizContent.setFileMdcode(mdCode); bizContent.setFileMdcode(mdCode);
//文件类型:1-代发工资 2-报销 //文件类型:1-代发工资 2-报销
...@@ -128,7 +127,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -128,7 +127,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
bizContent.setNotifyUrl(null); bizContent.setNotifyUrl(null);
bizContent.setAppRemark("备注"); bizContent.setAppRemark("备注");
request.setBizContent(bizContent); request.setBizContent(bizContent);
// System.out.println("request: " + JSON.toJSONString(request)); // System.out.println("request: " + JSON.toJSONString(request))
try { try {
String result = client.buildPostForm(request); String result = client.buildPostForm(request);
...@@ -137,9 +136,9 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -137,9 +136,9 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
} }
} catch (IcbcApiException e) { } catch (IcbcApiException e) {
e.printStackTrace(); e.printStackTrace();
return R.failed(); return R.failed("发放失败");
} }
return R.ok(); return R.failed("发放失败!");
} }
/** /**
...@@ -659,7 +658,14 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -659,7 +658,14 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
String wxNo = main.getFdWxNo(); String wxNo = main.getFdWxNo();
String url = main.getFdAttaName(); String url = main.getFdAttaName();
String mdCode = main.getFdMdCode(); String mdCode = main.getFdMdCode();
return submitIcbcTransactionFlow(totalAmt, totalCount, wxNo, url, mdCode); R<String> returnR = submitIcbcTransactionFlow(totalAmt, totalCount, wxNo, url, mdCode);
if (returnR.getCode() == CommonConstants.SUCCESS) {
// 发放次数+1,改主表或明细表“发放状态”为“发放中”
main.setFdGrantStatus("发放中");
main.setFdGrantNum(main.getFdGrantNum() + 1);
ekpBankPayTaskService.updateById(main);
}
return returnR;
} else { } else {
return R.failed("请检查状态!"); return R.failed("请检查状态!");
} }
...@@ -685,7 +691,14 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -685,7 +691,14 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
String wxNo = detail.getFdWxNo(); String wxNo = detail.getFdWxNo();
String url = detail.getFdAttaName(); String url = detail.getFdAttaName();
String mdCode = detail.getFdMdCode(); String mdCode = detail.getFdMdCode();
return submitIcbcTransactionFlow(totalAmt, totalCount, wxNo, url, mdCode); R<String> returnR = submitIcbcTransactionFlow(totalAmt, totalCount, wxNo, url, mdCode);
if (returnR.getCode() == CommonConstants.SUCCESS) {
// 发放次数+1,改主表或明细表“发放状态”为“发放中”
detail.setFdGrantStatus("发放中");
detail.setFdGrantNum(detail.getFdGrantNum() + 1);
ekpBankGrantDetailService.updateById(detail);
}
return returnR;
} else { } else {
return R.failed("请检查状态!"); return R.failed("请检查状态!");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment