alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

update get status api

master
Alex Cheung 1 year ago
parent
3c8454c902
commit
300b8208ba
3 changed files with 54 additions and 31 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +19
    -5
      src/pages/Payment/Details_Public/index.js
  2. +33
    -26
      src/pages/Payment/FPS/AckPage.js
  3. +2
    -0
      src/utils/ApiPathConst.js

+ 19
- 5
src/pages/Payment/Details_Public/index.js View File

@@ -77,17 +77,31 @@ const Index = () => {


const loadForm = () => { const loadForm = () => {
if (params.id > 0) { if (params.id > 0) {

HttpUtils.get({ HttpUtils.get({
url: UrlUtils.PAYMENT_LOAD + "/" + params.id, url: UrlUtils.PAYMENT_LOAD + "/" + params.id,
onSuccess: (responseData) => { onSuccess: (responseData) => {
if (!responseData.data?.id) { if (!responseData.data?.id) {
navigate("/paymentPage/search"); navigate("/paymentPage/search");
} }
responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY");
responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss");
setItemList(responseData.paymentItemList)
setRecord(responseData.data);
if(responseData.data.status==null||responseData.data.status=="INPR"){
HttpUtils.post({
url: UrlUtils.PAYMENT_RETRY_STATUS_API,
params:{
"paymentId": params.id
},
onSuccess: function(responseData2){
responseData2.paymentItemList.data["transDateStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "DD/MM/YYYY");
responseData2.paymentItemList.data["transTimeStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "HH:mm:ss");
setItemList(responseData2.paymentItemList)
setRecord(responseData2.data);
}
});
}else{
responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY");
responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss");
setItemList(responseData.paymentItemList)
setRecord(responseData.data);
}
} }
}); });
} }


+ 33
- 26
src/pages/Payment/FPS/AckPage.js View File

@@ -85,37 +85,44 @@ const AckPage = () => {
let webtoken = localStorage.getItem("webtoken") let webtoken = localStorage.getItem("webtoken")


HttpUtils.post({ HttpUtils.post({
url: UrlUtils.PAYMENT_STATUS_API+transactionid,
url: UrlUtils.PAYMENT_CALLBACK_STATUS_API+transactionid,
params:{ params:{
"apprefid": transactionid, "apprefid": transactionid,
"webtoken": webtoken, "webtoken": webtoken,
"paymentId": localStorage.getItem("paymentId")
}, },
onSuccess: function(responseData){ onSuccess: function(responseData){
setResponeDataData(responseData)
if (responseData.paymentdetail?.result?.paymentstatuscode === "APPR") {
localStorage.removeItem("webtoken");
localStorage.removeItem("transactionid");
}
HttpUtils.post({
url: UrlUtils.PAYMENT_SAVE,
params: {
id: localStorage.getItem("paymentId"),
transNo: responseData.transactionid,
transDateTime: new Date(responseData.paymentdetail.time).toISOString(),
egisRefNo: responseData.paymentdetail.paymentid,
status: responseData.paymentdetail.result.paymentstatuscode,
payload: responseData
},
onSuccess: function (responseData2) {
responseData2.data["transDateStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "DD/MM/YYYY");
responseData2.data["transTimeStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "HH:mm:ss");
setItemList(responseData2.paymentItemList)
setPaymentData(responseData2.data);
// localStorage.removeItem("paymentId");
// setPaymentId(responseData2.id)
}
});
localStorage.removeItem("webtoken");
localStorage.removeItem("transactionid");
setResponeDataData(responseData.transactionData)
responseData.paymentItemList.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY");
responseData.paymentItemList.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss");
setItemList(responseData.paymentItemList)
setPaymentData(responseData.data);


// if (responseData.paymentdetail?.result?.paymentstatuscode === "APPR") {
// }
// HttpUtils.post({
// url: UrlUtils.PAYMENT_SAVE,
// params: {
// id: localStorage.getItem("paymentId"),
// transNo: responseData.transactionid,
// transDateTime: new Date(responseData.paymentdetail.time).toISOString(),
// egisRefNo: responseData.paymentdetail.paymentid,
// status: responseData.paymentdetail.result.paymentstatuscode,
// payload: responseData
// },
// onSuccess: function (responseData2) {
// responseData2.data["transDateStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "DD/MM/YYYY");
// responseData2.data["transTimeStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "HH:mm:ss");
// setItemList(responseData2.paymentItemList)
// setPaymentData(responseData2.data);
// // localStorage.removeItem("paymentId");
// // setPaymentId(responseData2.id)
// }
// });
} }
}); });


+ 2
- 0
src/utils/ApiPathConst.js View File

@@ -162,6 +162,8 @@ export const LOAD_PAYMENT_FPS_URL = apiPath+ "/payment/api/wallet/fps";//POST
// export const CANCEL_PAYMENT_URL = paymentPath+ "/api/payment/cancelpayment";//POST // export const CANCEL_PAYMENT_URL = paymentPath+ "/api/payment/cancelpayment";//POST
export const CANCEL_PAYMENT_URL = apiPath+ "/payment/api/cancelpayment";//POST export const CANCEL_PAYMENT_URL = apiPath+ "/payment/api/cancelpayment";//POST
export const LOAD_PAYMENT_URL = apiPath+ "/payment/api/web/";//POST export const LOAD_PAYMENT_URL = apiPath+ "/payment/api/web/";//POST
export const PAYMENT_CALLBACK_STATUS_API = apiPath+ "/payment/callback/status/";//POST
export const PAYMENT_RETRY_STATUS_API = apiPath+ "/payment/paymentdetail/status";//POST


export const DEMAND_NOTE_PREVIEW = apiPath+'/demandNote/preview';//GET export const DEMAND_NOTE_PREVIEW = apiPath+'/demandNote/preview';//GET
export const DEMAND_NOTE_CREATE = apiPath+'/demandNote/create';//POST export const DEMAND_NOTE_CREATE = apiPath+'/demandNote/create';//POST


Write Preview
Loading…
Cancel
Save