Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/jxcallback/scheduler/basesch/basesch.go

@@ -125,6 +125,9 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
 						partner.CurOrderManager.OnOrderMsg(order, "美团外卖转自送可能成功,异常:", err.Error())
 						err = nil
 						return nil
+					} else if strings.Contains(err.Error(), "商家没有接入众包配送,无法进行众包配送相关操作") {
+						partner.CurOrderManager.OnOrderMsg(order, "商家无配送设置,转配送成功", err.Error())
+						err = nil
 					} else {
 						bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
 						err = c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)

business/partner/purchase/mtwm/callback.go

@@ -11,6 +11,11 @@ import (
 
 // 美团回调接口
 func OnCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) {
+	// 获取平台门店id
+	//store, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), GetVendorStoreIDFromMsg(msg), model.VendorIDMTWM, GetVendorAppIdFromMsg(msg))
+	//if err != nil && strings.Contains(err.Error(), "no row found") {
+	//
+	//}
 	if CurPurchaseHandler != nil {
 		if msg.Cmd == mtwmapi.MsgTypeStoreStatusChanged || msg.Cmd == mtwmapi.MsgTypeStoreAuditStatusChanged {
 			response = CurPurchaseHandler.onStoreStatusChanged(msg)
@@ -50,3 +55,32 @@ func GetOrderIDFromMsg(msg *mtwmapi.CallbackMsg) string {
 func GetVendorStoreIDFromMsg(msg *mtwmapi.CallbackMsg) string {
 	return msg.FormData.Get(mtwmapi.KeyAppPoiCode)
 }
+
+func GetVendorAppIdFromMsg(msg *mtwmapi.CallbackMsg) string {
+	return msg.FormData.Get(mtwmapi.KeyAppID)
+}
+
+//
+//func forwardOrderToGy(msg *mtwmapi.CallbackMsg) {
+//	cl := http.Client{}
+//	params := make(map[string]interface{})
+//	params["mt_peisong_id"] = msg.MtPeisongID
+//	params["courier_name"] = msg.CourierName
+//	params["delivery_id"] = msg.DeliveryID
+//	params["appkey"] = msg.AppKey
+//	params["order_id"] = msg.OrderID
+//	params["courier_phone"] = msg.CourierPhone
+//	params["status"] = msg.Status
+//	params["timestamp"] = msg.Timestamp
+//	params["cancel_reason_id"] = msg.CancelReasonId
+//	params["cancel_reason"] = msg.CancelReason
+//	urls := utils.Map2URLValues(params)
+//	sign := signParams(urls)
+//	params["sign"] = sign
+//	request, err := http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(params).Encode()))
+//	if err != nil {
+//		return
+//	}
+//	request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
+//	cl.Do(request)
+//}

business/partner/purchase/mtwm/financial_test.go

@@ -2,6 +2,8 @@ package mtwm
 
 import (
 	"fmt"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"net/url"
 	"testing"
 	"time"
@@ -52,3 +54,10 @@ func TestOnOrderDetail(t *testing.T) {
 	err := new(PurchaseHandler).OnOrderDetail(result, partner.CreatedPeration)
 	fmt.Println(err)
 }
+
+func TestName(t *testing.T) {
+	store, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), "1", model.VendorIDMTWM, "1")
+	fmt.Println(store)
+	fmt.Println(err)
+
+}

controllers/auth2.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"encoding/base64"
 	"fmt"
+	"git.rosy.net.cn/jx-callback/globals"
 	"net/http"
 	"strings"
 
@@ -240,6 +241,8 @@ func (c *Auth2Controller) WeixinMPOAuth2() {
 			params.Block = params.Block[:strings.LastIndex(params.Block, "?")]
 		}
 		redirectURL = fmt.Sprintf("%s?info=%s", params.Block, base64.StdEncoding.EncodeToString(utils.MustMarshal(callResult)))
+		globals.SugarLogger.Debugf("===redirectURL=== %s", redirectURL)
+		globals.SugarLogger.Debugf("===retVal=== %s", utils.Format4Output(retVal, false))
 		return retVal, model.ErrorCodeIgnore, err
 	})
 	c.Redirect(redirectURL, http.StatusTemporaryRedirect)