From 2b5308cf0a8e5f172292188170ece291273af8ec Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Tue, 14 Nov 2023 16:20:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hdl/hdl_condition.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hdl/hdl_condition.go b/hdl/hdl_condition.go
index 8751973..a3dcf4a 100644
--- a/hdl/hdl_condition.go
+++ b/hdl/hdl_condition.go
@@ -161,7 +161,7 @@ func OwnbuySum(engine *xorm.Engine, uid interface{}, task map[string]string, t t
 	if zhios_condition_statistics_utils.InArr(task["task_type_pvd"], []string{"0", "1"}) {
 		stime := time.Date(t.Year(), t.Month(), t.Day()-zhios_condition_statistics_utils.StrToInt(task["within_days"]), t.Hour(), 0, 0, 0, t.Location()).Unix()
 		etime := t.Unix()
-		total, err = db.OrderListPaidPriceByUIDByOrderTypeByTime(engine, uid, 0, []string{"1", "2", "3", "5"}, stime, etime)
+		total, err = db.OrderListPaidPriceByUIDByOrderTypeByTime(engine, uid, 0, []string{"1", "2", "3", "5"}, stime, etime, 0)
 		if err != nil {
 			zhios_condition_statistics_logx.Warn(err)
 			return ""
@@ -176,7 +176,7 @@ func OwnbuySum(engine *xorm.Engine, uid interface{}, task map[string]string, t t
 			orderType = zhios_condition_statistics_utils.StrToInt(task["task_type_pvd"])
 		}
 		//确认收货的才算
-		mallTotal, err := db.MallOrdByTime(engine, uid, orderType, []string{"3"}, mallStime.Format("2006-01-02 15:04:05"), mallEtime.Format("2006-01-02 15:04:05"), "")
+		mallTotal, err := db.MallOrdByTime(engine, uid, orderType, []string{"3"}, mallStime.Format("2006-01-02 15:04:05"), mallEtime.Format("2006-01-02 15:04:05"), "", 0)
 		if err != nil {
 			zhios_condition_statistics_logx.Warn(err)
 			return zhios_condition_statistics_utils.Float64ToStr(total)
@@ -187,13 +187,13 @@ func OwnbuySum(engine *xorm.Engine, uid interface{}, task map[string]string, t t
 		mallStime := time.Date(t.Year(), t.Month(), t.Day()-zhios_condition_statistics_utils.StrToInt(task["within_days"]), t.Hour(), 0, 0, 0, t.Location())
 		mallEtime := t
 		//确认收货的才算
-		o2oTotal, err := db.O2oOrdByTime(engine, uid, 0, []string{"3"}, mallStime.Format("2006-01-02 15:04:05"), mallEtime.Format("2006-01-02 15:04:05"))
+		o2oTotal, err := db.O2oOrdByTime(engine, uid, 0, []string{"3"}, mallStime.Format("2006-01-02 15:04:05"), mallEtime.Format("2006-01-02 15:04:05"), 0)
 		if err != nil {
 			zhios_condition_statistics_logx.Warn(err)
 			return zhios_condition_statistics_utils.Float64ToStr(total)
 		}
 		total += o2oTotal
-		o2oTotal1, err := db.O2oOrdPayToMerchantByTime(engine, uid, 0, "1", mallStime.Format("2006-01-02 15:04:05"), mallEtime.Format("2006-01-02 15:04:05"))
+		o2oTotal1, err := db.O2oOrdPayToMerchantByTime(engine, uid, 0, "1", mallStime.Format("2006-01-02 15:04:05"), mallEtime.Format("2006-01-02 15:04:05"), 0)
 		if err != nil {
 			zhios_condition_statistics_logx.Warn(err)
 			return zhios_condition_statistics_utils.Float64ToStr(total)
@@ -204,7 +204,7 @@ func OwnbuySum(engine *xorm.Engine, uid interface{}, task map[string]string, t t
 		mallStime := time.Date(t.Year(), t.Month(), t.Day()-zhios_condition_statistics_utils.StrToInt(task["within_days"]), t.Hour(), 0, 0, 0, t.Location())
 		mallEtime := t
 		//确认收货的才算
-		b2cTotal, err := db.B2cOrdByTime(engine, uid, 0, []string{"3"}, mallStime.Format("2006-01-02 15:04:05"), mallEtime.Format("2006-01-02 15:04:05"))
+		b2cTotal, err := db.B2cOrdByTime(engine, uid, 0, []string{"3"}, mallStime.Format("2006-01-02 15:04:05"), mallEtime.Format("2006-01-02 15:04:05"), 0)
 		if err != nil {
 			zhios_condition_statistics_logx.Warn(err)
 			return zhios_condition_statistics_utils.Float64ToStr(total)