From 601b8a5888ae7e83b832fd2d867ea9f9e65ebadf Mon Sep 17 00:00:00 2001 From: Leufolium Date: Thu, 13 Jun 2024 13:20:43 +0800 Subject: [PATCH 1/5] by Robin at 20240613 --- app/mix/service/apiservice.go | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index 44639a43..fce03e88 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -80,12 +80,14 @@ func (s *Service) ApiLoginByPswd(ctx *gin.Context, req *loginproto.ApiLoginByPsw } // 2.让已登录的用户强制下线 - if util.DerefInt64(login.IsLogined) == 1 { - if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ - Mid: account.Mid, - }); ec != errcode.ErrCodeLoginSrvOk { - logger.Error("ApiLogout failed!") - return + if account.GetRole() == consts.User { + if util.DerefInt64(login.IsLogined) == 1 { + if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ + Mid: account.Mid, + }); ec != errcode.ErrCodeLoginSrvOk { + logger.Error("ApiLogout failed!") + return + } } } @@ -155,12 +157,14 @@ func (s *Service) ApiLoginByVeriCode(ctx *gin.Context, req *loginproto.ApiLoginB } // 4.让已登录的用户强制下线 - if util.DerefInt64(login.IsLogined) == 1 { - if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ - Mid: account.Mid, - }); ec != errcode.ErrCodeLoginSrvOk { - logger.Error("ApiLogout failed!") - return + if account.GetRole() == consts.User { + if util.DerefInt64(login.IsLogined) == 1 { + if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ + Mid: account.Mid, + }); ec != errcode.ErrCodeLoginSrvOk { + logger.Error("ApiLogout failed!") + return + } } } -- 2.41.0 From b6441121fbcebe710da6221d04a0ffad2ef4e075 Mon Sep 17 00:00:00 2001 From: Leufolium Date: Thu, 13 Jun 2024 17:07:57 +0800 Subject: [PATCH 2/5] by Robin at 20240613 --- app/mix/service/apiservice.go | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index fce03e88..1aa4d3b7 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -81,13 +81,11 @@ func (s *Service) ApiLoginByPswd(ctx *gin.Context, req *loginproto.ApiLoginByPsw // 2.让已登录的用户强制下线 if account.GetRole() == consts.User { - if util.DerefInt64(login.IsLogined) == 1 { - if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ - Mid: account.Mid, - }); ec != errcode.ErrCodeLoginSrvOk { - logger.Error("ApiLogout failed!") - return - } + if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ + Mid: account.Mid, + }); ec != errcode.ErrCodeLoginSrvOk { + logger.Error("ApiLogout failed!") + return } } @@ -158,13 +156,11 @@ func (s *Service) ApiLoginByVeriCode(ctx *gin.Context, req *loginproto.ApiLoginB // 4.让已登录的用户强制下线 if account.GetRole() == consts.User { - if util.DerefInt64(login.IsLogined) == 1 { - if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ - Mid: account.Mid, - }); ec != errcode.ErrCodeLoginSrvOk { - logger.Error("ApiLogout failed!") - return - } + if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ + Mid: account.Mid, + }); ec != errcode.ErrCodeLoginSrvOk { + logger.Error("ApiLogout failed!") + return } } -- 2.41.0 From 61189f4bbe67e2ee78c17cc5ca7884a49ab38146 Mon Sep 17 00:00:00 2001 From: Leufolium Date: Thu, 13 Jun 2024 17:08:29 +0800 Subject: [PATCH 3/5] by Robin at 20240613 --- app/mix/service/service.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/mix/service/service.go b/app/mix/service/service.go index f853d2e9..af7a6b6f 100644 --- a/app/mix/service/service.go +++ b/app/mix/service/service.go @@ -559,14 +559,14 @@ func (s *Service) OpLoginByPswd(ctx *gin.Context, req *loginproto.OpLoginByPswdR } // 2.让已登录的用户强制下线 - if util.DerefInt64(login.IsLogined) == 1 { - if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{ - Mid: account.Mid, - }); ec != errcode.ErrCodeLoginSrvOk { - logger.Error("OpLogout failed!") - return - } - } + // if util.DerefInt64(login.IsLogined) == 1 { + // if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{ + // Mid: account.Mid, + // }); ec != errcode.ErrCodeLoginSrvOk { + // logger.Error("OpLogout failed!") + // return + // } + // } // 3.生成token token, err := _DefaultToken.OpGenerate(ctx, &tokenproto.OpCreateReq{ @@ -630,14 +630,14 @@ func (s *Service) OpLoginByVeriCode(ctx *gin.Context, req *loginproto.OpLoginByV } // 4.让已登录的用户强制下线 - if util.DerefInt64(login.IsLogined) == 1 { - if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{ - Mid: account.Mid, - }); ec != errcode.ErrCodeLoginSrvOk { - logger.Error("OpLogout failed!") - return - } - } + // if util.DerefInt64(login.IsLogined) == 1 { + // if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{ + // Mid: account.Mid, + // }); ec != errcode.ErrCodeLoginSrvOk { + // logger.Error("OpLogout failed!") + // return + // } + // } // 5.生成token token, err = _DefaultToken.OpGenerate(ctx, &tokenproto.OpCreateReq{ -- 2.41.0 From ff0c46302099d2c13736a15adf185235ba0f34b9 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Wed, 19 Jun 2024 21:10:46 +0800 Subject: [PATCH 4/5] fix update status --- app/mix/dao/mysql.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/mix/dao/mysql.go b/app/mix/dao/mysql.go index e065611d..b7a88c6a 100644 --- a/app/mix/dao/mysql.go +++ b/app/mix/dao/mysql.go @@ -299,12 +299,12 @@ func (m *Mysql) GetOrderCnt(ctx *gin.Context, tx *sqlx.Tx, mid, st, et int64, or // 更新订单状态 func (m *Mysql) UpdateOrderStatus(ctx *gin.Context, tx *sqlx.Tx, orderId string, preStatus, aftStatus int32) error { var err error - sqlStr := "update " + TableOrder + " set order_status=? where id=? and order_status=?" + sqlStr := "update " + TableOrder + " set order_status=?,ut=? where id=? and order_status=?" if tx != nil { - _, err = tx.ExecContext(ctx, sqlStr, aftStatus, orderId, preStatus) + _, err = tx.ExecContext(ctx, sqlStr, aftStatus, time.Now().Unix(), orderId, preStatus) } else { db := m.getDBVas() - _, err = db.ExecContext(ctx, sqlStr, aftStatus, orderId, preStatus) + _, err = db.ExecContext(ctx, sqlStr, aftStatus, time.Now().Unix(), orderId, preStatus) } if err != nil { logger.Error("UpdateOrderStatus fail, orderId: %v, preStatus: %v, aftStatus: %v, err: %v", orderId, preStatus, aftStatus, err) -- 2.41.0 From b83aab01a793ff03e99351aeb144502952bface0 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Wed, 19 Jun 2024 21:56:57 +0800 Subject: [PATCH 5/5] fix --- app/mix/controller/zone_vas_api.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/mix/controller/zone_vas_api.go b/app/mix/controller/zone_vas_api.go index f45fd89b..08727347 100644 --- a/app/mix/controller/zone_vas_api.go +++ b/app/mix/controller/zone_vas_api.go @@ -22,6 +22,9 @@ func ZoneCreateOrder(ctx *gin.Context) { ReplyErrorMsg(ctx, "商品错误") return } + if len(req.Model) >= 28 { + req.Model = req.Model[:28] + } data, ec, err := service.DefaultService.ZoneCreateOrder(ctx, req) if ec != errcode.ErrCodeVasSrvOk { -- 2.41.0