修改 API 上傳的回傳值

FeeAuditJSON.go

@@ -26,16 +26,16 @@ type FeeApplyUpload struct {
 
 // ApplyInfo 是 FeeApplyUpload 的單筆資料
 type ApplyInfo struct {
-	WriteoffYYYYMM  string           `json:"writeoff_yyyymm"`  // 支審年月
+	WriteoffYYYYMM string          `json:"writeoff_yyyymm"`  // 支審年月
-	TransNo         string           `json:"trans_no"`         // 交易序號
+	TransNo        string          `json:"trans_no"`         // 交易序號
-	Records         int              `json:"records"`          // 服務記錄筆數
+	Records        int             `json:"records"`          // 服務記錄筆數
-	Amount          int              `json:"amount"`           // 服務記錄金額
+	Amount         int             `json:"amount"`           // 服務記錄金額
-	Cases           int              `json:"cases"`            // 申請個案數
+	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"`         // 服務日期
@@ -97,10 +97,10 @@ type ObjDelUpload struct {
 
 // SvcDelInfo 是刪除資料
 type SvcDelInfo struct {
-	WriteoffYYYYMM  string           `json:"writeoff_yyyymm"`  // 支審年月
+	WriteoffYYYYMM string          `json:"writeoff_yyyymm"`  // 支審年月
-	TransNo         string           `json:"trans_no"`         // 交易序號
+	TransNo        string          `json:"trans_no"`         // 交易序號
-	Records         int              `json:"records"`          // 服務記錄筆數
+	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) ||
@@ -117,7 +118,7 @@ func (f *FeeAuditUtils) httpsPost(funcName string, writeoffRequest WriteoffReque
 	return
 }
 
-// CreateRequest 用來産生 WirteoffRequest
+// NewRequest 用來産生 WirteoffRequest
 func (f *FeeAuditUtils) NewRequest(data []byte) WriteoffRequest {
 	apData := base64.StdEncoding.EncodeToString(data)
 
@@ -133,13 +134,8 @@ func (f *FeeAuditUtils) NewRequest(data []byte) WriteoffRequest {
 }
 
 // SendFeeApply 傳送服務記錄申報
-func (f *FeeAuditUtils) SendFeeApply(writeoffRequest WriteoffRequest) (feeApplyResult FeeApplyResult, err error) {
+func (f *FeeAuditUtils) SendFeeApply(writeoffRequest WriteoffRequest) (writeoffResponse WriteoffResponse, feeApplyResult FeeApplyResult, err error) {
-	//uploadData, err := json.Marshal(&feeApply)
+	writeoffResponse, err = f.httpsPost("FeeApply", writeoffRequest)
-	//if err != nil {
-	//	return
-	//}
-
-	writeoffResponse, err := f.httpsPost("FeeApply", writeoffRequest)
 	if err != nil {
 		return
 	}
@@ -152,37 +148,22 @@ func (f *FeeAuditUtils) SendFeeApply(writeoffRequest WriteoffRequest) (feeApplyR
 }
 
 // SendObjDel 傳送服務紀錄刪除
-func (f *FeeAuditUtils) SendObjDel(writeoffRequest WriteoffRequest) (err error) {
+func (f *FeeAuditUtils) SendObjDel(writeoffRequest WriteoffRequest) (writeoffResponse WriteoffResponse, err error) {
-	//uploadData, err := json.Marshal(&objDel)
+	writeoffResponse, err = f.httpsPost("ObjDel", writeoffRequest)
-	//if err != nil {
-	//	return
-	//}
-
-	_, err = f.httpsPost("ObjDel", writeoffRequest)
 
 	return
 }
 
 // SendAppCompletionNotice 傳送申報確認通知
-func (f *FeeAuditUtils) SendAppCompletionNotice(writeoffRequest WriteoffRequest) (err error) {
+func (f *FeeAuditUtils) SendAppCompletionNotice(writeoffRequest WriteoffRequest) (writeoffResponse WriteoffResponse, err error) {
-	//uploadData, err := json.Marshal(&appCompletionNotice)
+	writeoffResponse, err = f.httpsPost("appCompletionNotice", writeoffRequest)
-	//if err != nil {
-	//	return
-	//}
-
-	_, err = f.httpsPost("appCompletionNotice", writeoffRequest)
 
 	return
 }
 
 // SendAppResultQuery 傳送「服務單位各分案審核狀態查詢」或「分案審核明細查詢」
-func (f *FeeAuditUtils) SendAppResultQuery(writeoffRequest WriteoffRequest) (appResultQueryResult AppResultQueryResult, err error) {
+func (f *FeeAuditUtils) SendAppResultQuery(writeoffRequest WriteoffRequest) (writeoffResponse WriteoffResponse, appResultQueryResult AppResultQueryResult, err error) {
-	//uploadData, err := json.Marshal(&appResultQuery)
+	writeoffResponse, err = f.httpsPost("appResultQuery", writeoffRequest)
-	//if err != nil {
-	//	return
-	//}
-
-	writeoffResponse, err := f.httpsPost("appResultQuery", writeoffRequest)
 	if err != nil {
 		return
 	}
@@ -195,25 +176,15 @@ func (f *FeeAuditUtils) SendAppResultQuery(writeoffRequest WriteoffRequest) (app
 }
 
 // SendAppCancel 傳送撤回服務記錄
-func (f *FeeAuditUtils) SendAppCancel(writeoffRequest WriteoffRequest) (err error) {
+func (f *FeeAuditUtils) SendAppCancel(writeoffRequest WriteoffRequest) (writeoffResponse WriteoffResponse, err error) {
-	//uploadData, err := json.Marshal(&appCancel)
+	writeoffResponse, err = f.httpsPost("appCancel", writeoffRequest)
-	//if err != nil {
-	//	return
-	//}
-
-	_, err = f.httpsPost("appCancel", writeoffRequest)
 
 	return
 }
 
 // SendCancelResultResponse 傳送取消交易單處理結果回報
-func (f *FeeAuditUtils) SendCancelResultResponse(writeoffRequest WriteoffRequest) (err error) {
+func (f *FeeAuditUtils) SendCancelResultResponse(writeoffRequest WriteoffRequest) (writeoffResponse WriteoffResponse, err error) {
-	//uploadData, err := json.Marshal(&cancelResultResponse)
+	writeoffResponse, err = f.httpsPost("CancelResultResponse", writeoffRequest)
-	//if err != nil {
-	//	return
-	//}
-
-	_, err = f.httpsPost("CancelResultResponse", writeoffRequest)
 
 	return
 }