1\

platformapi/fnpsapi/store.go

@@ -132,31 +132,44 @@ func IsErrShopExist(err error) bool {
 	return false
 }
 
+const (
+	FengNiaoCallbackTypeOrder    = "order"    // 订单
+	FengNiaoCallbackTypeStore    = "store"    // 门店
+	FengNiaoCallbackTypeAbnormal = "abnormal" // 异常
+	FengNiaoCallbackTypeToken    = "token"    // token更新
+)
+
 // 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
-		}
+	//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
+	//	}
+	//}
+	paramData, err = json.Marshal(param)
+	if err != nil {
+		return nil, err
 	}
 	body := strings.NewReader(string(paramData))
 	url := ""
 	switch requestType {
-	case "store": // 订单相关
+	case FengNiaoCallbackTypeStore:
 		url = "http://callback-jxgy.jxc4.com/fn/fnStore"
-	case "order": // 门店
+	case FengNiaoCallbackTypeOrder:
 		url = "http://callback-jxgy.jxc4.com/fn/fnOrder"
-	case "abnormal": // 异常
+	case FengNiaoCallbackTypeAbnormal:
 		url = "http://callback-jxgy.jxc4.com/fn/fnAbnormal"
+	case FengNiaoCallbackTypeToken:
+		url = "http://callback-jxgy.jxc4.com/fn/fnToken"
 	}
 	httpReq, err := http.NewRequest(http.MethodPost, url, body)
 	if err != nil {