处理“GetQuoteMenu”BUG

config/config.xml

@@ -16,12 +16,12 @@
         <DbAddress value="192.168.31.117"/>
         <DbName    value="orcl"/>
         <DbPort    value="1521"/>
-        <DbUser    value="mtp2_test181"/>
+        <DbUser    value="mtp2_test82"/>
         <DbPwd     value="muchinfo"/>
     </DbSetting>
 
     <RedisSetting>
-        <Address   value="192.168.31.181"/>
+        <Address   value="192.168.30.182"/>
         <Port      value="5007"/>
         <Timeout   value="3"/>
         <ConnNum   value="1"/>

controllers/common/notice.go

@@ -7,7 +7,6 @@ import (
 	"mtp2_if/global/app"
 	"mtp2_if/global/e"
 	"mtp2_if/logger"
-	"mtp2_if/models"
 	"mtp2_if/utils"
 	"net/http"
 	"sort"
@@ -37,7 +36,7 @@ type QueryNoticeRsp struct {
 // @Param pagesize query int false "每页条数"
 // @Param loginID query int true "登录账号"
 // @Param msgType query int false "消息类型 - 1:公告通知 2:系统消息"
-// @Param onlyUnRead query bool false "是否未读信息"
+// @Param onlyUnRead query bool false "是否只获取未读信息"
 // @Success 200 {object} QueryNoticeRsp
 // @Failure 500 {object} app.Response
 // @Router /Common/QueryNotice [get]
@@ -56,7 +55,7 @@ func QueryNotice(c *gin.Context) {
 	rst := make([]QueryNoticeRsp, 0)
 	engine := db.GetEngine()
 	// 获取登录账号所属会员信息
-	var userAccount models.Useraccount
+	var userAccount dbmodels.Useraccount
 	if has, _ := engine.Join("LEFT", "LOGINACCOUNT", "LOGINACCOUNT.USERID = USERACCOUNT.USERID").
 		Where("LOGINACCOUNT.LOGINID = ?", req.LoginID).Get(&userAccount); !has {
 		// 查询失败
@@ -197,7 +196,7 @@ func NoticeReaded(c *gin.Context) {
 
 	engine := db.GetEngine()
 	// 获取登录账号所属会员信息
-	var userAccount models.Useraccount
+	var userAccount dbmodels.Useraccount
 	if has, _ := engine.Join("LEFT", "LOGINACCOUNT", "LOGINACCOUNT.USERID = USERACCOUNT.USERID").
 		Where("LOGINACCOUNT.LOGINID = ?", req.LoginID).Get(&userAccount); !has {
 		// 查询失败
@@ -207,7 +206,7 @@ func NoticeReaded(c *gin.Context) {
 	}
 
 	// 尝试获取指定已读数据
-	msgReceiver := &models.Msgreceiver{Autoid: int32(req.NoticeID), Managerid: userAccount.Userid, Receivertype: 2}
+	msgReceiver := &dbmodels.Msgreceiver{Autoid: int32(req.NoticeID), Managerid: userAccount.Userid, Receivertype: 2}
 	has, err := engine.Get(msgReceiver)
 	if err != nil {
 		// 执行失败
@@ -226,7 +225,7 @@ func NoticeReaded(c *gin.Context) {
 		}
 	} else {
 		// 找不到记录则新建一条
-		m := new(models.Msgreceiver)
+		m := new(dbmodels.Msgreceiver)
 		m.Autoid = int32(req.NoticeID)
 		m.Managerid = userAccount.Userid
 		m.Readstatus = 2

controllers/taaccount/taaccount.go

@@ -3,10 +3,10 @@ package taaccount
 import (
 	"fmt"
 	"mtp2_if/db"
+	"mtp2_if/dbmodels"
 	"mtp2_if/global/app"
 	"mtp2_if/global/e"
 	"mtp2_if/logger"
-	"mtp2_if/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -21,7 +21,7 @@ type QueryAmountLogReq struct {
 
 // QueryAmountLogRsp 资金流水查询（当前）返回模型
 type QueryAmountLogRsp struct {
-	models.Taaccountlog `xorm:"extends"`
+	dbmodels.Taaccountlog `xorm:"extends"`
 
 	MarketName      string `json:"marketname"  xorm:"'MARKETNAME'"`        // 市场名称
 	TradeMode       uint32 `json:"trademode"  xorm:"'TRADEMODE'"`          // 交易模式
@@ -123,7 +123,7 @@ type QueryHisAmountLogReq struct {
 
 // QueryHisAmountLogRsp 资金流水查询（历史）返回模型
 type QueryHisAmountLogRsp struct {
-	models.Histaaccountlog `xorm:"extends"`
+	dbmodels.Histaaccountlog `xorm:"extends"`
 
 	MarketName      string `json:"marketname"  xorm:"'MARKETNAME'"`        // 市场名称
 	TradeMode       uint32 `json:"trademode"  xorm:"'TRADEMODE'"`          // 交易模式

models/commonModels.go

@@ -7,7 +7,6 @@ import (
 	"mtp2_if/dbmodels"
 	"mtp2_if/global/utils"
 	"strconv"
-	"strings"
 )
 
 // QuotePrimaryMenu 报价牌一级分类菜单
@@ -111,11 +110,11 @@ func GetQuoteMenu(loginID int) ([]QuotePrimaryMenu, error) {
 
 		// 获取资金账户对应的市场权限（有权限的市场ID）
 		if len(taAccounts) > 0 {
-			taAccountStr := strings.Join(taAccounts, ",")
+			// taAccountStr := strings.Join(taAccounts, ",")
 			if err := engine.Table("TAACCOUNTMARKET").
 				Join("INNER", "MARKET", "MARKET.MARKETID = TAACCOUNTMARKET.MARKETID").
 				Cols("TAACCOUNTMARKET.MARKETID").
-				In("TAACCOUNTMARKET.ACCOUNTID", taAccountStr).
+				In("TAACCOUNTMARKET.ACCOUNTID", taAccounts).
 				And("MARKET.MARKETSTATUS = 2").Find(&marketIDs); err != nil {
 				return nil, err
 			}
@@ -309,7 +308,8 @@ func GetClientTableColumns(tableKey string) ([]dbmodels.Tablecolumnconfig, error
 
 // GetNotices 获取指定账户的通知信息（终端）
 // @param loginID int 登录账号
-// @param
+// @param msgType int 消息类型 - 1:公告通知 2:系统消息
+// @param onlyUnRead bool 是否只获取未读信息
 func GetNotices(loginID, msgType int, onlyUnRead bool) ([]dbmodels.Noticemsg, error) {
 	engine := db.GetEngine()
 
@@ -360,7 +360,7 @@ func GetNotices(loginID, msgType int, onlyUnRead bool) ([]dbmodels.Noticemsg, er
 
 	// 查询SENDTYPE = 3的数据
 	datas3 := make([]dbmodels.Noticemsg, 0)
-	s = engine.Where(fmt.Sprintf(`USERID = (SELECT USERID FROM LOGINACCOUNT WHERE LOGINID = %d)`, req.LoginID)).
+	s = engine.Where(fmt.Sprintf(`USERID = (SELECT USERID FROM LOGINACCOUNT WHERE LOGINID = %d)`, loginID)).
 		And("SENDTYPE = 3 and SYSDATE > SCHEDULETIME and SYSDATE < ENDTIME and SENTSTATUS=1")
 	if msgType > 0 {
 		s = s.And("MSGTYPE = ?", msgType)