From 15b450db7a06bd5ea21f067814023a2f674f5cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 18 Dec 2023 14:10:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E9=97=A8=E5=BA=97=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=98=AF=E9=80=9A=E7=9F=A5=E7=BB=99=E7=9F=B3=E9=94=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/misc/misc.go | 3 --- business/model/const.go | 8 +++++--- business/partner/delivery/fn/store.go | 4 ++-- business/partner/delivery/rider.go | 8 ++++---- business/partner/purchase/mtwm/store.go | 20 ++++++++++++++++++- .../purchase/tao_vegetable/store_sku2.go | 1 - 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 5350c47d9..7c02a74d6 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -5,9 +5,7 @@ import ( "sync" "time" - "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/jx-callback/business/bidding" - "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/business/partner/delivery" "git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop" @@ -641,7 +639,6 @@ func syncStoreSkuTiktok() { errList.AddErr(err) SaveImportantTaskID(TaskNameSyncStoreSku, SpecialTaskID) } - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "抖音同步商品", utils.Format4Output(errList, false)) err = errList.GetErrListAsOne() return retVal, err }, []int{0, 1}) diff --git a/business/model/const.go b/business/model/const.go index 10d67e486..e5d7f397e 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -506,9 +506,11 @@ const ( ) const ( - DefaultName = "石锋" - DefaultPhone = "18048531223" - DefaultIdCard = "610126198012230014" + DefaultName = "石锋" + DefaultPhone = "18048531223" + DefaultUserIdCaiShi = "DDC5657B43EE11E9A9FF525400E86DC0" + DefaultUserIdGuoYuan = "08B71CB5671D11E9943E525400E86DC0" + DefaultIdCard = "610126198012230014" ) func IsPurchaseVendorExist(vendorID int) bool { diff --git a/business/partner/delivery/fn/store.go b/business/partner/delivery/fn/store.go index 36b7d70e8..d9604bd80 100644 --- a/business/partner/delivery/fn/store.go +++ b/business/partner/delivery/fn/store.go @@ -57,7 +57,7 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S BusinessLicencePicHash: storeDetail.Licence, } if createStore.OwnerName == "" { - createStore.OwnerName = "石锋" + createStore.OwnerName = model.DefaultName } if createStore.OwnerIDNum == "" { createStore.OwnerIDNum = "610126198012230014" @@ -137,7 +137,7 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S updateStore.BranchShopName = storeDetail.Name } if updateStore.OwnerName == "" { - updateStore.OwnerName = "石锋" + updateStore.OwnerName = model.DefaultName } if updateStore.OwnerIDNum == "" { updateStore.OwnerIDNum = "610126198012230014" diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index b1917662f..0b90331e1 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -195,8 +195,8 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } if riderInfo.CourierPhone == "" { - riderInfo.CourierName = "石锋" - riderInfo.CourierPhone = "18048531223" + riderInfo.CourierName = model.DefaultName + riderInfo.CourierPhone = model.DefaultPhone } if riderInfo.OrderId == "" { @@ -471,8 +471,8 @@ func UpdateFakeWayBillToTiktok() { riderInfo.CourierPhone = fakeWayBill[i].CourierMobile } if riderInfo.CourierName == "" && fakeWayBill[i].CourierName == "" { - riderInfo.CourierName = "石锋" - riderInfo.CourierPhone = "18048531223" + riderInfo.CourierName = model.DefaultName + riderInfo.CourierPhone = model.DefaultPhone } if riderInfo.LogisticsContext != model.RiderGetOrderDeliverFailed && riderInfo.LogisticsContext != model.RiderGetOrderDeliverOther && riderInfo.LogisticsContext != model.RiderWaitRider { riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index aa18a5e6b..4276d0d61 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -4,6 +4,9 @@ import ( "encoding/json" "errors" "fmt" + "git.rosy.net.cn/baseapi/platformapi/dingdingapi" + "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" + beego "github.com/astaxie/beego/server/web" "math" "regexp" "strings" @@ -365,7 +368,15 @@ func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCod } if remoteStoreInfo.IsOnline == mtwmapi.PoiStatusOnline { if openLevel == mtwmapi.PoiOpenLevelHaveRest { - err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiClose(vendorStoreID) + // 门店下线时通知给石锋 + if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiClose(vendorStoreID); err == nil { + switch beego.BConfig.RunMode { + case "jxgy": + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") + default: + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") + } + } } else { err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOpen(vendorStoreID) } @@ -469,6 +480,13 @@ func (c *PurchaseHandler) UpdateStoreLineStatus(ctx *jxcontext.Context, vendorOr default: // 先关店,在下线 if err = mtwmApi.PoiClose(vendorStoreID); err == nil { err = mtwmApi.PoiOffline(vendorStoreID) + // 通知给石锋 + switch beego.BConfig.RunMode { + case "jxgy": + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") + default: + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") + } } } diff --git a/business/partner/purchase/tao_vegetable/store_sku2.go b/business/partner/purchase/tao_vegetable/store_sku2.go index bf961bb86..b788a5987 100644 --- a/business/partner/purchase/tao_vegetable/store_sku2.go +++ b/business/partner/purchase/tao_vegetable/store_sku2.go @@ -367,7 +367,6 @@ func createTaoVegetable(ctx *jxcontext.Context, api *tao_vegetable.API, storeSku if err != nil { globals.SugarLogger.Debugf("创建淘鲜达商品异常:%s", err.Error()) } - //ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", fmt.Sprintf("定时创建商品[门店id:%d],出入商品个数[%d]", storeID, len(storeSkuList)), utils.Format4Output(result, false)) // 记录失败的同步数据 failedList2, vendorSkuIdMap2 := SelectStoreSkuListByFoodList(storeSkuList, *result, storeID, model.VendorChineseNames[model.VendorIDTaoVegetable], syncType)