From cf7970f823d1f3b4fb58c19c50d2c2efeaa7352e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 31 Jul 2023 18:01:01 +0800 Subject: [PATCH 01/21] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 11 ++++------- business/partner/purchase/tao_vegetable/order.go | 3 +++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 0ac88c8a9..b4801a298 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -712,13 +712,6 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo globals.SugarLogger.Warnf("OnWaybillStatusChanged AcceptCanceled orderID:%s got multiple bill:%v, order details:%v", order.VendorOrderID, bill, order) } } - // case model.WaybillStatusCourierArrived: // do nothing - // s.resetTimer(savedOrderInfo, bill, isPending) - // if s.isBillCandidate(order, bill) { - // } else { - // // s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) - // globals.SugarLogger.Infof("OnWaybillStatusChanged CourierArrived order(%d, %s) bill(%d, %s), bill:%v shouldn't get here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill) - // } case model.WaybillStatusCanceled, model.WaybillStatusFailed: s.removeWaybillFromMap(savedOrderInfo, bill.WaybillVendorID) if s.isBillCandidate(order, bill) || order.WaybillVendorID == model.VendorIDUnknown { @@ -740,6 +733,10 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo } } } + if order.Status == model.OrderStatusDelivering && bill.Status == model.WaybillStatusCanceled { + order.Status = model.OrderStatusFinishedPickup + dao.UpdateEntity(dao.GetDB(), order, "Status") + } if err := orderman.ResetCreateWaybillFee(nil, order, bill); err != nil { globals.SugarLogger.Errorf("ResetCreateWaybillFee err : %v", err) diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 598630bfd..27fa9e57b 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -439,6 +439,9 @@ func (c *PurchaseHandler) callbackOrderMsg2Status(msg *tao_vegetable.CallbackOrd case tao_vegetable.OrderStatusSuccess: // 送达 orderStatus.Status = model.OrderStatusFinished orderStatus.Remark = "订单送达" + case tao_vegetable.OrderStatusRefundClose: // 订单取消 + orderStatus.Status = model.OrderStatusCanceled + orderStatus.Remark = "订单取消" } return orderStatus } From 0acc44c71632cc710e290b05d20b07ee12dde200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 31 Jul 2023 18:06:44 +0800 Subject: [PATCH 02/21] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index bfb732c01..a3e240ffc 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -206,7 +206,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoTotalMoney", func() { orderman.UpdateTaoSettleInfo() }, []string{ - "17:35:00", + "18:10:00", }) // 每分钟轮询一次,推送骑手信息 From 3a6a2250788e8ec14a40abdd5f721b635c789c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 09:42:59 +0800 Subject: [PATCH 03/21] 1 --- business/jxcallback/orderman/order.go | 142 ++++++++++++++++++ business/jxstore/misc/misc.go | 9 +- business/model/dao/store_sku.go | 14 ++ .../partner/purchase/tao_vegetable/order.go | 20 +++ .../purchase/tao_vegetable/order_afs.go | 2 +- 5 files changed, 185 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 679172eec..23e496651 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2735,3 +2735,145 @@ func UpdateTaoSettleInfo() { } } } + +var storeList = []int64{ + 669053, + 103074, + 668985, + 103065, + 668960, + 668959, + 668953, + 103029, + 668949, + 103002, + 102999, + 668932, + 668931, + 668917, + 102969, + 102966, + 668909, + 668908, + 668905, + 668901, + 102946, + 102939, + 102938, + 668894, + 102934, + 102933, + 102930, + 668884, + 668878, + 102903, + 668757, + 102293, + 668622, + 668618, + 668592, + 100945, + 668583, + 100943, + 100935, + 100905, + 668498, + 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, + 103038, + 103028, + 103019, + 102831, + 102751, + 102683, + 102542, + 102514, + 102382, + 102182, + 102178, + 102173, + 102098, + 102094, + 102080, + 102072, + 102069, + 101870, + 101869, + 101868, + 101867, + 101866, + 101865, + 100956, + 100930, + 100871, + 100786, + 100746, + 100744, + 100705, + 100400, + 100111, + 100108, + 100106, + 100104, + 100103, + 100102, + 100100, + 100097, + 100096, + 100095, + 100093, + 100092, + 100089, + 100087, + 100086, + 100085, + 100083, + 100082, + 100081, + 100079, + 100078, +} + +func UpdateTaoSkuUpdateOffShelf() { + // 标准模板店 + //skuCodeList := dao.GetStoreSkuBindList(dao.GetDB(), 100102) + + for _, storeId := range storeList { + storeSkuMap := dao.GetStoreSkuBindList(dao.GetDB(), storeId) + resultErr := tao.UpdateStoreSku(storeId, storeSkuMap) + if len(resultErr) > 0 { + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "下架商品错误消息:", utils.Format4Output(resultErr, false)) + } + } +} diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index a3e240ffc..67e46b459 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -209,6 +209,13 @@ func Init() { "18:10:00", }) + // 下架所有北京上海门店商品 + ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { + orderman.UpdateTaoSkuUpdateOffShelf() + }, []string{ + "09:45:00", + }) + // 每分钟轮询一次,推送骑手信息 ScheduleTimerFuncByInterval(func() { delivery.UpdateFakeWayBillToTiktok() @@ -321,7 +328,7 @@ func Init() { //// 武汉 //668352, 103200, 102958, 100887, 100236, //// 广州 - 668871, 668602, 668575, 668262, 103425, 101755, 101176, 100557, 100369, 100361, 100351, 100350, + // 668871, 668602, 668575, 668262, 103425, 101755, 101176, 100557, 100369, 100361, 100351, 100350, //成都 669172, 669171, diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index cc223af68..ea30673b9 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1697,6 +1697,20 @@ func GetDeletedStoreSkuBind(db *DaoDB, storeID, skuID int) (storeSkuBind *model. return storeSkuBind } +func GetStoreSkuBindList(db *DaoDB, storeId int64) []string { + storeSkuBind := make([]*model.StoreSkuBind, 0, 0) + sql := `SELECT * FROM store_sku_bind WHERE store_id = ` + fmt.Sprintf("%d", storeId) + `AND status = 1 ` + GetRows(db, &storeSkuBind, sql) + + data := make([]string, 0) + for _, v := range storeSkuBind { + if v.TaoID != 0 { + data = append(data, utils.Int64ToStr(v.TaoID)) + } + } + return data +} + func GetStoreSkuBindByNameID(db *DaoDB, storeID, nameID, status int) (storeSkuBind []*model.StoreSkuBind, err error) { sql := ` SELECT c.* diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 27fa9e57b..0d2d3e8f6 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -10,6 +10,8 @@ import ( "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" domain3156 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability3156/domain" request3156 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability3156/request" + domain587 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability587/domain" + request587 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability587/request" domain591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain" request591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/util" @@ -843,6 +845,24 @@ func (c *PurchaseHandler) GetOrderSettleAccounts(order *model.GoodsOrder) (int64 return 0, nil } +func UpdateStoreSku(storeId int64, skuCode []string) []string { + api := getAPI("34402634", 0, "") + + result := make([]string, 0, 0) + for _, v := range skuCode { + param := &request587.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain587.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{ + SkuCode: utils.String2Pointer(v), + StoreId: utils.String2Pointer(fmt.Sprintf("JX%d", v)), + ChannelCode: utils.String2Pointer("31"), + OnlineSaleFlag: utils.Int64ToPointer(0), + }} + if err := api.StoreSkuUpdateOffShelf(param); err != nil { + result = append(result, fmt.Sprintf(" [storeId:%d,skuCode:%s]"+err.Error(), storeId, v)) + } + } + return result +} + // GetOrderTotalShopMoney 获取门店结算信息 func GetOrderTotalShopMoney(appOrgCode string, vendorStoreID string, start, end time.Time) (map[string]string, error) { if appOrgCode == "" || vendorStoreID == "" { diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index faa65173a..d3fcbf33c 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -302,7 +302,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal for _, v := range *detail.Orders { afs, _ := partner.CurOrderManager.LoadAfsOrder(utils.Int64ToStr(*v.OriginOrderId), model.VendorIDTaoVegetable) - if afs != nil { + if afs == nil { afsOrder = &model.AfsOrder{ VendorID: model.VendorIDTaoVegetable, AfsOrderID: utils.Int64ToStr(*v.OriginOrderId), From d18ae4c553d318375ffaf11e5eb05d97be253add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 09:45:25 +0800 Subject: [PATCH 04/21] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 67e46b459..406b16819 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "09:45:00", + "09:47:00", }) // 每分钟轮询一次,推送骑手信息 From d8729d651f54759a40703a6a8d6ff02ecd1e26a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 09:50:23 +0800 Subject: [PATCH 05/21] 1 --- business/jxstore/misc/misc.go | 2 +- business/partner/purchase/tao_vegetable/order.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 406b16819..61c8af71f 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "09:47:00", + "09:52:00", }) // 每分钟轮询一次,推送骑手信息 diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 0d2d3e8f6..18c048841 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -852,7 +852,7 @@ func UpdateStoreSku(storeId int64, skuCode []string) []string { for _, v := range skuCode { param := &request587.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain587.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{ SkuCode: utils.String2Pointer(v), - StoreId: utils.String2Pointer(fmt.Sprintf("JX%d", v)), + StoreId: utils.String2Pointer(fmt.Sprintf("JX%s", v)), ChannelCode: utils.String2Pointer("31"), OnlineSaleFlag: utils.Int64ToPointer(0), }} From 902dfadb711798abe1c0bd197c0a706cb56aa840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 10:12:19 +0800 Subject: [PATCH 06/21] 1 --- business/jxstore/misc/misc.go | 2 +- business/model/dao/store_sku.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 61c8af71f..cb8ee20da 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "09:52:00", + "10:15:00", }) // 每分钟轮询一次,推送骑手信息 diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index ea30673b9..0b88fb038 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1699,7 +1699,7 @@ func GetDeletedStoreSkuBind(db *DaoDB, storeID, skuID int) (storeSkuBind *model. func GetStoreSkuBindList(db *DaoDB, storeId int64) []string { storeSkuBind := make([]*model.StoreSkuBind, 0, 0) - sql := `SELECT * FROM store_sku_bind WHERE store_id = ` + fmt.Sprintf("%d", storeId) + `AND status = 1 ` + sql := `SELECT * FROM store_sku_bind WHERE store_id = ` + fmt.Sprintf("%d", storeId) + ` AND status = 1 ` GetRows(db, &storeSkuBind, sql) data := make([]string, 0) From 0bc93f20bb0bf1e5fca828d2e5f0e0a1b8134a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 10:30:37 +0800 Subject: [PATCH 07/21] 1 --- business/jxstore/misc/misc.go | 2 +- business/partner/purchase/tao_vegetable/order.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index cb8ee20da..9616e04d4 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "10:15:00", + "10:33:00", }) // 每分钟轮询一次,推送骑手信息 diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 18c048841..c6100fc4a 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -852,7 +852,7 @@ func UpdateStoreSku(storeId int64, skuCode []string) []string { for _, v := range skuCode { param := &request587.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain587.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{ SkuCode: utils.String2Pointer(v), - StoreId: utils.String2Pointer(fmt.Sprintf("JX%s", v)), + StoreId: utils.String2Pointer(fmt.Sprintf("JX%d", storeId)), ChannelCode: utils.String2Pointer("31"), OnlineSaleFlag: utils.Int64ToPointer(0), }} From 35876c3108c8ba0da71ff18bf874f53a6e9373e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 10:33:27 +0800 Subject: [PATCH 08/21] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 9616e04d4..f045497ab 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "10:33:00", + "10:35:00", }) // 每分钟轮询一次,推送骑手信息 From ba2982e6fc09cd3c84117c76738954453eb6e746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 13:36:36 +0800 Subject: [PATCH 09/21] 1 --- business/jxcallback/orderman/order.go | 15 ++++++++++---- business/partner/purchase/mtwm/order.go | 1 - .../partner/purchase/tao_vegetable/order.go | 20 +++++++++++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 23e496651..69fcbabd2 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2737,10 +2737,10 @@ func UpdateTaoSettleInfo() { } var storeList = []int64{ - 669053, - 103074, - 668985, - 103065, + //669053, + //103074, + //668985, + //103065, 668960, 668959, 668953, @@ -2876,4 +2876,11 @@ func UpdateTaoSkuUpdateOffShelf() { 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)) + // } + //} } diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 02a04b01a..7606501d9 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -517,7 +517,6 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo isSelfDelivery = model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order) if !isSelfDelivery { if globals.EnableMtwmStoreWrite { - // err = api.MtwmAPI.OrderConfirm(utils.Str2Int64(order.VendorOrderID)) err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID)) } } diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index c6100fc4a..4622259c2 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -845,6 +845,7 @@ func (c *PurchaseHandler) GetOrderSettleAccounts(order *model.GoodsOrder) (int64 return 0, nil } +// 下架 func UpdateStoreSku(storeId int64, skuCode []string) []string { api := getAPI("34402634", 0, "") @@ -863,6 +864,25 @@ func UpdateStoreSku(storeId int64, skuCode []string) []string { return result } +// 上架 +func UpdateStoreSkuGrounding(storeId int64, skuCode []string) []string { + api := getAPI("34402634", 0, "") + + result := make([]string, 0, 0) + for _, v := range skuCode { + param := &request587.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain587.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{ + SkuCode: utils.String2Pointer(v), + StoreId: utils.String2Pointer(fmt.Sprintf("JX%d", storeId)), + ChannelCode: utils.String2Pointer("31"), + OnlineSaleFlag: utils.Int64ToPointer(1), + }} + if err := api.StoreSkuUpdateOffShelf(param); err != nil { + result = append(result, fmt.Sprintf(" [storeId:%d,skuCode:%s]"+err.Error(), storeId, v)) + } + } + return result +} + // GetOrderTotalShopMoney 获取门店结算信息 func GetOrderTotalShopMoney(appOrgCode string, vendorStoreID string, start, end time.Time) (map[string]string, error) { if appOrgCode == "" || vendorStoreID == "" { From acc77a3cf86814fadf89b2bad4c9ae8064dc24d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 13:36:58 +0800 Subject: [PATCH 10/21] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index f045497ab..5728922ee 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "10:35:00", + "13:40:00", }) // 每分钟轮询一次,推送骑手信息 From 59353d3257a0d90b8799ca0c1a6b855a517b939f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 13:55:42 +0800 Subject: [PATCH 11/21] 1 --- business/jxcallback/orderman/order.go | 1 + business/jxstore/misc/misc.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 69fcbabd2..9df74c393 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2870,6 +2870,7 @@ func UpdateTaoSkuUpdateOffShelf() { //skuCodeList := dao.GetStoreSkuBindList(dao.GetDB(), 100102) for _, storeId := range storeList { + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "开始下架:", utils.Int64ToStr(storeId)) storeSkuMap := dao.GetStoreSkuBindList(dao.GetDB(), storeId) resultErr := tao.UpdateStoreSku(storeId, storeSkuMap) if len(resultErr) > 0 { diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 5728922ee..8d1a0e4c4 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "13:40:00", + "14:00:00", }) // 每分钟轮询一次,推送骑手信息 From 8d3e3158e14387bce5ea64be02494b507bf65327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 14:32:33 +0800 Subject: [PATCH 12/21] 1 --- business/jxcallback/orderman/order.go | 6 +++--- business/jxstore/misc/misc.go | 2 +- business/partner/purchase/tao_vegetable/order.go | 15 +-------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 9df74c393..a8371a5a3 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2741,9 +2741,9 @@ var storeList = []int64{ //103074, //668985, //103065, - 668960, - 668959, - 668953, + //668960, + //668959, + //668953, 103029, 668949, 103002, diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 8d1a0e4c4..a62e661b9 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "14:00:00", + "14:35:00", }) // 每分钟轮询一次,推送骑手信息 diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 4622259c2..b9757e4db 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -848,20 +848,7 @@ func (c *PurchaseHandler) GetOrderSettleAccounts(order *model.GoodsOrder) (int64 // 下架 func UpdateStoreSku(storeId int64, skuCode []string) []string { api := getAPI("34402634", 0, "") - - result := make([]string, 0, 0) - for _, v := range skuCode { - param := &request587.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain587.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{ - SkuCode: utils.String2Pointer(v), - StoreId: utils.String2Pointer(fmt.Sprintf("JX%d", storeId)), - ChannelCode: utils.String2Pointer("31"), - OnlineSaleFlag: utils.Int64ToPointer(0), - }} - if err := api.StoreSkuUpdateOffShelf(param); err != nil { - result = append(result, fmt.Sprintf(" [storeId:%d,skuCode:%s]"+err.Error(), storeId, v)) - } - } - return result + return api.StoreSkuUpdateOffShelfList(storeId, skuCode) } // 上架 From d852587123e5e86251dd2e7cba133a292ec0f5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 15:18:08 +0800 Subject: [PATCH 13/21] 1 --- business/jxcallback/orderman/order.go | 14 +++++++------- business/jxstore/misc/misc.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index a8371a5a3..b5ed21135 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2744,13 +2744,13 @@ var storeList = []int64{ //668960, //668959, //668953, - 103029, - 668949, - 103002, - 102999, - 668932, - 668931, - 668917, + //103029, + //668949, + //103002, + //102999, + //668932, + //668931, + //668917, 102969, 102966, 668909, diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index a62e661b9..d08de3f22 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "14:35:00", + "15:20:00", }) // 每分钟轮询一次,推送骑手信息 From 54316a7293a4ad8bd24649f35dcdd34b021637df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 15:37:13 +0800 Subject: [PATCH 14/21] 1 --- business/jxcallback/orderman/order.go | 2 +- business/jxstore/misc/misc.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index b5ed21135..8a60c12c5 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2751,7 +2751,7 @@ var storeList = []int64{ //668932, //668931, //668917, - 102969, + //102969, 102966, 668909, 668908, diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index d08de3f22..d9723d3ad 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,9 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "15:20:00", + "15:42:00", + "16:42:00", + "17:42:00", }) // 每分钟轮询一次,推送骑手信息 From e9db0d7633aaf916ca7fe450377bba8c86c06d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 15:57:08 +0800 Subject: [PATCH 15/21] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index d9723d3ad..11b9beea8 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "15:42:00", + "16:00:00", "16:42:00", "17:42:00", }) From b644ff7df8474065023177dba46fbebab9df7130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 16:37:43 +0800 Subject: [PATCH 16/21] 1 --- business/jxcallback/orderman/order.go | 6 +++--- business/jxstore/misc/misc.go | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 8a60c12c5..fa2ecbc23 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2752,9 +2752,9 @@ var storeList = []int64{ //668931, //668917, //102969, - 102966, - 668909, - 668908, + //102966, + //668909, + //668908, 668905, 668901, 102946, diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 11b9beea8..89de6af15 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,6 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "16:00:00", "16:42:00", "17:42:00", }) From af4f6f5d899a22f184e61e66a8bf4b0a3fcc45a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 17:50:11 +0800 Subject: [PATCH 17/21] 1 --- business/jxcallback/orderman/order.go | 8 ++++---- business/jxstore/misc/misc.go | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index fa2ecbc23..59e2e56fa 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2755,10 +2755,10 @@ var storeList = []int64{ //102966, //668909, //668908, - 668905, - 668901, - 102946, - 102939, + //668905, + //668901, + //102946, + //102939, 102938, 668894, 102934, diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 89de6af15..1156f65a8 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,8 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "16:42:00", - "17:42:00", + "17:52:00", }) // 每分钟轮询一次,推送骑手信息 From d19a45720bd93c485dcb7729de9590aa91121c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 17:53:05 +0800 Subject: [PATCH 18/21] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 1156f65a8..6d5f3d864 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "17:52:00", + "17:55:00", }) // 每分钟轮询一次,推送骑手信息 From 9684b338129cea97255a4d9783023c86290d172b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 20:10:27 +0800 Subject: [PATCH 19/21] 1 --- business/jxcallback/orderman/order.go | 21 ++++++++++++++------- business/jxstore/misc/misc.go | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 59e2e56fa..b15d26f38 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2759,10 +2759,10 @@ var storeList = []int64{ //668901, //102946, //102939, - 102938, - 668894, - 102934, - 102933, + //102938, + //668894, + //102934, + //102933, 102930, 668884, 668878, @@ -2866,17 +2866,24 @@ var storeList = []int64{ } func UpdateTaoSkuUpdateOffShelf() { - // 标准模板店 - //skuCodeList := dao.GetStoreSkuBindList(dao.GetDB(), 100102) - for _, storeId := range storeList { + taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + storeId := batchItemList[0].(int64) 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)) } + return retVal, err } + task := tasksch.NewParallelTask("下架门店商品", tasksch.NewParallelConfig().SetParallelCount(2), jxcontext.AdminCtx, taskFunc, storeList) + tasksch.HandleTask(task, nil, true).Run() + if _, err := task.GetResult(0); err != nil { + baseapi.SugarLogger.Debugf("LoadingStoreOrderSettleAmount :%v", err) + } + // 标准模板店 + //skuCodeList := dao.GetStoreSkuBindList(dao.GetDB(), 100102) //for _,storeId := range storeList { // resultErr := tao.UpdateStoreSkuGrounding(storeId, skuCodeList) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 6d5f3d864..deddaa369 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "17:55:00", + "20:15:00", }) // 每分钟轮询一次,推送骑手信息 From 095fcf2ddecfdc21d83359bd34cb287b1edecf53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 1 Aug 2023 21:10:17 +0800 Subject: [PATCH 20/21] 1 --- business/jxcallback/orderman/order.go | 15 ++++----------- business/jxstore/misc/misc.go | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index b15d26f38..6af92037f 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2764,7 +2764,7 @@ var storeList = []int64{ //102934, //102933, 102930, - 668884, + //668884, 668878, 102903, 668757, @@ -2866,24 +2866,17 @@ var storeList = []int64{ } func UpdateTaoSkuUpdateOffShelf() { + // 标准模板店 + //skuCodeList := dao.GetStoreSkuBindList(dao.GetDB(), 100102) - taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - storeId := batchItemList[0].(int64) + for _, storeId := range storeList { 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)) } - return retVal, err } - task := tasksch.NewParallelTask("下架门店商品", tasksch.NewParallelConfig().SetParallelCount(2), jxcontext.AdminCtx, taskFunc, storeList) - tasksch.HandleTask(task, nil, true).Run() - if _, err := task.GetResult(0); err != nil { - baseapi.SugarLogger.Debugf("LoadingStoreOrderSettleAmount :%v", err) - } - // 标准模板店 - //skuCodeList := dao.GetStoreSkuBindList(dao.GetDB(), 100102) //for _,storeId := range storeList { // resultErr := tao.UpdateStoreSkuGrounding(storeId, skuCodeList) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index deddaa369..ad463aa8b 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "20:15:00", + "21:15:00", }) // 每分钟轮询一次,推送骑手信息 From 6ea1983c6370e294f325920b58662e36ed9a00bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 2 Aug 2023 09:08:30 +0800 Subject: [PATCH 21/21] 1 --- business/jxcallback/orderman/order.go | 34 +++++++++++++-------------- business/jxstore/misc/misc.go | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 6af92037f..b93c7b53b 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2763,24 +2763,24 @@ var storeList = []int64{ //668894, //102934, //102933, - 102930, + //102930, //668884, - 668878, - 102903, - 668757, - 102293, - 668622, - 668618, - 668592, - 100945, - 668583, - 100943, - 100935, - 100905, - 668498, - 668476, - 668462, - 100309, + //668878, + //102903, + //668757, + //102293, + //668622, + //668618, + //668592, + //100945, + //668583, + //100943, + //100935, + //100905, + //668498, + //668476, + //668462, + //100309, 100299, 100292, 668276, diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index ad463aa8b..7524ed4fc 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -213,7 +213,7 @@ func Init() { ScheduleTimerFunc("UpdateTaoSkuUpdateOffShelf", func() { orderman.UpdateTaoSkuUpdateOffShelf() }, []string{ - "21:15:00", + "09:13:00", }) // 每分钟轮询一次,推送骑手信息