diff --git a/platformapi/fnpsapi/callback.go b/platformapi/fnpsapi/callback.go index b596c06a..77a79456 100644 --- a/platformapi/fnpsapi/callback.go +++ b/platformapi/fnpsapi/callback.go @@ -138,25 +138,24 @@ func (a *API) GetChainstoreStatusNotify(request *http.Request) (shopStatusMsg *C } // 获取订单状态回调消息 -func (a *API) GetChainOrderStatusNotify(request *http.Request) (shopStatusMsg *OrderStatusNottify, callbackResponse *CallbackResponse) { +func (a *API) GetChainOrderStatusNotify(request *http.Request) (shopStatusMsg *OrderStatusNottify, result *ShortStatus, callbackResponse *CallbackResponse) { data, err := ioutil.ReadAll(request.Body) if err != nil { callbackResponse = &CallbackResponse{Code: -1} - return nil, callbackResponse + return nil, nil, callbackResponse } - result := &ShortStatus{} if err := json.Unmarshal(data, &result); err != nil { callbackResponse = &CallbackResponse{Code: -1} - return nil, callbackResponse + return nil, nil, callbackResponse } orderResult := &OrderStatusNottify{} if err := json.Unmarshal([]byte(result.BusinessData), orderResult); err != nil { callbackResponse = &CallbackResponse{Code: -1} - return nil, callbackResponse + return nil, nil, callbackResponse } - return orderResult, SuccessResponse + return orderResult, result, SuccessResponse } // 异常配送 diff --git a/platformapi/fnpsapi/fn_test.go b/platformapi/fnpsapi/fn_test.go index 3ef845bc..66251c84 100644 --- a/platformapi/fnpsapi/fn_test.go +++ b/platformapi/fnpsapi/fn_test.go @@ -26,10 +26,10 @@ func init() { // 查询单个门店 func TestQueryOneStore(t *testing.T) { - api = New("6705486294797503379", "c1e6c280-e618-4103-9d0a-673bc54fb22e", "5375691", "") - token, err := api.GetAccessToken() - api.accessToken = token.BusinessDataObj.AccessToken - data, err := api.GetStore("209476483") + api = New("6705486294797503379", "c1e6c280-e618-4103-9d0a-673bc54fb22e", "51658", "") + //token, err := api.GetAccessToken() + api.accessToken = "45c49b75-d47e-4145-b38d-fda8b5ebf3a9" + data, err := api.GetStore("800293") fmt.Println(data) fmt.Println(err) } diff --git a/platformapi/fnpsapi/store.go b/platformapi/fnpsapi/store.go index dd07f4f3..0d4b9122 100644 --- a/platformapi/fnpsapi/store.go +++ b/platformapi/fnpsapi/store.go @@ -3,6 +3,7 @@ package fnpsapi import ( "encoding/json" "fmt" + "net/http" "strings" "git.rosy.net.cn/baseapi/utils" @@ -130,3 +131,40 @@ func IsErrShopExist(err error) bool { } return false } + +// HttpToGuoYuanFN 订单消息推送果园 +func HttpToGuoYuanFN(param map[string]interface{}, requestType string) (*http.Response, error) { + var paramData []byte + var err error + if requestType == "order" || requestType == "waybill" { + param["data"] = utils.Format4Output(param["data"], false) + paramData, err = json.Marshal([]interface{}{param}) + if err != nil { + return nil, err + } + } else { + paramData, err = json.Marshal(param) + if err != nil { + return nil, err + } + } + body := strings.NewReader(string(paramData)) + url := "" + switch requestType { + case "store": // 订单相关 + url = "http://callback-jxgy.jxc4.com/fn/fnStore" + case "order": // 门店 + url = "http://callback-jxgy.jxc4.com/fn/fnOrder" + case "abnormal": // 异常 + url = "http://callback-jxgy.jxc4.com/fn/fnAbnormal" + } + httpReq, err := http.NewRequest(http.MethodPost, url, body) + if err != nil { + return nil, err + } + + httpReq.Header.Set("Content-Type", "application/json") + + httpRes, err := http.DefaultClient.Do(httpReq) + return httpRes, err +}