1

business/model/dao/dao_order.go

@@ -681,7 +681,7 @@ func SetUserVendorOrderStatus(tx orm.TxOrmer, localWayBillID string, status int)
 // QueryRechargeRecommend 电话充值记录查询
 func QueryRechargeRecommend(userId []string, mobile, orderId string, page, pageSize int, start, end time.Time, rechargeStatus int) ([]*model.RechargeUserModelData, int, error) {
 	result := make([]*model.RechargeUserModelData, 0, 0)
-	sql := `SELECT SQL_CALC_FOUND_ROWS o.*,u.name FROM order o `
+	sql := `SELECT SQL_CALC_FOUND_ROWS o.*,u.name FROM ` + "`order`" + ` o`
 	sqlParams := make([]interface{}, 0, 0)
 
 	sql += ` JOIN user u ON o.user_id = u.user_id WHERE 1=1 `
@@ -701,11 +701,11 @@ func QueryRechargeRecommend(userId []string, mobile, orderId string, page, pageS
 	}
 
 	if !utils.IsTimeZero(start) {
-		sql += ` AND o.created_at > ?`
+		sql += ` AND o.created_at > ? `
 		sqlParams = append(sqlParams, start)
 	}
 	if !utils.IsTimeZero(end) {
-		sql += ` AND o.created_at < ?`
+		sql += ` AND o.created_at < ? `
 		sqlParams = append(sqlParams, end)
 	}
 

business/model/order.go

@@ -45,6 +45,8 @@ const (
 	OrderTypeMemberYear   = 5 //充值会员年卡
 	OrderTypeDelivery     = 3 //发快递
 	OrderTypeDropShipping = 4 //一件代发交钱
+	OrderTypeMobile       = 7 //充话费
+	OrderTypeBalance      = 6 //余额充值
 )
 
 var (