|
@@ -110,7 +110,7 @@ public class PayBillToolUtil {
|
|
|
|
|
|
|
|
|
if ("997".equals(info.get("paymenttype.number"))) {
|
|
|
- data.put("PAY_FLAG", 2);
|
|
|
+ data.put("PAY_FLAG", "2");
|
|
|
} else {
|
|
|
data.put("PAY_FLAG", "1");
|
|
|
}
|
|
@@ -251,8 +251,8 @@ public class PayBillToolUtil {
|
|
|
|
|
|
data.put("RECE_OPBANK_NAME", skyhinfo.get("name").toString());
|
|
|
|
|
|
-
|
|
|
- data.put("RECE_CNAPS", skyhinfo.get("number") + "");
|
|
|
+
|
|
|
+ data.put("RECE_CNAPS", skyhinfo.get("union_number") + "");
|
|
|
|
|
|
|
|
|
data.put("RECE_ACC_NAME", info.get("recaccbankname") + "");
|
|
@@ -416,10 +416,16 @@ public class PayBillToolUtil {
|
|
|
errMsg.append("\r\n");
|
|
|
} else if (!"000000".equals(cbsReturnJson.get("resultCode"))) {
|
|
|
isSuccess = false;
|
|
|
- cbsReturnJson.get("resultCode");
|
|
|
+ String resultCode = cbsReturnJson.get("resultCode")+"";
|
|
|
String resultMsg = cbsReturnJson.get("resultMsg") + "";
|
|
|
|
|
|
- if (resultMsg.indexOf("单据是非驳回状态") >= 0 || resultMsg.indexOf("付款指令重复") >= 0) {
|
|
|
+ if("JFXXXXC".equals(resultCode)){
|
|
|
+ isSuccess = false;
|
|
|
+ errMsg.append("单据号:").append(billNum).append(",推送资金系统失败,");
|
|
|
+ errMsg.append("错误号:").append(cbsReturnJson.get("resultCode"));
|
|
|
+ errMsg.append(",错误原因:").append(resultMsg);
|
|
|
+ errMsg.append("\r\n");
|
|
|
+ }else if (resultMsg.indexOf("单据是非驳回状态") >= 0 || resultMsg.indexOf("付款指令重复") >= 0) {
|
|
|
isSuccess = true;
|
|
|
errMsg.append("单据号:").append(billNum).append("付款指令重复,说明已推送到资金系统!");
|
|
|
payBillEntity.set("nckd_fkcs", fkcs + 1);
|
|
@@ -582,12 +588,17 @@ public class PayBillToolUtil {
|
|
|
errMsg.append("错误号:").append("XXXXXXX");
|
|
|
errMsg.append(",错误原因:").append("接口无法连通,未获取到返回结果");
|
|
|
errMsg.append("\r\n");
|
|
|
- } else if (!"000000".equals(cbsReturnJson.get("resultCode"))) {
|
|
|
+ }if (!"000000".equals(cbsReturnJson.get("resultCode"))) {
|
|
|
isSuccess = false;
|
|
|
- cbsReturnJson.get("resultCode");
|
|
|
+ String resultCode = cbsReturnJson.get("resultCode")+"";
|
|
|
String resultMsg = cbsReturnJson.get("resultMsg") + "";
|
|
|
-
|
|
|
- if (resultMsg.indexOf("单据是非驳回状态") >= 0 || resultMsg.indexOf("付款指令重复") >= 0) {
|
|
|
+ if("JFXXXXC".equals(resultCode)){
|
|
|
+ isSuccess = false;
|
|
|
+ errMsg.append("单据号:").append(billNum).append(",推送资金系统失败,");
|
|
|
+ errMsg.append("错误号:").append(cbsReturnJson.get("resultCode"));
|
|
|
+ errMsg.append(",错误原因:").append(resultMsg);
|
|
|
+ errMsg.append("\r\n");
|
|
|
+ }else if (resultMsg.indexOf("单据是非驳回状态") >= 0 || resultMsg.indexOf("付款指令重复") >= 0) {
|
|
|
isSuccess = true;
|
|
|
errMsg.append("单据号:").append(billNum).append("付款指令重复,说明已推送到资金系统!");
|
|
|
payBillEntity.set("nckd_fkcs", fkcs + 1);
|