From a2226b77bde465ec17f88b4de12fb9812df95d00 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 4 Jun 2021 17:03:35 +0800
Subject: [PATCH] aa

---
 business/model/dao/dao_order.go            | 30 +++++++++++-----------
 business/partner/purchase/mtwm/callback.go |  2 ++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 73cbc293f..f41438768 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -771,7 +771,8 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 	offset = jxutils.FormalizePageOffset(offset)
 
 	sql := fmt.Sprintf(`
-	SELECT SQL_CALC_FOUND_ROWS
+	SELECT SQL_CALC_FOUND_ROWS * FROM (
+	SELECT 
 	DISTINCT t1.*,
 	CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t1.order_pay_percentage > 0, t1.order_pay_percentage, %d) / 100) AS SIGNED) earning_price,
 	t2.status waybill_status, t2.courier_name, t2.courier_mobile,
@@ -930,18 +931,6 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 			// 		sqlParams = append(sqlParams, params["deliveryType"].(string))
 			// 	}
 			// }
-			if params["jxIncomeBegin"] != nil {
-				if utils.MustInterface2Int64(params["jxIncomeBegin"]) != 0 {
-					sqlWhere += " AND jx_income >= ?"
-					sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeBegin"]))
-				}
-			}
-			if params["jxIncomeEnd"] != nil {
-				if utils.MustInterface2Int64(params["jxIncomeEnd"]) != 0 {
-					sqlWhere += " AND jx_income <= ?"
-					sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeEnd"]))
-				}
-			}
 			if params["cities"] != nil {
 				var cities []int
 				if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil {
@@ -998,9 +987,20 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 		}
 	}
 	sql += `
-		LIMIT ? OFFSET ?`
+		LIMIT ? OFFSET ?) WHERE 1 = 1`
 	sqlParams = append(sqlParams, pageSize, offset)
-
+	if params["jxIncomeBegin"] != nil {
+		if utils.MustInterface2Int64(params["jxIncomeBegin"]) != 0 {
+			sqlWhere += " AND jx_income >= ?"
+			sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeBegin"]))
+		}
+	}
+	if params["jxIncomeEnd"] != nil {
+		if utils.MustInterface2Int64(params["jxIncomeEnd"]) != 0 {
+			sqlWhere += " AND jx_income <= ?"
+			sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeEnd"]))
+		}
+	}
 	txDB, _ := Begin(db)
 	defer Commit(db, txDB)
 	fmt.Println(sql)
diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go
index 8d22c47f9..140e8e1d3 100644
--- a/business/partner/purchase/mtwm/callback.go
+++ b/business/partner/purchase/mtwm/callback.go
@@ -12,6 +12,8 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse
 			response = CurPurchaseHandler.onStoreStatusChanged(msg)
 		} else if msg.Cmd == mtwmapi.MsgTypePrivateNumberDowngrade {
 			response = CurPurchaseHandler.onNumberDowngrade(msg)
+		} else if msg.Cmd == mtwmapi.MsgTypeStoreBind {
+
 		} else {
 			if orderID := GetOrderIDFromMsg(msg); orderID != "" {
 				jxutils.CallMsgHandler(func() {