This commit is contained in:
邹宗楠
2023-08-02 14:04:28 +08:00
parent 6ea1983c63
commit 574016199e
3 changed files with 59 additions and 33 deletions

View File

@@ -2781,36 +2781,36 @@ var storeList = []int64{
//668476,
//668462,
//100309,
100299,
100292,
668276,
668180,
667320,
667237,
667036,
668691,
668673,
668282,
667447,
667354,
667335,
667319,
667316,
667269,
667268,
667267,
667260,
667132,
667030,
666965,
666714,
666708,
666705,
103437,
103349,
103123,
103121,
103106,
//100299,
//100292,
//668276,
//668180,
//667320,
//667237,
//667036,
//668691,
//668673,
//668282,
//667447,
//667354,
//667335,
//667319,
//667316,
//667269,
//667268,
//667267,
//667260,
//667132,
//667030,
//666965,
//666714,
//666708,
//666705,
//103437,
//103349,
//103123,
//103121,
//103106,
103038,
103028,
103019,
@@ -2849,6 +2849,9 @@ var storeList = []int64{
100103,
100102,
100100,
}
var storeList2 = []int64{
100097,
100096,
100095,
@@ -2885,3 +2888,24 @@ func UpdateTaoSkuUpdateOffShelf() {
// }
//}
}
func UpdateTaoSkuUpdateOffShelf2() {
// 标准模板店
//skuCodeList := dao.GetStoreSkuBindList(dao.GetDB(), 100102)
for _, storeId := range storeList2 {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "开始下架:", utils.Int64ToStr(storeId))
storeSkuMap := dao.GetStoreSkuBindList(dao.GetDB(), storeId)
resultErr := tao.UpdateStoreSku(storeId, storeSkuMap)
if len(resultErr) > 0 {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "下架商品错误消息:", utils.Format4Output(resultErr, false))
}
}
//for _,storeId := range storeList {
// resultErr := tao.UpdateStoreSkuGrounding(storeId, skuCodeList)
// if len(resultErr) > 0 {
// ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "上架架商品错误消息:", utils.Format4Output(resultErr, false))
// }
//}
}

View File

@@ -212,8 +212,9 @@ func Init() {
// 下架所有北京上海门店商品
ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() {
orderman.UpdateTaoSkuUpdateOffShelf()
orderman.UpdateTaoSkuUpdateOffShelf2()
}, []string{
"09:13:00",
"14:08:00",
})
// 每分钟轮询一次,推送骑手信息

View File

@@ -515,13 +515,14 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
isSelfDelivery = model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)
if !isSelfDelivery {
if isSelfDelivery {
if globals.EnableMtwmStoreWrite {
err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
}
}
if err == nil {
if err == nil || strings.Contains(err.Error(), "808") { // 配送类型只能为美团配送或美团企客配送 level:0, code:808
c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup)
return nil
}
return err
}