Modify: 因應API會回傳文件沒有的WriteoffResponse.message

FeeAuditJSON.go

@@ -17,6 +17,7 @@ type WriteoffResponse struct {
 	Result       string `json:"result"`     // 回覆明細
 	Checksum     string `json:"checksum"`   // 校驗碼
 	ReturnSeq    string `json:"rtnSeq"`     // 回覆序號
+	Message      string `json:"message"`    // 回覆訊息
 }
 
 // FeeApplyUpload 是 FeeApply 的傳送資料
@@ -31,11 +32,11 @@ type ApplyInfo struct {
 	Records        int             `json:"records"`          // 服務記錄筆數
 	Amount         int             `json:"amount"`           // 服務記錄金額
 	Cases          int             `json:"cases"`            // 申請個案數
-	CaseSvceRecords []CaseSvceRecord `json:"case_svc_records"` // 個案服務記錄
+	CaseSvcRecords []CaseSvcRecord `json:"case_svc_records"` // 個案服務記錄
 }
 
 // CaseSvcRecord 是個案服務記錄
-type CaseSvceRecord struct {
+type CaseSvcRecord struct {
 	ObjID        string `json:"objid"`                    // 識別碼
 	IDN          string `json:"idn,omitempty"`            // 個案身份證字號
 	SvcAt        string `json:"svc_dt,omitempty"`         // 服務日期
@@ -100,7 +101,7 @@ type SvcDelInfo struct {
 	WriteoffYYYYMM string          `json:"writeoff_yyyymm"`  // 支審年月
 	TransNo        string          `json:"trans_no"`         // 交易序號
 	Records        int             `json:"records"`          // 服務記錄筆數
-	CaseSvceRecords []CaseSvceRecord `json:"case_svc_records"` // 個案服務記錄
+	CaseSvcRecords []CaseSvcRecord `json:"case_svc_records"` // 個案服務記錄
 }
 
 // AppCompletionNoticeUpload 是 AppCompletionNotice 的傳送資料

FeeAuditUtils.go

@@ -26,6 +26,7 @@ type FeeAuditUtils struct {
 	Cert         []byte
 }
 
+// NewFeeAuditUtils 用來産生 FeeAuditUtils
 func NewFeeAuditUtils(unitNo, sourceSystem, hash, url, certPath string) (feeAuditUtils FeeAuditUtils, err error) {
 	stringutils := golanghelper.StringUtils{}
 	if stringutils.IsEmpty(unitNo) || stringutils.IsEmpty(sourceSystem) || stringutils.IsEmpty(hash) ||
@@ -77,7 +78,7 @@ func (f *FeeAuditUtils) getChecksum(apData string) string {
 }
 
 // httpsPost 用來上傳 WriteoffResponse
-func (f *FeeAuditUtils) httpsPost(funcName string, writeoffRequest WriteoffRequest) (writeoffResponse WriteoffResponse, err error) {
+func (f *FeeAuditUtils) httpsPost(funcName string, writeoffRequest WriteoffRequest) (responseData []byte, err error) {
 	data, err := json.Marshal(&writeoffRequest)
 	if err != nil {
 		return
@@ -107,17 +108,10 @@ func (f *FeeAuditUtils) httpsPost(funcName string, writeoffRequest WriteoffReque
 	}
 	defer response.Body.Close()
 
-	responseData, err := io.ReadAll(response.Body)
-	if err != nil {
-		return
+	return io.ReadAll(response.Body)
 }
 
-	err = json.Unmarshal(responseData, &writeoffResponse)
-
-	return
-}
-
-// CreateRequest 用來産生 WirteoffRequest
+// NewRequest 用來産生 WirteoffRequest
 func (f *FeeAuditUtils) NewRequest(data []byte) WriteoffRequest {
 	apData := base64.StdEncoding.EncodeToString(data)
 
@@ -133,87 +127,31 @@ func (f *FeeAuditUtils) NewRequest(data []byte) WriteoffRequest {
 }
 
 // SendFeeApply 傳送服務記錄申報
-func (f *FeeAuditUtils) SendFeeApply(writeoffRequest WriteoffRequest) (feeApplyResult FeeApplyResult, err error) {
-	//uploadData, err := json.Marshal(&feeApply)
-	//if err != nil {
-	//	return
-	//}
-
-	writeoffResponse, err := f.httpsPost("FeeApply", writeoffRequest)
-	if err != nil {
-		return
-	}
-
-	resultData, err := base64.StdEncoding.DecodeString(writeoffResponse.Result)
-
-	err = json.Unmarshal(resultData, &feeApplyResult)
-
-	return
+func (f *FeeAuditUtils) SendFeeApply(writeoffRequest WriteoffRequest) (responseData []byte, err error) {
+	return f.httpsPost("FeeApply", writeoffRequest)
 }
 
 // SendObjDel 傳送服務紀錄刪除
-func (f *FeeAuditUtils) SendObjDel(writeoffRequest WriteoffRequest) (err error) {
-	//uploadData, err := json.Marshal(&objDel)
-	//if err != nil {
-	//	return
-	//}
-
-	_, err = f.httpsPost("ObjDel", writeoffRequest)
-
-	return
+func (f *FeeAuditUtils) SendObjDel(writeoffRequest WriteoffRequest) (responseData []byte, err error) {
+	return f.httpsPost("ObjDel", writeoffRequest)
 }
 
 // SendAppCompletionNotice 傳送申報確認通知
-func (f *FeeAuditUtils) SendAppCompletionNotice(writeoffRequest WriteoffRequest) (err error) {
-	//uploadData, err := json.Marshal(&appCompletionNotice)
-	//if err != nil {
-	//	return
-	//}
-
-	_, err = f.httpsPost("appCompletionNotice", writeoffRequest)
-
-	return
+func (f *FeeAuditUtils) SendAppCompletionNotice(writeoffRequest WriteoffRequest) (responseData []byte, err error) {
+	return f.httpsPost("appCompletionNotice", writeoffRequest)
 }
 
 // SendAppResultQuery 傳送「服務單位各分案審核狀態查詢」或「分案審核明細查詢」
-func (f *FeeAuditUtils) SendAppResultQuery(writeoffRequest WriteoffRequest) (appResultQueryResult AppResultQueryResult, err error) {
-	//uploadData, err := json.Marshal(&appResultQuery)
-	//if err != nil {
-	//	return
-	//}
-
-	writeoffResponse, err := f.httpsPost("appResultQuery", writeoffRequest)
-	if err != nil {
-		return
-	}
-
-	resultData, err := base64.StdEncoding.DecodeString(writeoffResponse.Result)
-
-	err = json.Unmarshal(resultData, &appResultQueryResult)
-
-	return
+func (f *FeeAuditUtils) SendAppResultQuery(writeoffRequest WriteoffRequest) (responseData []byte, err error) {
+	return f.httpsPost("appResultQuery", writeoffRequest)
 }
 
 // SendAppCancel 傳送撤回服務記錄
-func (f *FeeAuditUtils) SendAppCancel(writeoffRequest WriteoffRequest) (err error) {
-	//uploadData, err := json.Marshal(&appCancel)
-	//if err != nil {
-	//	return
-	//}
-
-	_, err = f.httpsPost("appCancel", writeoffRequest)
-
-	return
+func (f *FeeAuditUtils) SendAppCancel(writeoffRequest WriteoffRequest) (responseData []byte, err error) {
+	return f.httpsPost("appCancel", writeoffRequest)
 }
 
 // SendCancelResultResponse 傳送取消交易單處理結果回報
-func (f *FeeAuditUtils) SendCancelResultResponse(writeoffRequest WriteoffRequest) (err error) {
-	//uploadData, err := json.Marshal(&cancelResultResponse)
-	//if err != nil {
-	//	return
-	//}
-
-	_, err = f.httpsPost("CancelResultResponse", writeoffRequest)
-
-	return
+func (f *FeeAuditUtils) SendCancelResultResponse(writeoffRequest WriteoffRequest) (responseData []byte, err error) {
+	return f.httpsPost("CancelResultResponse", writeoffRequest)
 }