From dc523889f391f93e5f2ca90362bf93217e56b5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 10 Mar 2021 14:40:38 +0800 Subject: [PATCH] aa --- business/jxcallback/orderman/orderman_ext.go | 6 +++--- business/jxstore/report/report.go | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index d39985436..bb1dc0b45 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1420,12 +1420,12 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord stores, _ := dao.GetStoreList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, nil, nil, nil, "") if len(stores) > 0 { store := stores[0] - if order.NewEarningPrice == 0 { - jxutils.RefreshOrderEarningPrice2(order, store.PayPercentage) - } if order.TotalShopMoney == 0 { order.TotalShopMoney = utils.Float64TwoInt64(v.DueAmount * 100) } + if order.NewEarningPrice == 0 { + jxutils.RefreshOrderEarningPrice2(order, store.PayPercentage) + } dao.UpdateEntity(db, order, "TotalShopMoney", "NewEarningPrice") } } diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index 678313725..ae1f1fffe 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -415,6 +415,7 @@ func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, f fromTimeT, toTimeT = utils.Str2Time(fromTime), utils.Str2Time(toTime) dayCount = int(fromTimeT.Sub(toTimeT).Hours())/24 + 1 //查的几天 ) + fmt.Println("storeIDs1111111111111111111111111111111111", storeIDs) //权限 if permission.IsRoled(ctx) { if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {