diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go index dbb58cae3..6cc91da54 100644 --- a/business/jxcallback/orderman/order_afs.go +++ b/business/jxcallback/orderman/order_afs.go @@ -295,6 +295,7 @@ func (c *OrderManager) updateAfsOrderSkuOtherInfo(db *dao.DaoDB, order *model.Af globals.SugarLogger.Infof("updateAfsOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格(或商品映射),orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNumStr, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v) } else { v.JxSkuID = skuBindInfo.SkuID + v.ShopPrice = int64(skuBindInfo.Price) } } if actStoreSkuMap != nil { diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 619aadff8..8e3c1cbf5 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1609,29 +1609,27 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // continue // } // } - storeSkus, err := dao.GetStoresSkusInfo(dao.GetDB(), nil, nil) + var orders []*model.GoodsOrder + sql := ` + SELECT * FROM goods_order + WHERE order_created_at > '2020-06-10 12:20:00' AND vendor_id <> 5 + AND vendor_order_id = '88033321555614726' + ` + dao.GetRows(dao.GetDB(), &orders, sql, nil) task := tasksch.NewParallelTask("刷新门店价格", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - v := batchItemList[0].(*model.StoreSkuBind) - skus, _ := dao.GetSkus(dao.GetDB(), []int{v.SkuID}, nil, nil, nil, nil) - if len(skus) > 0 { - sku := skus[0] - if v.Price == v.UnitPrice { - if sku.Unit == model.UnitNames[0] { - if sku.SpecUnit == model.SpecUnitNames[1] || sku.SpecUnit == model.SpecUnitNames[2] { - v.Price = utils.Float64TwoInt(utils.Int2Float64(v.UnitPrice) * float64(sku.SpecQuality) * 2) - } else { - v.Price = utils.Float64TwoInt(utils.Int2Float64(v.UnitPrice) * float64(sku.SpecQuality/500)) - } - v.JdsSyncStatus = v.JdsSyncStatus | 16 - v.MtwmSyncStatus = v.MtwmSyncStatus | 16 - v.EbaiSyncStatus = v.EbaiSyncStatus | 16 - dao.UpdateEntity(dao.GetDB(), v, "Price", "JdsSyncStatus", "MtwmSyncStatus", "EbaiSyncStatus") - } - } + v := batchItemList[0].(*model.GoodsOrder) + var sumPrice int64 + skus, _ := dao.GetSimpleOrderSkus(dao.GetDB(), v.VendorOrderID) + for _, vv := range skus { + sumPrice += vv.ShopPrice + } + if sumPrice != v.ShopPrice { + v.ShopPrice = sumPrice + dao.UpdateEntity(dao.GetDB(), v, "ShopPrice") } return retVal, err - }, storeSkus) + }, orders) tasksch.HandleTask(task, nil, true).Run() task.GetID() return err