fk

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

@@ -83,9 +83,7 @@ public class PayBillToolUtil {
 
             data.put("AMOUNT", info.getBigDecimal("payamount").setScale(2, RoundingMode.DOWN).toString());
             //币别
-            if ("CNY".equals(info.get("currency.number"))) {
-                data.put("CURRENCY", "BB01");
-            }
+            data.put("CURRENCY", info.get("currency.number")+"");
 
             //对公
             if (!info.getBoolean("ispersonpay")) {

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/fi/cas/task/AgentpaybillQueryStatusTast.java

@@ -53,6 +53,7 @@ public class AgentpaybillQueryStatusTast extends AbstractTask {
             String billNum = dataEntity.getString("billno");
             log.info("单据号："+billNum+"传入参数"+param.toString());
             JSONObject cbsReturnJson =PayBillToolUtil.JHXServiceQuery(url,bodyjson);//待补充，超时返回参数待修改，整体待重构
+
             log.info("单据号："+billNum+"返回参数"+cbsReturnJson.toString());
             if(cbsReturnJson==null||cbsReturnJson.get("data")==null){
             }else{
@@ -103,7 +104,9 @@ public class AgentpaybillQueryStatusTast extends AbstractTask {
                         }
                         if(isupdate){
                             SaveServiceHelper.update(new DynamicObject[]{dataEntity});
-                            PayBillToolUtil.saveupdatelog(dataEntity,bodyjson,cbsReturnJson.toString());
+                            //存入日志表
+                            PayBillToolUtil.saveAgentlog(dataEntity, bodyjson, cbsReturnJson.toString(), "6");
+
                         }
                     }
                 }

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/fi/em/opplugin/AgentpaybillOpPlugin.java

@@ -4,6 +4,7 @@ import fi.cas.opplugin.PayBillToolUtil;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
 import kd.bos.entity.plugin.args.BeforeOperationArgs;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 
 /**
@@ -20,6 +21,23 @@ public class AgentpaybillOpPlugin extends AbstractOperationServicePlugIn {
         String operationKey = e.getOperationKey();
         //关闭付款则将支付状态更改为支付关闭状态
         if ("sendtojhx".equals(operationKey)){
+            for (DynamicObject dataEntity : dynamicObjects) {
+                DynamicObject payBillEntity = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(), "cas_agentpaybill");
+
+                String paystatus = payBillEntity.getString("nckd_paystatus");
+                int bbh = payBillEntity.getInt("nckd_bbh");
+                int fkcs = payBillEntity.getInt("nckd_fkcs");
+                String billstatusString = payBillEntity.getString("billstatus");
+                if ("C".equals(billstatusString)&&("4".equals(paystatus)||"5".equals(paystatus))&&bbh>=0 && bbh==fkcs-1) {//状态为传输失败或驳回，（驳回必须走调整才能支付）
+                    //状态为已审批，支付状态为失败，版本号>0,版本号=付款次数-1。符合付款条件，修改状态和版本号先
+                    payBillEntity.set("nckd_paystatus", "1");//支付状态改回未支付
+                    payBillEntity.set("nckd_bbh",bbh+1);
+                    SaveServiceHelper.update(payBillEntity);
+                }
+            }
+
+
+
             String errMsg = "";
             errMsg =  PayBillToolUtil.agentpayBillForCBSSync(dynamicObjects);
             if(!errMsg.isEmpty()) {