diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 41d2b8e59..ab24053ae 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -1820,9 +1820,14 @@ func GetOrderStoreIDs(db *DaoDB, beginAt, endAt time.Time, vendorID int) (storeI return storeIDs, err } -// 根据门店id获取正在刷单的门店商品 -//func GetOrderListByStoreList(db *DaoDB, storeId []int64) (order []*model.GoodsOrder, err error) { -// sql := ` -// S -//` -//} +// GetOrderListByStoreList 根据门店id获取正在刷单的门店商品 +func GetOrderListByStoreList(db *DaoDB, storeId []int64) (order []*model.GoodsOrder, err error) { + sql := `SELECT * FROM goods_order g WHERE g.order_created_at >= ? AND g.order_created_at <= ? g.vendor_store_id IN (` + GenQuestionMarks(len(storeId)) + `)` + `AND g.vendor_id = ? AND g.status < ?` + sqlParam := []interface{}{time.Now().AddDate(0, 0, -7), time.Now(), storeId, model.VendorIDDD, model.OrderStatusDelivering} + + if err := GetRows(db, &order, sql, sqlParam...); err != nil { + return nil, err + } + + return order, nil +} diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 6bdabefb8..c31533239 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -338,6 +338,19 @@ func UpdateFakeWayBillToTiktok() { // } // // // 获取刷单门店订单 -// dao.GetOrders() +// orderList, err := dao.GetOrderListByStoreList(db, utils.StringSlice2Int64(strings.Split(configList[0].Value, ","))) +// if err != nil { +// globals.SugarLogger.Errorf("获取门店刷单记录错误") +// return +// } +// +// for _, v := range orderList { +// jxutils.CallMsgHandler(func() { +// // 获取骑手信息 +// +// // 自动发单 +// err = defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName(), params.CourierName, params.CourierMobile) +// }, jxutils.ComposeUniversalOrderID(v.VendorOrderID, model.VendorIDDD)) +// } // //} diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index d700153b7..d3e524c0b 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -469,8 +469,6 @@ func makeMainProductSku(db *dao.DaoDB, api *tiktokShop.API, storeSku *dao.StoreS // 获取商品的属性 if storeSku.TiktokAttribute != "" && storeSku.TiktokAttribute != "{}" { param.ProductFormatNew = storeSku.TiktokAttribute - } else if storeSku.VendorSkuAttrId != "" && storeSku.VendorSkuAttrId != "{}" { - param.ProductFormatNew = storeSku.TiktokAttribute } else { param.ProductFormatNew, param.StandardBrandId, err = MakeProductFormatNew(api, int64(storeSku.NameID), param.CategoryLeafId, storeSku.Upc, storeSku.UpcBrandName, storeSku.UpcTiktokBrandId) //param.ProductFormatNew, err = MakeProductFormatNew(api, int64(storeSku.NameID), param.CategoryLeafId)