支付状态查询

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/fi/cas/opplugin/AgentPaySynPayStatusOpPlugin.java

@@ -67,9 +67,9 @@ public class AgentPaySynPayStatusOpPlugin extends AbstractOperationServicePlugIn
                 int fkcs = dataEntity.getInt("nckd_fkcs");
 
                 if(!"C".equals(billStatus) || !"2".equals(payStatus) || fkcs <= 0){
-                    logger.info("付款单同步失败，不符合查询条件。实体：{}", dataEntity);
+                    logger.info("代发单同步失败，未提交资金付款。实体：{}", dataEntity);
 
-                    errMsg.append("单据(" + billNum + ")不符合同步条件").append("\r\n");
+                    errMsg.append("代发单(" + billNum + ")未提交资金付款，请提交资金付款后再操作同步付款状态").append("\r\n");
                     continue;
                 }
 
@@ -91,16 +91,16 @@ public class AgentPaySynPayStatusOpPlugin extends AbstractOperationServicePlugIn
                 Map<String, String> tokenMap = PayBillToolUtil.getNtscToken();
 
                 if(tokenMap == null){
-                    logger.info("单据号：" + billNum + "查询失败： 获取token失败");
+                    logger.info("代发单：" + billNum + "查询失败： 获取token失败");
 
-                    errMsg.append("单据(" + billNum + ")查询失败： 获取token失败").append("\r\n");
+                    errMsg.append("代发单(" + billNum + ")查询失败： 获取token失败").append("\r\n");
                     continue;
                 }
 
                 if(!"0".equals(tokenMap.get("code"))){
-                    logger.info("单据号：" + billNum + "查询失败：获取token失败, " + tokenMap.get("msg"));
+                    logger.info("代发单：" + billNum + "查询失败：获取token失败, " + tokenMap.get("msg"));
 
-                    errMsg.append("单据(" + billNum + ")查询失败： 获取token失败").append("\r\n");
+                    errMsg.append("代发单(" + billNum + ")查询失败： 获取token失败").append("\r\n");
                     continue;
                 }
 
@@ -122,43 +122,43 @@ public class AgentPaySynPayStatusOpPlugin extends AbstractOperationServicePlugIn
 
                     apiResult = HttpUtils.postjson(url, header, bodyjson);
                 } catch (IOException e) {
-                    logger.info("单据号：" + billNum + "查询失败：" + e.getMessage());
+                    logger.info("代发单：" + billNum + "查询失败：" + e.getMessage());
 
-                    errMsg.append("单据(" + billNum + ")查询失败：" + e.getMessage()).append("\r\n");
+                    errMsg.append("代发单(" + billNum + ")查询失败：" + e.getMessage()).append("\r\n");
                     continue;
                 }
 
                 if(StringUtils.isEmpty(apiResult)){
-                    logger.info("单据号：" + billNum + "查询结果为空");
+                    logger.info("代发单：" + billNum + "查询结果为空");
 
-                    errMsg.append("单据(" + billNum + ")查询结果为空").append("\r\n");
+                    errMsg.append("代发单(" + billNum + ")查询结果为空").append("\r\n");
                     continue;
                 }
 
-                logger.info("单据号：" + billNum + "返回参数" + apiResult);
+                logger.info("代发单：" + billNum + "返回参数" + apiResult);
 
 //            JSONObject cbsReturnJson = new JSONObject(apiResult);
 
                 JSONObject esbReturnJson = new JSONObject(apiResult);
                 if(esbReturnJson.get("responseData") == null){
-                    logger.info("单据号：" + billNum + ", 未正常返回responseData参数");
+                    logger.info("代发单：" + billNum + ", 未正常返回responseData参数");
 
-                    errMsg.append("单据(" + billNum + "), 未正常返回responseData参数").append("\r\n");
+                    errMsg.append("代发单(" + billNum + "), 未正常返回responseData参数").append("\r\n");
                     return;
                 }
 
                 JSONArray esbJSONArray = esbReturnJson.getJSONArray("responseData");
                 if(esbJSONArray == null || esbJSONArray.length() == 0){
-                    logger.info("单据号：" + billNum + ", 未正常返回responseData参数");
+                    logger.info("代发单：" + billNum + ", 未正常返回responseData参数");
 
-                    errMsg.append("单据(" + billNum + "), 未正常返回responseData参数").append("\r\n");
+                    errMsg.append("代发单(" + billNum + "), 未正常返回responseData参数").append("\r\n");
                     return;
                 }
 
                 JSONObject cbsReturnJson = esbJSONArray.getJSONObject(0);
                 /************************************************************/
 
-                logger.info("单据号："+billNum+"返回参数"+cbsReturnJson.toString());
+                logger.info("代发单："+billNum+"返回参数"+cbsReturnJson.toString());
                 if(cbsReturnJson==null||cbsReturnJson.get("data")==null){
                 }else{
                     String errcode = cbsReturnJson.get("resultCode")+"";

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/fi/cas/opplugin/PaymentSynPayStatusOpPlugin.java

@@ -39,6 +39,7 @@ public class PaymentSynPayStatusOpPlugin extends AbstractOperationServicePlugIn
         fieldKeys.add("nckd_fqqdrq");
         fieldKeys.add("nckd_fkcs");
         fieldKeys.add("nckd_bbh");
+        fieldKeys.add("paymenttype");
     }
 
     @Override
@@ -63,11 +64,17 @@ public class PaymentSynPayStatusOpPlugin extends AbstractOperationServicePlugIn
                 String billStatus = dataEntity.getString("billstatus");
                 String payStatus = dataEntity.getString("nckd_paystatus");
                 int fkcs = dataEntity.getInt("nckd_fkcs");
+                DynamicObject paymenttype = dataEntity.getDynamicObject("paymenttype");
+
+                String billName = "付款单";
+                if("同名转账".equals(paymenttype.getString("name")) || "跨主体调拨".equals(paymenttype.getString("name"))){
+                    billName = "资金调度单";
+                }
 
                 if(!"C".equals(billStatus) || !"2".equals(payStatus) || fkcs <= 0){
-                    logger.info("付款单同步失败，不符合查询条件。实体：{}", dataEntity);
+                    logger.info(billName + "同步失败，未提交资金付款。实体：{}", dataEntity);
 
-                    errMsg.append("单据(" + billNum + ")不符合同步条件").append("\r\n");
+                    errMsg.append(billName + "(" + billNum + ")未提交资金付款，请提交资金付款后再操作同步付款状态").append("\r\n");
                     continue;
                 }
 
@@ -85,7 +92,7 @@ public class PaymentSynPayStatusOpPlugin extends AbstractOperationServicePlugIn
                 String bodyjson = param.toString();
 
 
-                logger.info("单据号："+billNum+"传入参数"+param.toString());
+                logger.info(billName + "："+billNum+"传入参数"+param.toString());
 
 
                 /***************************************add by wanghaiwu 20225/05/24*************************************************************/
@@ -96,16 +103,16 @@ public class PaymentSynPayStatusOpPlugin extends AbstractOperationServicePlugIn
                 Map<String, String> tokenMap = PayBillToolUtil.getNtscToken();
 
                 if(tokenMap == null){
-                    logger.info("单据号：" + billNum + "查询失败： 获取token失败");
+                    logger.info(billName + "：" + billNum + "查询失败： 获取token失败");
 
-                    errMsg.append("单据(" + billNum + ")查询失败： 获取token失败").append("\r\n");
+                    errMsg.append(billName + "(" + billNum + ")查询失败： 获取token失败").append("\r\n");
                     continue;
                 }
 
                 if(!"0".equals(tokenMap.get("code"))){
-                    logger.info("单据号：" + billNum + "查询失败：获取token失败, " + tokenMap.get("msg"));
+                    logger.info(billName + "：" + billNum + "查询失败：获取token失败, " + tokenMap.get("msg"));
 
-                    errMsg.append("单据(" + billNum + ")查询失败： 获取token失败").append("\r\n");
+                    errMsg.append(billName + "(" + billNum + ")查询失败： 获取token失败").append("\r\n");
 
                     continue;
                 }
@@ -128,35 +135,35 @@ public class PaymentSynPayStatusOpPlugin extends AbstractOperationServicePlugIn
 
                     apiResult = HttpUtils.postjson(url, header, bodyjson);
                 } catch (IOException e) {
-                    logger.info("单据号：" + billNum + "查询失败：" + e.getMessage());
-                    errMsg.append("单据(" + billNum + ")查询失败：" + e.getMessage()).append("\r\n");
+                    logger.info(billName + "：" + billNum + "查询失败：" + e.getMessage());
+                    errMsg.append(billName + "(" + billNum + ")查询失败：" + e.getMessage()).append("\r\n");
                     continue;
                 }
 
                 if(StringUtils.isEmpty(apiResult)){
-                    logger.info("单据号：" + billNum + "查询结果为空");
+                    logger.info(billName + "：" + billNum + "查询结果为空");
 
-                    errMsg.append("单据(" + billNum + ")查询结果为空").append("\r\n");
+                    errMsg.append(billName + "(" + billNum + ")查询结果为空").append("\r\n");
                     continue;
                 }
 
-                logger.info("单据号：" + billNum + "返回参数" + apiResult);
+                logger.info(billName + "：" + billNum + "返回参数" + apiResult);
 
 //            JSONObject cbsReturnJson = new JSONObject(apiResult);
 
                 JSONObject esbReturnJson = new JSONObject(apiResult);
                 if(esbReturnJson.get("responseData") == null){
-                    logger.info("单据号：" + billNum + ", 未正常返回responseData参数");
+                    logger.info(billName + "：" + billNum + ", 未正常返回responseData参数");
 
-                    errMsg.append("单据(" + billNum + "), 未正常返回responseData参数").append("\r\n");
+                    errMsg.append(billName + "(" + billNum + "), 未正常返回responseData参数").append("\r\n");
                     return;
                 }
 
                 JSONArray esbJSONArray = esbReturnJson.getJSONArray("responseData");
                 if(esbJSONArray == null || esbJSONArray.length() == 0){
-                    logger.info("单据号：" + billNum + ", 未正常返回responseData参数");
+                    logger.info(billName + "：" + billNum + ", 未正常返回responseData参数");
 
-                    errMsg.append("单据(" + billNum + "), 未正常返回responseData参数").append("\r\n");
+                    errMsg.append(billName + "(" + billNum + "), 未正常返回responseData参数").append("\r\n");
                     return;
                 }
 
@@ -164,7 +171,7 @@ public class PaymentSynPayStatusOpPlugin extends AbstractOperationServicePlugIn
                 /************************************************************/
 
 
-                logger.info("单据号："+billNum+"返回参数"+cbsReturnJson.toString());
+                logger.info(billName + "："+billNum+"返回参数"+cbsReturnJson.toString());
 
                 if(cbsReturnJson==null||cbsReturnJson.get("data")==null){
                 } else{