diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 1ef610fbf..1abc3a48d 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2217,3 +2217,90 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, sku num, err = dao.UpdateEntity(db, order, "ShopPrice", "EarningPrice") return num, err } + +func BuildFakeMatterOrder() { + var ( + db = dao.GetDB() + ) + storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJX}, []int{668188}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") + task := tasksch.NewParallelTask("RefreshOrdersPriceInfo", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(true), jxcontext.AdminCtx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + storeMap := batchItemList[0].(*model.StoreMap) + storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, storeMap.VendorID, "") + vendorOrderID := utils.Int64ToStr(jxutils.GenOrderNo()) + order := &model.GoodsOrder{ + VendorOrderID: vendorOrderID, + VendorID: model.VendorIDJX, + VendorStoreID: utils.Int2Str(model.MatterStoreID), + StoreID: model.MatterStoreID, + JxStoreID: model.MatterStoreID, + StoreName: "物料申请", + ShopPrice: 2000, + SalePrice: 2000, + Weight: 1460, + ConsigneeName: storeDetail.Name, + ConsigneeMobile: storeDetail.Tel1, + ConsigneeAddress: storeDetail.Address, + ConsigneeLng: storeDetail.Lng, + ConsigneeLat: storeDetail.Lat, + SkuCount: 1, + GoodsCount: 1, + Status: model.OrderStatusFinished, + VendorStatus: utils.Int2Str(model.OrderStatusFinished), + ExpectedDeliveredTime: time.Now().Add(-time.Hour * 12), + WaybillVendorID: 401, + OrderCreatedAt: time.Now().Add(-time.Hour * 11), + OrderFinishedAt: time.Now(), + ActualPayPrice: 501, + StatusTime: time.Now().Add(-time.Hour * 11), + BusinessType: 1, + VendorPrice: 3100, + DeliveryType: "store", + TotalShopMoney: 471, + EarningPrice: 2000, + DeliveryFlag: 1, + FromStoreID: storeDetail.ID, + EarningType: 1, + OrderType: 1, + OrderPayPercentage: 100, + } + order.CreatedAt = time.Now() + order.UpdatedAt = time.Now() + orderSku := &model.OrderSku{ + VendorOrderID: vendorOrderID, + VendorID: model.VendorIDJX, + Count: 1, + VendorSkuID: "6039382", + SkuID: 6039382, + JxSkuID: 6039382, + SkuName: "背心袋(京西菜市)1.46kg/件(100个)", + ShopPrice: 2000, + SalePrice: 1, + Weight: 1460, + OrderCreatedAt: time.Now().Add(-time.Hour * 11), + EarningPrice: 2000, + VendorPrice: 3100, + } + dao.CreateEntity(db, order) + dao.CreateEntity(db, orderSku) + statusList := []int{2, 5, 15, 20, 110} + for _, v := range statusList { + orderStatus := &model.OrderStatus{ + VendorOrderID: vendorOrderID, + VendorID: model.VendorIDJX, + OrderType: 1, + RefVendorOrderID: vendorOrderID, + RefVendorID: model.VendorIDJX, + Status: v, + VendorStatus: utils.Int2Str(v), + StatusTime: time.Now().Add(-time.Hour*11 + time.Minute*time.Duration(v)), + } + orderStatus.CreatedAt = time.Now() + orderStatus.UpdatedAt = time.Now() + dao.CreateEntity(db, orderStatus) + } + return retVal, err + }, storeMaps) + tasksch.HandleTask(task, nil, true).Run() + task.GetResult(0) +} diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 8d4f94b6e..5f1d806ca 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -283,6 +283,12 @@ func Init() { //同步商品额外前缀和水印图(打标记) cms.SyncSkuExperfixAndWatermark(jxcontext.AdminCtx) }, dailyWorkTimeList) + ScheduleTimerFunc("BuildFakeMatterOrder", func() { + orderman.BuildFakeMatterOrder() + }, []string{ + "12:00:00", + "23:00:00", + }) ScheduleTimerFunc("doDailyWork2", func() { //刷新京东会员 report.RefreshJDMembers(jxcontext.AdminCtx) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 6dc220e26..12acbaccb 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "fmt" + "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "net" "regexp" "strings" @@ -1920,21 +1921,21 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } //} //补商品 - order, _ := partner.CurOrderManager.LoadOrder("2115896023000052", model.VendorIDJD) - handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDJD) - order2, _ := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "") - if len(order.Skus) == 0 { - if len(order2.Skus) > 0 { - for _, v := range order2.Skus { - var shopPrice int64 - if storeSkus, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{order.StoreID}, []int{v.SkuID}); len(storeSkus) > 0 { - shopPrice = int64(storeSkus[0].Price) - v.ShopPrice = shopPrice - } - dao.CreateEntity(dao.GetDB(), v) - } - } - } + //order, _ := partner.CurOrderManager.LoadOrder("2115896023000052", model.VendorIDJD) + //handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDJD) + //order2, _ := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "") + //if len(order.Skus) == 0 { + // if len(order2.Skus) > 0 { + // for _, v := range order2.Skus { + // var shopPrice int64 + // if storeSkus, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{order.StoreID}, []int{v.SkuID}); len(storeSkus) > 0 { + // shopPrice = int64(storeSkus[0].Price) + // v.ShopPrice = shopPrice + // } + // dao.CreateEntity(dao.GetDB(), v) + // } + // } + //} //var ( // storeID = 100002 // data string @@ -1949,6 +1950,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { //{"address":"成都市金牛区抚琴综合市场博力多超市旁边扶手楼梯上","cityName": "成都市","id": 100002,"name": "抚琴店-下单送盐","payeeName": "李川川","status": 1,"tel1": "13812641804","tel2": ""} //` //weixinmsg.SmartMessageTemplateSend("oYN_usv1RPvrSxCvo1WsbwI8lZa0", weixinmsg.WX_NEWORDER_TEMPLATE_ID, "", weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v&data=%v", storeID, data), nil) + orderman.BuildFakeMatterOrder() return err }