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

business/partner/im/im.go

@@ -530,9 +530,15 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) {
 		jxMsg    = &JXMsg{}
 		//userList = &UserMessageList{}
 	)
+
 	if req.SendType == SendTypeMt {
 		vendorID = VendorIDMT
 		mt := req.MsgContent.(mtwmapi.PushContentReq)
+		//跳过12小时内商家消息自动回复
+		if mt.MsgSource != mtwmapi.MsgSourceUser {
+			return nil
+		}
+
 		key = utils.Int2Str(mt.AppID) + ":" + utils.Int2Str(mt.OpenUserID) + ":autoReply"
 		//1 检测是否已自动回复
 		flag = GetIfReply(key)
@@ -598,6 +604,10 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) {
 		elm := req.MsgContent.(ebaiapi.ImMessageSend)
 		key = elmAppID + ":" + elm.PayLoad.SenderID + ":autoReply"
 
+		if elm.PayLoad.SenderID == "" || elm.PayLoad.SenderID[:2] != ebaiapi.SenderTypeUser {
+			return nil
+		}
+
 		//1 检测是否已自动回复
 		flag = GetIfReply(key)
 		if !flag {
@@ -743,7 +753,7 @@ func GetDefaultTemplate(appID, vendorStoreID string, vendorID int) (string, erro
 	if err != nil && err != orm.ErrNoRows {
 		return "", err
 	}
-	if err == orm.ErrNoRows || store.Tel1 == "" {
+	if (err != nil && err == orm.ErrNoRows) || store.Tel1 == "" {
 		t = BasePhoneNum
 	}
 	if len(store.Tel1) > 0 {

business/partner/purchase/mtwm/act.go

@@ -2,6 +2,7 @@ package mtwm
 
 import (
 	"errors"
+	"strings"
 
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -89,7 +90,13 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
 	if len(actData) > 0 {
 		if globals.EnableMtwmStoreWrite {
 			actResult, faileInfoList, err2 := api.MtwmAPI.RetailDiscountBatchSave2(vendorStoreID, jxActType2Mtwm(act.Type), actData)
-			//actResult, faileInfoList, err2 := getAPI(act.VendorOrgCode, 0, vendorStoreID).RetailDiscountBatchSave2(vendorStoreID, jxActType2Mtwm(act.Type), actData)
+
+			//5873
+			if err2 != nil && strings.Contains(err2.Error(), "未获取有效门店id") {
+				actResult, faileInfoList, err2 = api.Mtwm2API.RetailDiscountBatchSave2(vendorStoreID, jxActType2Mtwm(act.Type), actData)
+			}
+
+			//actResult, faileInfoList, err2 := getAPI(tempStore.VendorOrgCode, 0, vendorStoreID).RetailDiscountBatchSave2(vendorStoreID, jxActType2Mtwm(act.Type), actData)
 			err = err2
 			// 忽略错误，都放在failedList里
 			// if err != nil {