1
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"git.rosy.net.cn/jx-callback/globals"
|
||||
"net/http"
|
||||
"reflect"
|
||||
"sort"
|
||||
@@ -209,6 +210,7 @@ func (a *API) AccessAPI2(apiStr string, jdParams map[string]interface{}, traceIn
|
||||
} else {
|
||||
fullURL := utils.GenerateGetURL(a.baseURL, apiStr, nil)
|
||||
// baseapi.SugarLogger.Debug(utils.Map2URLValues(params).Encode())
|
||||
globals.SugarLogger.Debugf("-----paramsparams- :%s", utils.Format4Output(params, false))
|
||||
request, _ = http.NewRequest(http.MethodPost, fullURL, strings.NewReader(utils.Map2URLValues(params).Encode()))
|
||||
request.Header.Set("charset", "UTF-8")
|
||||
request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
|
||||
@@ -358,7 +358,6 @@ func (a *API) UpdateStoreInfo4Open2(updateParams *OpStoreParams, modifyCloseStat
|
||||
delete(mapData, "serviceTimeStart1")
|
||||
delete(mapData, "serviceTimeEnd1")
|
||||
}
|
||||
globals.SugarLogger.Debugf("-------mapdata := %s", utils.Format4Output(mapData, false))
|
||||
_, err = a.AccessAPINoPage("store/updateStoreInfo4Open", mapData, nil, nil, nullResultParser)
|
||||
if err != nil {
|
||||
globals.SugarLogger.Debugf("九点半定时任务,更新门店错误: %v", err)
|
||||
|
||||
@@ -241,3 +241,44 @@ type ElectronicContractStatus struct {
|
||||
SignH5Url string `json:"sign_h5_url"` // 签约H5地址
|
||||
SignH5UrlExpTm string `json:"sign_h5_url_exp_tm"` // 签约H5地址过期时间
|
||||
}
|
||||
|
||||
// QueryElectronic 电子合同查询
|
||||
func (a *API) QueryElectronic(orderNo string, orgId int, ecApplyId string) (*QueryElectronicResp, error) {
|
||||
reqParameter := map[string]interface{}{
|
||||
"req_data": map[string]interface{}{
|
||||
"order_no": orderNo,
|
||||
"org_code": orgId,
|
||||
"ec_apply_id": ecApplyId,
|
||||
},
|
||||
"version": Version,
|
||||
"req_time": utils.Time2TimeStrByFormat(time.Now(), TimeFormat),
|
||||
"req_id": utils.GetUUID(),
|
||||
}
|
||||
result, err := a.AccessAPISign(OrderProdUrl, OrderEcQuery, http.MethodPost, "", reqParameter)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if result["code"].(string) != Success {
|
||||
return nil, fmt.Errorf(result["msg"].(string))
|
||||
}
|
||||
|
||||
bodyResult, err := json.Marshal(result["resp_data"].(map[string]interface{}))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
resp := &QueryElectronicResp{}
|
||||
if err = json.Unmarshal(bodyResult, resp); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
type QueryElectronicResp struct {
|
||||
OrderNo string `json:"order_no"` // 请求上送的订单号
|
||||
EcApplyId int64 `json:"ec_apply_id"` // 电子签约申请受理编号
|
||||
EcStatus string `json:"ec_status"` // 电子合同签署状态 UNDONE 未完成 COMPLETED 已完成
|
||||
EcNo string `json:"ec_no"` // 电子合同号
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ const (
|
||||
OrderEcApplyActive = "mms/open_api/ec/apply" // 电子合同申请
|
||||
OrderEcApplyStatusActive = "mms/open_api/ec/qma_status" // 人工复合结果查询
|
||||
OrderEcApplyByPeopleActive = "mms/open_api/ec/apply_manual" // 申请人工审核
|
||||
OrderEcQuery = "mms/open_api/ec/q_status" // 电子合同查询
|
||||
|
||||
)
|
||||
|
||||
|
||||
@@ -159,3 +159,9 @@ func TestRefundOrder(t *testing.T) {
|
||||
func TestQueryElectronicContract(t *testing.T) {
|
||||
api.QueryElectronicContract(GetOrderNumber(8), 983931, "1008409270838853632")
|
||||
}
|
||||
|
||||
func TestQueryElectronic(t *testing.T) {
|
||||
resp, err := api.QueryElectronic("202508181038577028422164", 983931, "1009773397658267648")
|
||||
fmt.Println(resp)
|
||||
fmt.Println(err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user