抖音授权登录,小程序门店切换,门店状态改变日志打印!

This commit is contained in:
邹宗楠
2022-04-15 18:09:48 +08:00
parent 852a4f555d
commit df304dcc81
13 changed files with 110 additions and 77 deletions

View File

@@ -2,7 +2,9 @@ package ebai
import (
"fmt"
"git.rosy.net.cn/jx-callback/business/jxstore/event"
"strings"
"time"
"git.rosy.net.cn/baseapi/platformapi/autonavi"
"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
@@ -579,6 +581,11 @@ func (c *PurchaseHandler) onShopMsgPush(msg *ebaiapi.CallbackMsg) (response *eba
if err == nil {
err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDEBAI, storeStatus)
}
// 操作日志(ebai)
ctx := jxcontext.AdminCtx
store := fmt.Sprintf("饿百外卖回调门店改变回调(营业状态/审核状态):门店id:%s,饿百门店状态:%d.]", vendorStoreID, storeStatus)
event.AddOperateEvent(ctx, ctx.GetTrackInfo(), store, err.Error(), "", int(time.Now().UnixNano()/1000), "UpdateStore")
return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil)
}

View File

@@ -84,7 +84,7 @@ func TestUpdateStore2(t *testing.T) {
// }
func TestSyncQualify(t *testing.T) {
storeDetail, err := dao.GetStoreDetail(dao.GetDB(), 102610, model.VendorIDJD)
storeDetail, err := dao.GetStoreDetail(dao.GetDB(), 102610, model.VendorIDJD, "")
if err != nil {
t.Fatal(err.Error())
}

View File

@@ -48,6 +48,9 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
Current: 1,
PageSize: 1,
})
if err != nil {
return nil, err
}
return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err
}
func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
@@ -81,6 +84,10 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
}
func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
status, err := p.GetOrderStatus(order.VendorOrgCode, order.VendorOrderID2)
if err != nil {
globals.SugarLogger.Debug("jdShop GetOrders err := ", err)
return err
}
//说明此时该订单在平台上已经取消了
if status == model.OrderStatusCanceled {
err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单在京东商城已被取消!")

View File

@@ -4,14 +4,11 @@ import (
"encoding/json"
"errors"
"fmt"
"math"
"regexp"
"strings"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/baseapi/utils/errlist"
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
"git.rosy.net.cn/jx-callback/business/jxstore/event"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -20,6 +17,10 @@ import (
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"math"
"regexp"
"strings"
"time"
)
var (
@@ -344,11 +345,15 @@ func (p *PurchaseHandler) onStoreStatusChanged(msg *mtwmapi.CallbackMsg) (respon
}
}
}
fmt.Println(storeStatus)
//if err == nil {
// err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDMTWM, storeStatus)
//}
if err == nil {
err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDMTWM, storeStatus)
}
response = mtwmapi.Err2CallbackResponse(err, "")
// 操作日志(美团外卖)
ctx := jxcontext.AdminCtx
store := fmt.Sprintf("美团外卖回调门店改变回调(营业状态/审核状态):门店id:%s,美团门店状态:%d.[121营业,120休息,18上线,19下线]", vendorStoreID, int(utils.Str2Int64(msg.FormData.Get("poi_status"))))
event.AddOperateEvent(ctx, ctx.GetTrackInfo(), store, err.Error(), "", int(time.Now().UnixNano()/1000), "UpdateStore")
return response
}