Merge remote-tracking branch 'origin/feature/v4.7.55' into feature/v4.7.55

src/jfw/modules/subscribepay/src/service/orderListDetails.go

@@ -1028,30 +1028,31 @@ func getOrderSql(userId, fromPage, typ string) (string, string) {
         sqlC := fmt.Sprintf(`select count(1) from dataexport_order
 		where del_status=0 and audit_status=3 AND ((is_backstage_order =0 AND user_id ='%s')`, userId)
 
-        if fromPage == "wx" {
-                sql += `AND product_type !="企业商机管理"` //微信暂无企业商机管理
-        }
-        // 0全部 1未支付 2已支付 3已取消
-        //拼接sql
-        switch typ {
-        case "0", "":
-                s := fmt.Sprintf(` or (order_status =1 AND is_backstage_order=1 and user_id ='%s')  `, userId)
-                sql += s
-                sqlC += s
-        case "1":
-                s := ` AND order_status = 0`
-                sql += s
-                sqlC += s
-        case "2":
-                s := fmt.Sprintf(`AND order_status = 1 or (order_status =1 AND is_backstage_order=1 and user_id ='%s')  `, userId)
-                sql += s
-                sqlC += s
-        case "3":
-                s := ` AND order_status in(-2,-3)`
-                sql += s
-                sqlC += s
-        }
-        sql += " ) order by create_time desc"
-
+	if fromPage == "wx" {
+		sql += `AND product_type !="企业商机管理"` //微信暂无企业商机管理
+	}
+	// 0全部 1未支付 2已支付 3已取消
+	//拼接sql
+	switch typ {
+	case "0", "":
+		s := fmt.Sprintf(` or (order_status =1 AND is_backstage_order=1 and user_id ='%s')  `, userId)
+		sql += s
+		sqlC += s
+	case "1":
+		s := ` AND order_status = 0`
+		sql += s
+		sqlC += s
+	case "2":
+		s := fmt.Sprintf(`AND order_status = 1 or (order_status =1 AND is_backstage_order=1 and user_id ='%s')  `, userId)
+		sql += s
+		sqlC += s
+	case "3":
+		s := ` AND order_status in(-2,-3)`
+		sql += s
+		sqlC += s
+	}
+	sql += " ) order by create_time desc"
+	sqlC += " ) order by create_time desc"
+        
         return sql, sqlC
 }