From 7dcd76f9d028e54084f99b77c9d08250d8e350a5 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Wed, 27 Jul 2022 10:59:08 +0800
Subject: [PATCH] =?UTF-8?q?add=20reverse:for=20v1.0.2=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/hdl/hdl_condition.go b/hdl/hdl_condition.go
index eea5364..f56c3cc 100644
--- a/hdl/hdl_condition.go
+++ b/hdl/hdl_condition.go
@@ -16,7 +16,7 @@ func OwnBuyTotal(engine *xorm.Engine, uid interface{}, task map[string]string, t
 	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.OrderListCountByUIDByOrderTypeByTime(engine, uid, 0, "3,5", stime, etime)
+	total, err := db.OrderListCountByUIDByOrderTypeByTime(engine, uid, 0, "2,3,5", stime, etime)
 	if err != nil {
 		zhios_condition_statistics_logx.Warn(err)
 		return ""
@@ -39,7 +39,7 @@ func SettleOrderSum(engine *xorm.Engine, uid interface{}, task map[string]string
 	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()
 	// 用户分佣的订单
-	idAmountMap, err := db.OrderRelateListByTimeByState(engine, uid, "3,5", stime, etime)
+	idAmountMap, err := db.OrderRelateListByTimeByState(engine, uid, "2,3,5", stime, etime)
 	if err != nil {
 		zhios_condition_statistics_logx.Warn(err)
 		return ""
@@ -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, "3,5", stime, etime)
+		total, err = db.OrderListPaidPriceByUIDByOrderTypeByTime(engine, uid, 0, "2,3,5", stime, etime)
 		if err != nil {
 			zhios_condition_statistics_logx.Warn(err)
 			return ""
@@ -265,7 +265,7 @@ WHERE olr.uid = ?
 FROM ord_list_relate olr
          JOIN ord_list ol ON olr.oid = ol.ord_id
 WHERE olr.uid = ?
-  AND ol.state in(3,5)  and olr.level>0;
+  AND ol.state in(2,3,5)  and olr.level>0;
 `
 		guideResult, err := db.QueryNativeString(engine, guideSqlTpl, uid)
 		if err == nil {