From d4227f69e23e0392f1be98697dd69807f9725005 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Jan 2024 15:21:26 +0800 Subject: [PATCH] 1 --- business/partner/delivery/sfps/waybill.go | 27 ++++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index e2a27c325..ebe4ecfff 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -2,7 +2,6 @@ package sfps import ( "bufio" - "encoding/json" "errors" "fmt" "io/ioutil" @@ -471,10 +470,10 @@ func pushCallbackToGy(urlIndex string, msg interface{}) { request *http.Request param = make(map[string]interface{}) ) - //param = changeToRaw(urlIndex, msg) + param = changeToRaw(urlIndex, msg) //globals.SugarLogger.Debugf("sfsfsf pushCallbackToGy param=%s", utils.Format4Output(param, false)) - b, _ := json.Marshal(msg) + //b, _ := json.Marshal(msg) //sign := api.SfPsAPI.SignParam(b) switch urlIndex { @@ -483,22 +482,24 @@ func pushCallbackToGy(urlIndex string, msg interface{}) { default: //fullUrl := utils.GenerateGetURL("http://callback-jxgy.jxc4.com/SFPS/SfOrder", "", map[string]interface{}{"sign": sign}) //request, err = http.NewRequest(http.MethodPost, fullUrl, strings.NewReader(string(b))) - request, err = http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/SFPS/SfOrder", strings.NewReader(string(b))) + request, err = http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/SFPS/SfOrder", strings.NewReader(utils.Map2URLValues(param).Encode())) } //检测request数据 - data, err := ioutil.ReadAll(request.Body) - temp := make(map[string]interface{}) - if err = json.Unmarshal(data, &temp); err == nil { - globals.SugarLogger.Debugf("pushCallbackToGy test reqData temp=%s,err=%v", utils.Format4Output(temp, false), err) - } - + //data, err := ioutil.ReadAll(request.Body) + //temp := make(map[string]interface{}) + //if err = json.Unmarshal(data, &temp); err == nil { + // globals.SugarLogger.Debugf("pushCallbackToGy test reqData temp=%s,err=%v", utils.Format4Output(temp, false), err) + //} + // if err != nil { + globals.SugarLogger.Debugf("pushCallbackToGy test reqData err=%v", err) return } - request.Header.Set("Content-Type", "application/json;charset=UTF-8") - client.Do(request) - + request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") + resp, err := client.Do(request) + resopp, _ := ioutil.ReadAll(resp.Body) + globals.SugarLogger.Debugf("============ %s %v", string(resopp), err) } func tiktokStatusPush(order *model.Waybill, orderStatus int64, lng, lat, vendorOrgCode string) {