From 1a4131c93803a5d197ce1195b9696b9479517908 Mon Sep 17 00:00:00 2001
From: AstarF <18842336486Q@163.com>
Date: Mon, 15 Jul 2024 14:42:48 +0800
Subject: [PATCH] fix

---
 app/http/controllers/transfersys/transfersys.go | 1 -
 app/models/merchant/merchant.go                 | 2 +-
 app/models/orders/orders.go                     | 4 ++--
 app/models/product/product.go                   | 2 +-
 app/models/whitelist/whitelist.go               | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/http/controllers/transfersys/transfersys.go b/app/http/controllers/transfersys/transfersys.go
index 8e124f6..2b904c1 100644
--- a/app/http/controllers/transfersys/transfersys.go
+++ b/app/http/controllers/transfersys/transfersys.go
@@ -42,7 +42,6 @@ func GetOrder(c *gin.Context) {
 		})
 		return
 	}
-
 	common.Success(c, response)
 }
 
diff --git a/app/models/merchant/merchant.go b/app/models/merchant/merchant.go
index 8a21db3..c9f0e1c 100644
--- a/app/models/merchant/merchant.go
+++ b/app/models/merchant/merchant.go
@@ -56,7 +56,7 @@ func GetInstance() *merchantModel {
 func (m *merchantModel) GetById(id int64) (merchant *Merchant, has bool, err error) {
 	merchant = &Merchant{}
 	has, err = m.GetDb().ID(id).Get(merchant)
-	if err == nil || !has {
+	if err != nil || !has {
 		merchant = nil
 	}
 	return
diff --git a/app/models/orders/orders.go b/app/models/orders/orders.go
index 02106a3..0d0cfbe 100644
--- a/app/models/orders/orders.go
+++ b/app/models/orders/orders.go
@@ -72,7 +72,7 @@ func GetInstance() *ordersModel {
 func (m *ordersModel) GetById(id int64) (orders *Orders, has bool, err error) {
 	orders = &Orders{}
 	has, err = m.GetDb().ID(id).Get(orders)
-	if err == nil || !has {
+	if err != nil || !has {
 		orders = nil
 	}
 	return
@@ -81,7 +81,7 @@ func (m *ordersModel) GetById(id int64) (orders *Orders, has bool, err error) {
 func (m *ordersModel) GetByOutTradeNo(out_trade_no string, merchant_id int64) (orders *Orders, has bool, err error) {
 	orders = &Orders{}
 	has, err = m.GetDb().Where("out_trade_no = ? and merchant_id = ?", out_trade_no, merchant_id).Get(orders)
-	if err == nil || !has {
+	if err != nil || !has {
 		orders = nil
 	}
 	return
diff --git a/app/models/product/product.go b/app/models/product/product.go
index de99c39..58c458b 100644
--- a/app/models/product/product.go
+++ b/app/models/product/product.go
@@ -56,7 +56,7 @@ func GetInstance() *productModel {
 func (m *productModel) GetById(id int64) (product *Product, has bool, err error) {
 	product = &Product{}
 	has, err = m.GetDb().ID(id).Get(product)
-	if err == nil || !has {
+	if err != nil || !has {
 		product = nil
 	}
 	return
diff --git a/app/models/whitelist/whitelist.go b/app/models/whitelist/whitelist.go
index 316290e..b617c2e 100644
--- a/app/models/whitelist/whitelist.go
+++ b/app/models/whitelist/whitelist.go
@@ -56,7 +56,7 @@ func GetInstance() *whitelistModel {
 func (m *whitelistModel) GetById(id int64) (whitelist *Whitelist, has bool, err error) {
 	whitelist = &Whitelist{}
 	has, err = m.GetDb().ID(id).Get(whitelist)
-	if err == nil || !has {
+	if err != nil || !has {
 		whitelist = nil
 	}
 	return
@@ -65,7 +65,7 @@ func (m *whitelistModel) GetById(id int64) (whitelist *Whitelist, has bool, err
 func (m *whitelistModel) GetByIp(ip string) (whitelist *Whitelist, has bool, err error) {
 	whitelist = &Whitelist{}
 	has, err = m.GetDb().Where("ip = ?", ip).Get(whitelist)
-	if err == nil || !has {
+	if err != nil || !has {
 		whitelist = nil
 	}
 	return