From 65ed4e97e09cf27782e8afc5f3151fe9e31902b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 29 Dec 2023 15:38:23 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order.go | 3 +++ controllers/jx_order.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 5697d08ff..51cebb981 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2727,6 +2727,9 @@ func UpdateTiktokShopTotalMoney(storeId int64, startTime, endTime time.Time) err continue } } + if len(errList) == model.NO { + return nil + } return fmt.Errorf(strings.Join(errList, "|")) } diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 600558146..8a3370ad7 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -1439,6 +1439,6 @@ func (c *OrderController) GetRiderLng() { func (c *OrderController) UpdateTiktokSettlement() { c.callUpdateTiktokSettlement(func(params *tOrderUpdateTiktokSettlementParams) (retVal interface{}, errCode string, err error) { err = orderman.UpdateTiktokShopTotalMoney(int64(params.StoreId), utils.Str2Time(params.StartTime), utils.Str2Time(params.EndTime)) - return 0, "", err + return retVal, errCode, err }) }