|
@@ -19,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.sql.*;
|
|
|
+import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -108,6 +110,12 @@ public class PayServiceImpl implements PayService {
|
|
|
payMsg = state.getStr("payMsg");
|
|
|
payDate = state.getStr("payDate");
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+ Date StrPayDate;
|
|
|
+ try {
|
|
|
+ StrPayDate= sdf.parse(payDate);
|
|
|
+ } catch (ParseException e) {
|
|
|
+ throw new RuntimeException(e);
|
|
|
+ }
|
|
|
//获取付款成功的
|
|
|
if (payState.equals("00")) {
|
|
|
|
|
@@ -121,7 +129,7 @@ public class PayServiceImpl implements PayService {
|
|
|
if ("明源ERP".equals(sqly)){
|
|
|
//付款成功的更新Erp状态
|
|
|
String erpRsp = UtilHttp.doPost("https://gateway.dslink.net.cn/api/webhook/E185908E63CF407B911FA870642A39A5",
|
|
|
- null,null, UtilMap.map("PayGUID, BillCode",guid,BillCode),new HashMap());
|
|
|
+ null,null, UtilMap.map("PayGUID, BillCode, StrPayDate",guid,BillCode,StrPayDate),new HashMap());
|
|
|
//通过 http status 判定, 200 即为成功
|
|
|
Map result = (Map) JSON.parse(erpRsp);
|
|
|
Boolean status = (Boolean) result.get("status");
|
|
@@ -134,7 +142,7 @@ public class PayServiceImpl implements PayService {
|
|
|
// 更新付款申请单状态
|
|
|
ydClient.operateData(YDParam.builder()
|
|
|
.formInstanceId((String) item.get("formInstanceId"))
|
|
|
- .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lr08rrpc, textField_lof4wiqt, textField_lxlt9ptd, dateField_lyzitczm", "付款成功","凭证未生成",payDate, UtilDateTime.parse( payDate,"yyyy-MM-dd"))))
|
|
|
+ .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lr08rrpc, textField_lof4wiqt, textField_lxlt9ptd", "付款成功","凭证未生成",payDate)))
|
|
|
.build(), YDConf.FORM_OPERATION.update);
|
|
|
|
|
|
|
|
@@ -235,7 +243,7 @@ public class PayServiceImpl implements PayService {
|
|
|
if ("明源ERP".equals(formData.get("selectField_lqalbx96"))){
|
|
|
//付款成功的更新Erp状态
|
|
|
String erpRsp = UtilHttp.doPost("https://gateway.dslink.net.cn/api/webhook/E185908E63CF407B911FA870642A39A5",
|
|
|
- null,null, UtilMap.map("PayGUID, BillCode",formData.get("textField_li1y52yh"),""),new HashMap());
|
|
|
+ null,null, UtilMap.map("PayGUID, BillCode ,StrPayDate",formData.get("textField_li1y52yh"),"",formData.get("textField_lxlt9ptd")),new HashMap());
|
|
|
|
|
|
//通过 http status 判定, 200 即为成功
|
|
|
Map result = (Map) JSON.parse(erpRsp);
|