liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-09-02 15:43:45 +08:00
parent 6ab49beafe
commit 34810bb630
4 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
business/partner/delivery/rider.go
View File

@@ -581,7 +581,7 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er
var (
db = dao.GetDB()
now = time.Now()
from = time.Date(now.Year(), now.Month(), now.Day()-4, 0, 0, 0, 0, time.Local).Unix()
from = time.Date(now.Year(), now.Month(), now.Day()-1, 0, 0, 0, 0, time.Local).Unix()
to = time.Date(now.Year(), now.Month(), now.Day()-1, 23, 59, 59, 59, time.Local).Unix()
)
@@ -604,7 +604,11 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er
Offset: 0,
Limit: 200,
}
storeOrder, settleId, err := mtwm.GetAPI(storeListValue.VendorOrgCode, storeListValue.StoreID, storeListValue.VendorStoreID).GetStoreBillList(billListParam)
globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount")
storeOrder, fineList, settleId, err := mtwm.GetAPI(storeListValue.VendorOrgCode, storeListValue.StoreID, storeListValue.VendorStoreID).GetStoreBillList(billListParam)
globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount storeOrder := %s ", utils.Format4Output(storeOrder, false))
globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount fineList := %s ", utils.Format4Output(fineList, false))
globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount err := %v ", err)
if err != nil {
globals.SugarLogger.Debugf("GetStoreBillList err : %v", err)
return nil, err
@@ -653,6 +657,24 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er
//}
}
if fineList != nil && len(fineList) > 0 {
fine := make([]*model.StoreFine, 0, len(fineList))
for _, f := range fineList {
fine = append(fine, &model.StoreFine{
ID: 0,
CreatedAt: time.Now(),
StoreID: storeListValue.StoreID,
VendorID: storeListValue.VendorID,
SettleAmount: f.SettleAmount,
BillType: f.BillChargeType,
BillDesc: f.ChargeFeeDesc,
BillId: f.Id,
FinishTime: utils.Str2Time(f.FinishTime),
})
}
err = dao.CreateMultiEntities(db, fine)
globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount CreateMultiEntities err := %v ", err)
}
return retVal, err
}
task := tasksch.NewParallelTask("更新美团订单配送费/保险费/结算信息", tasksch.NewParallelConfig().SetParallelCount(4), jxcontext.AdminCtx, taskFunc, storeMapList)