Accept Merge Request #159: (su -> mark)

Merge Request: 验证cookie新增美团配送
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/159

business/jxstore/cms/store_sku.go

@@ -1183,6 +1183,9 @@ func getSkuSaleStatus(inSkuBind *StoreSkuBindSkuInfo, skuNameBindInfo *StoreSkuB
 }
 
 func AddEventDetail(db *dao.DaoDB, ctx *jxcontext.Context, operateType, thingID, thingType, storeID int, beforeData, afterData string) (err error) {
+	if ctx.GetUserName() == "jxadmin" {
+		return err
+	}
 	operateEventDetail := &model.OperateEventDetail{
 		OperateType: operateType,
 		ThingID:     thingID,
@@ -1192,7 +1195,7 @@ func AddEventDetail(db *dao.DaoDB, ctx *jxcontext.Context, operateType, thingID,
 		BeforeData:  beforeData,
 		AfterData:   afterData,
 	}
-	err = event.AddOperateEventDetail(db, ctx, operateEventDetail)
+	err = event.AddOperateEventDetail(db, operateEventDetail)
 	return err
 }
 

business/jxstore/event/event.go

@@ -1,6 +1,7 @@
 package event
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
@@ -24,6 +25,7 @@ var (
 
 type CheckCookie struct {
 	VendorID      int    `json:"vendorID"`
+	VendorOrgCode string `json:"vendorOrgCode"`
 	Status        string `json:"status"`
 }
 
@@ -60,10 +62,7 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) {
 	return err
 }
 
-func AddOperateEventDetail(db *dao.DaoDB, ctx *jxcontext.Context, operateEventDetail *model.OperateEventDetail) (err error) {
+func AddOperateEventDetail(db *dao.DaoDB, operateEventDetail *model.OperateEventDetail) (err error) {
-	if ctx.GetUserName() == "jxadmin" {
-		return err
-	}
 	dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
@@ -120,47 +119,51 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 	var (
 		ebaiOrderID = "1577329467196263592"
 		ebaiErr     = "return not json"
-		// mtOrderID   = "69761763472881638"
+		mtStoreID   = "7388603"
-		// mtStoreID   = "6976176"
 		mtErr       = "返回结果格式不正常"
 		jdUpcCode   = "6952395700895"
 		jdErr       = "请输入用户名"
+		mtpsErr     = "用户未登录"
 		errMsg      = ""
 	)
 	for _, v := range vendorIDs {
-		var flag = false
+		for _, vv := range apimanager.CurAPIManager.GetAppOrgCodeList(v) {
 			cc := &CheckCookie{}
+			var flag = false
 			switch v {
-		case 3:
+			case model.VendorIDEBAI:
 				resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID)
 				if len(resultMap) < 1 && err != nil {
 					if strings.Contains(err.Error(), ebaiErr) {
-					//Cookie无效了
+						errMsg += fmt.Sprintf(" 饿百账号:[%v]的Cookie无效了！", vv)
-					errMsg += " 饿百Cookie无效了！"
 						flag = true
 					}
 				}
-		case 1:
+			case model.VendorIDMTWM:
-			err := api.MtwmAPI.PackagePriceUpdate("7388603", 1, 50)
+				_, err := api.MtwmAPI.PackagePriceGet(mtStoreID)
 				if err != nil {
 					if strings.Contains(err.Error(), mtErr) {
-					errMsg += " 美团Cookie无效了！"
+						errMsg += fmt.Sprintf(" 美团账号:[%v]的Cookie无效了！", vv)
 						flag = true
 					}
 				}
-		case 0:
+			case model.VendorIDJD:
-			for _, vv := range apimanager.CurAPIManager.GetAppOrgCodeList(v) {
 				result, err := jd.GetAPI(vv).GetJdUpcCodeByName("", jdUpcCode, 1, 5)
 				if len(result) < 1 && err != nil {
 					if strings.Contains(err.Error(), jdErr) {
-						//Cookie无效
+						errMsg += fmt.Sprintf(" 京东账号:[%v]的Cookie无效了！", vv)
-						errMsg += " 京东Cookie无效了！"
 						flag = true
 					}
 				}
+			case model.VendorIDMTPS:
+				err := api.MtpsAPI.GetAccountDetail()
+				if err != nil && strings.Contains(err.Error(), mtpsErr) {
+					errMsg += fmt.Sprintf(" 美团配送账号:[%v]的Cookie无效了！", vv)
+					flag = true
 				}
 			}
 			cc.VendorID = v
+			cc.VendorOrgCode = vv
 			if flag {
 				cc.Status = "无效"
 			} else {
@@ -168,6 +171,7 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 			}
 			ccList = append(ccList, cc)
 		}
+	}
 	if isAuto && len(ccList) > 0 {
 		globals.SugarLogger.Warnf("GetCheckVendorCookie", errMsg)
 	}

business/model/dao/event.go

@@ -77,7 +77,10 @@ func GetOperateEvents(db *DaoDB, apiFunction, name string, operateType int, skuI
 		sql += " AND b.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
 		sqlParams = append(sqlParams, storeIDs)
 	}
-	sql += " LIMIT ? OFFSET ?"
+	sql += ` 
+	ORDER BY a.created_at DESC
+	LIMIT ? OFFSET ?
+	`
 	sqlParams = append(sqlParams, pageSize, offset)
 	Begin(db)
 	defer Commit(db)