From 69040cd1cf3234e44197402f3a317a4063983ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 30 Mar 2023 18:08:56 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/user2.go | 4 ++-- business/partner/purchase/jdshop/store.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index afbbf871d..7cf8b5e65 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -159,8 +159,8 @@ func init() { func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVerifyCode string, inAuthInfo, manTokenInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) { var mobileAuth *auth2.AuthInfo fakeMobile := false - //user.Type = model.UserTypeConsumer | model.UserTypeStoreBoss // 先不区分商户与消息者 - user.Type = model.UserTypeConsumer // 先不区分商户与消息者 + user.Type = model.UserTypeConsumer | model.UserTypeStoreBoss // 先不区分商户与消息者 + //user.Type = model.UserTypeConsumer // 先不区分商户与消息者 createName := ctx.GetRealRemoteIP() authType := auth2.AuthTypeMobile if manTokenInfo != nil && mobileVerifyCode == "" { diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go index 151b95667..7cc3ce101 100644 --- a/business/partner/purchase/jdshop/store.go +++ b/business/partner/purchase/jdshop/store.go @@ -19,7 +19,7 @@ import ( "git.rosy.net.cn/jx-callback/globals/api" ) -func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID ,vendorStoreName string) (storeDetail *dao.StoreDetail, err error) { +func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID, vendorStoreName string) (storeDetail *dao.StoreDetail, err error) { // result, err := api.JdShopAPI.NewInfoList(utils.Str2Int64(vendorStoreID)) // storeDetail.VendorStoreID = vendorStoreID // storeDetail.Status = JdsStatus2jxStatus(result.StoreStatus) @@ -186,15 +186,15 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin }, } } - store1:= fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(京东):%d", storeID,store.Name, 0, store.Status, jxutils.MergeStoreStatus(store.Status, store.VendorStatus),store.VendorOrgCode) - event.AddOperateEvent(jxcontext.AdminCtx,jxcontext.AdminCtx.GetTrackInfo(), store1, "", "", 10, "UpdateStore") + store1 := fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(京东):%s", storeID, store.Name, 0, store.Status, jxutils.MergeStoreStatus(store.Status, store.VendorStatus), store.VendorOrgCode) + event.AddOperateEvent(jxcontext.AdminCtx, jxcontext.AdminCtx.GetTrackInfo(), store1, "", "", 10, "UpdateStore") err = getAPI("2").UpdateBasic(param) -} + } if store.SyncStatus&model.SyncFlagStoreStatus != 0 { mergedStoreStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus) p.UpdateStoreStatus(jxcontext.AdminCtx, store.VendorOrgCode, storeID, store.VendorStoreID, mergedStoreStatus) - store1:= fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(京东):%d", storeID,store.Name, 100, store.Status, mergedStoreStatus,store.VendorOrgCode) - event.AddOperateEvent(jxcontext.AdminCtx,jxcontext.AdminCtx.GetTrackInfo(), store1, "", "", 10, "UpdateStore") + store1 := fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(京东):%s", storeID, store.Name, 100, store.Status, mergedStoreStatus, store.VendorOrgCode) + event.AddOperateEvent(jxcontext.AdminCtx, jxcontext.AdminCtx.GetTrackInfo(), store1, "", "", 10, "UpdateStore") } if err == nil {