|
@@ -279,20 +279,26 @@ public class PayBillToolUtil {
|
|
|
createElement(doc, head, "channelcode", CHANNELCODE_PILIANG);
|
|
|
Calendar currentdate = Calendar.getInstance();
|
|
|
String datacur = TypeUtils.date2String(currentdate.getTime(),"yyyyMMdd");
|
|
|
+ String datacur_Hms = TypeUtils.date2String(currentdate.getTime(),"HHmmss");
|
|
|
createElement(doc, head, "channeldate", datacur);
|
|
|
- String channelserno = datacur+"-"+currentdate.get(Calendar.HOUR)+""+currentdate.get(Calendar.MINUTE)+""+currentdate.get(Calendar.SECOND);
|
|
|
+ String channelserno = datacur+"-"+datacur_Hms+agentpayBillEntity.getString("billNo");
|
|
|
createElement(doc, head, "channelserno", channelserno);
|
|
|
- createElement(doc, head, "channeltime", currentdate.get(Calendar.HOUR)+""+currentdate.get(Calendar.MINUTE)+""+currentdate.get(Calendar.SECOND));
|
|
|
+ createElement(doc, head, "channeltime", datacur_Hms);
|
|
|
|
|
|
createElement(doc, head, "brno", "");
|
|
|
- createElement(doc, head, "bustype", "");
|
|
|
- createElement(doc, head, "buskind", "");
|
|
|
+ createElement(doc, head, "tellerno", "");
|
|
|
+ createElement(doc, head, "terminalno", "");
|
|
|
createElement(doc, head, "reserve", "");
|
|
|
}
|
|
|
|
|
|
public static void agentPaymentXMLBody_Msg(DynamicObject agentpayBillEntity,Document doc,Element body) {
|
|
|
- createElement(doc, body, "FileName",agentpayBillEntity.getString("nckd_filename") );
|
|
|
- createElement(doc, body, "FileType",agentpayBillEntity.getString("nckd_filetype") );
|
|
|
+ String filename=agentpayBillEntity.getString("nckd_filename");
|
|
|
+ if("".equals(filename)){
|
|
|
+ filename = agentpayBillEntity.getString("billNo");
|
|
|
+ }
|
|
|
+ filename="100999"+filename;
|
|
|
+ createElement(doc, body, "FileName",filename );
|
|
|
+ createElement(doc, body, "FileType","01" );
|
|
|
|
|
|
|
|
|
DynamicObject payeracctbankEntity = BusinessDataServiceHelper.loadSingleFromCache(agentpayBillEntity.getDynamicObject("payeracctbank").getPkValue(), "am_accountbank");
|
|
@@ -300,25 +306,32 @@ public class PayBillToolUtil {
|
|
|
String payername = payeracctbankEntity.getString("acctname");
|
|
|
createElement(doc, body, "OutRichNbr", payeracc);
|
|
|
|
|
|
- createElement(doc, body, "HrSignnbr", agentpayBillEntity.getString("billno"));
|
|
|
+ createElement(doc, body, "HrSignNbr", agentpayBillEntity.getString("billno"));
|
|
|
createElement(doc, body, "CcyNbr", "156");
|
|
|
- createElement(doc, body, "CCYTYPE", "0");
|
|
|
- createElement(doc, body, "TOTALNUM", agentpayBillEntity.getString("count"));
|
|
|
- createElement(doc, body, "TOTALAMT", agentpayBillEntity.getBigDecimal("payamount").setScale(2, RoundingMode.DOWN).toString());
|
|
|
+ createElement(doc, body, "CcyType", "0");
|
|
|
+ createElement(doc, body, "TotalNum", agentpayBillEntity.getString("count"));
|
|
|
+ createElement(doc, body, "TotalAmt", agentpayBillEntity.getBigDecimal("payamount").setScale(2, RoundingMode.DOWN).toString());
|
|
|
createElement(doc, body, "FeeFlag", "0");
|
|
|
+
|
|
|
+ createElement(doc, body, "RichNbr", payeracc);
|
|
|
+ createElement(doc, body, "FundType", "4");
|
|
|
+ createElement(doc, body, "RichName", payername);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public static void agentPaymentXMLBody_Entry(DynamicObject agentpayBillEntity,Document doc,Element body) {
|
|
|
|
|
|
DynamicObjectCollection entryList = agentpayBillEntity.getDynamicObjectCollection("entry");
|
|
|
|
|
|
- for (DynamicObject entry : entryList) {
|
|
|
- Element achrapaydtl_i = doc.createElement("achrapaydtl_i");
|
|
|
+ for (int i = 0; i <entryList.size() ; i++) {
|
|
|
+ DynamicObject entry = entryList.get(i);
|
|
|
+ Element achrapaydtl_i = doc.createElement("achrpaydtl_i");
|
|
|
body.appendChild(achrapaydtl_i);
|
|
|
|
|
|
createElement(doc, achrapaydtl_i, "IdenNbr", entry.getString("nckd_zjh"));
|
|
|
createElement(doc, achrapaydtl_i, "InRichNbr", entry.getString("payeeacctbank"));
|
|
|
- createElement(doc, achrapaydtl_i, "PayAmt", entry.getBigDecimal("e_amount").setScale(2, RoundingMode.DOWN).toString());
|
|
|
+ createElement(doc, achrapaydtl_i, "PayAmt", entry.getBigDecimal("entryunmatchamount").setScale(2, RoundingMode.DOWN).toString());
|
|
|
createElement(doc, achrapaydtl_i, "RowCnt", "10000");
|
|
|
}
|
|
|
}
|
|
@@ -402,6 +415,68 @@ public class PayBillToolUtil {
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
+ * 代发单支付-补传第二步
|
|
|
+ * @params billEntities
|
|
|
+ * @returns 返回报错信息
|
|
|
+ *
|
|
|
+ */
|
|
|
+ public static String agentpayzx(DynamicObject[] billEntities) {
|
|
|
+ StringBuffer errMsg = new StringBuffer();
|
|
|
+
|
|
|
+ DynamicObject jkpzxx = BusinessDataServiceHelper.loadSingle("nckd_jkpzxx",new QFilter[]{new QFilter("number","=","paytozfqz")});
|
|
|
+ String servername = jkpzxx.getString("nckd_servername");
|
|
|
+ String port = jkpzxx.getString("nckd_port");
|
|
|
+
|
|
|
+ for (DynamicObject dataEntity : billEntities) {
|
|
|
+ boolean isSuccess = false;
|
|
|
+ boolean isZFQZ = true;
|
|
|
+ Map<String, String> qzObject = new HashMap<>();
|
|
|
+ DynamicObject payBillEntity = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(), AGENT_ENTITY_NAME);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ * 判断是否可以走前置支付
|
|
|
+ * 1、代发单为审核状态
|
|
|
+ * 2、支付状态为未支付
|
|
|
+ */
|
|
|
+ String billNum = payBillEntity.getString("billno");
|
|
|
+ String billstatusString = payBillEntity.getString("billstatus");
|
|
|
+ String paystatus = payBillEntity.getString("nckd_paystatus");
|
|
|
+ String nckd_hxzt = payBillEntity.getString("nckd_hxzt");
|
|
|
+
|
|
|
+
|
|
|
+ if (!"C".equals(billstatusString)) {
|
|
|
+ errMsg.append("单据号:").append(billNum).append(",付款单为审核状态,才能提交~\r\n");
|
|
|
+ isZFQZ = false;
|
|
|
+ }
|
|
|
+ if (!"B".equals(paystatus) && !"".equals(paystatus)) {
|
|
|
+ errMsg.append("单据号:").append(billNum).append(",付款单为支付中,才能提交~\r\n");
|
|
|
+ isZFQZ = false;
|
|
|
+ }
|
|
|
+ if (!"A".equals(nckd_hxzt) && !"".equals(nckd_hxzt)) {
|
|
|
+ errMsg.append("单据号:").append(billNum).append(",核心状态为已登记执行失败,才能提交~\r\n");
|
|
|
+ isZFQZ = false;
|
|
|
+ }
|
|
|
+ if(payBillEntity.getDynamicObject("payeracctbank")==null) {
|
|
|
+ errMsg.append("单据号:").append(billNum).append(",付款账户为空~\r\n");
|
|
|
+ isZFQZ = false;
|
|
|
+ }
|
|
|
+
|
|
|
+ String[] returnmsg_2 = agentpayBillFukuan(servername,port,payBillEntity);
|
|
|
+ errMsg.append(returnmsg_2[1]);
|
|
|
+ if("2".equals(returnmsg_2[0])){
|
|
|
+ isSuccess=true;
|
|
|
+ payBillEntity.set("nckd_hxzt","R");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (isSuccess) {
|
|
|
+ SaveServiceHelper.update(new DynamicObject[]{payBillEntity});
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return errMsg.toString();
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
* 代发单支付-开始传输第一步及后续
|
|
|
* @params billEntities
|
|
@@ -435,7 +510,7 @@ public class PayBillToolUtil {
|
|
|
errMsg.append("单据号:").append(billNum).append(",付款单为审核状态,才能提交~\r\n");
|
|
|
isZFQZ = false;
|
|
|
}
|
|
|
- if (!"1".equals(paystatus) && !"".equals(paystatus)) {
|
|
|
+ if (!"A".equals(paystatus) && !"".equals(paystatus)) {
|
|
|
errMsg.append("单据号:").append(billNum).append(",付款单为未支付,才能提交~\r\n");
|
|
|
isZFQZ = false;
|
|
|
}
|
|
@@ -457,7 +532,7 @@ public class PayBillToolUtil {
|
|
|
continue;
|
|
|
}
|
|
|
log.info("单据号:"+billNum+"传入参数"+bodyxml);
|
|
|
- JSONObject cbsReturnJson =socketServiceQuery(servername,port,bodyxml,"ACHRDATI");
|
|
|
+ JSONObject cbsReturnJson =socketServiceAgent(servername,port,bodyxml,"ACHRDATI");
|
|
|
log.info("单据号:"+billNum+"返回参数"+cbsReturnJson.toString());
|
|
|
|
|
|
saveAgentlog(payBillEntity,bodyxml,cbsReturnJson.toString(),"1");
|
|
@@ -469,7 +544,7 @@ public class PayBillToolUtil {
|
|
|
errMsg.append("错误号:").append("XXXXXXX");
|
|
|
errMsg.append(",错误原因:").append("接口无法连通,未获取到返回结果");
|
|
|
errMsg.append("\r\n");
|
|
|
- }else if(cbsReturnJson.get("Message")==null){
|
|
|
+ }else if("{}".equals(cbsReturnJson.toString())|| cbsReturnJson.get("Message")==null){
|
|
|
isSuccess = false;
|
|
|
errMsg.append("单据号:").append(billNum).append(",第一步支付数据导入失败,");
|
|
|
errMsg.append("错误号:").append("DDDDDD1");
|
|
@@ -486,7 +561,7 @@ public class PayBillToolUtil {
|
|
|
}else{
|
|
|
String errcode =head.getString("errorcode");
|
|
|
|
|
|
- if ("FIN0000".equals(errcode)) {
|
|
|
+ if ("000000".equals(errcode)) {
|
|
|
isSuccess = true;
|
|
|
errMsg.append("单据号:").append(billNum).append(",第一步支付数据导入成功!");
|
|
|
|
|
@@ -533,7 +608,7 @@ public class PayBillToolUtil {
|
|
|
return new String[]{"-1",errMsg.toString()};
|
|
|
}
|
|
|
log.info("单据号:"+billNum+"关闭传入参数"+bodyxml);
|
|
|
- JSONObject cbsReturnJson =socketServiceQuery(servername,port,bodyxml,"XXXX3");
|
|
|
+ JSONObject cbsReturnJson =socketServiceAgent(servername,port,bodyxml,"XXXX3");
|
|
|
log.info("单据号:"+billNum+"关闭返回参数"+cbsReturnJson.toString());
|
|
|
saveAgentlog(payBillEntity,bodyxml,cbsReturnJson.toString(),"4");
|
|
|
String errmark = "4";
|
|
@@ -593,7 +668,7 @@ public class PayBillToolUtil {
|
|
|
return new String[]{"-1",errMsg.toString()};
|
|
|
}
|
|
|
log.info("单据号:"+billNum+"传入参数"+bodyxml);
|
|
|
- JSONObject cbsReturnJson =socketServiceQuery(servername,port,bodyxml,"ACHRDATD");
|
|
|
+ JSONObject cbsReturnJson =socketServiceAgent(servername,port,bodyxml,"ACHRDATD");
|
|
|
log.info("单据号:"+billNum+"返回参数"+cbsReturnJson.toString());
|
|
|
saveAgentlog(payBillEntity,bodyxml,cbsReturnJson.toString(),"2");
|
|
|
String errmark = "4";
|
|
@@ -604,7 +679,7 @@ public class PayBillToolUtil {
|
|
|
errMsg.append("错误号:").append("XXXXXXX");
|
|
|
errMsg.append(",错误原因:").append("接口无法连通,未获取到返回结果");
|
|
|
errMsg.append("\r\n");
|
|
|
- }else if(cbsReturnJson.get("Message")==null){
|
|
|
+ }else if("{}".equals(cbsReturnJson.toString())|| cbsReturnJson.get("Message")==null){
|
|
|
errmark = "1";
|
|
|
errMsg.append("单据号:").append(billNum).append(",第二步调用执行失败,");
|
|
|
errMsg.append("错误号:").append("DDDDDD1");
|
|
@@ -621,7 +696,7 @@ public class PayBillToolUtil {
|
|
|
}else{
|
|
|
String errcode =head.getString("errorcode");
|
|
|
|
|
|
- if ("FIN0000".equals(errcode)) {
|
|
|
+ if ("000000".equals(errcode)) {
|
|
|
errMsg.append("单据号:").append(billNum).append(",第二步调用执行成功!");
|
|
|
errmark = "2";
|
|
|
}else{
|
|
@@ -768,7 +843,7 @@ public class PayBillToolUtil {
|
|
|
|
|
|
public static void saveAgentlog(DynamicObject payBillEntity,String qqbw,String fhbw,String type){
|
|
|
try {
|
|
|
- DynamicObject logInfo = new DynamicObject( EntityMetadataCache.getDataEntityType("nckd_zfjkdyrz"));
|
|
|
+ DynamicObject logInfo = new DynamicObject( EntityMetadataCache.getDataEntityType("nckd_dfjkdyrz"));
|
|
|
String channelserno = payBillEntity.getString("billno");
|
|
|
logInfo.set("number",channelserno);
|
|
|
if("1".equals(type)){
|
|
@@ -1066,4 +1141,38 @@ public class PayBillToolUtil {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ public static JSONObject socketServiceAgent(String serverName,String port,String xmlData,String transcode){
|
|
|
+ try {
|
|
|
+ Socket client = new Socket(serverName,TypeUtils.nullToInt(port));
|
|
|
+ int messageLength = xmlData.getBytes("GBK").length;
|
|
|
+ String header = String.format("%08d", messageLength);
|
|
|
+ String fullMessage = header + xmlData;
|
|
|
+ OutputStream outToServer = client.getOutputStream();
|
|
|
+
|
|
|
+ PrintWriter out = new PrintWriter(new OutputStreamWriter(outToServer, "GBK"), true);
|
|
|
+ out.println(fullMessage);
|
|
|
+
|
|
|
+ InputStream inFromServer = client.getInputStream();
|
|
|
+ BufferedReader in = new BufferedReader(new InputStreamReader(inFromServer, "GBK"));
|
|
|
+ StringBuilder responseBuilder = new StringBuilder();
|
|
|
+ String line;
|
|
|
+ while ((line = in.readLine()) != null) {
|
|
|
+ responseBuilder.append(line);
|
|
|
+ }
|
|
|
+ String responseJson = responseBuilder.toString();
|
|
|
+ if(responseJson.indexOf("<?xml")>0){
|
|
|
+ int index = responseJson.indexOf("<?xml");
|
|
|
+ responseJson = responseJson.substring(index);
|
|
|
+ }
|
|
|
+
|
|
|
+ JSONObject jsonObject = XML.toJSONObject(responseJson);
|
|
|
+ client.close();
|
|
|
+ return jsonObject;
|
|
|
+ } catch (IOException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ log.info(e.getMessage());
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
}
|