From 5b9452aa91ddf99368a213f53b5b010fbf258ea1 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Fri, 22 Dec 2023 15:03:10 +0800
Subject: [PATCH] by Robin at 20231222; vas

---
 app/mix/service/apiservice.go | 32 +++++++++++++++++++++++++++++++-
 app/mix/service/service.go    |  8 --------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 6745e450..a9cd0697 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"service/api/base"
 	"service/api/consts"
 	"service/api/errcode"
 	accountproto "service/api/proto/account/proto"
@@ -14,6 +15,7 @@ import (
 	streamerlinkproto "service/api/proto/streamerlink/proto"
 	tokenproto "service/api/proto/token/proto"
 	userwxaddcheckproto "service/api/proto/userwxaddcheck/proto"
+	vasproto "service/api/proto/vas/proto"
 	vericodeproto "service/api/proto/vericode/proto"
 	"service/apollostruct"
 	businessvalidator "service/app/mix/service/business_validator"
@@ -875,12 +877,40 @@ func (s *Service) ApiUpdateStreamer(ctx *gin.Context, req *streamerproto.ApiUpda
 
 	//执行更新
 	if err := _DefaultStreamer.OpUpdate(ctx, &streamerproto.OpUpdateReq{
-		Streamer: req.Streamer,
+		Streamer: &dbstruct.Streamer{
+			Mid:                 req.Streamer.Mid,
+			Gender:              req.Streamer.Gender,
+			Bio:                 req.Streamer.Bio,
+			Cover:               req.Streamer.Cover,
+			Shorts:              req.Streamer.Shorts,
+			Album:               req.Streamer.Album,
+			Age:                 req.Streamer.Age,
+			Height:              req.Streamer.Height,
+			Weight:              req.Streamer.Weight,
+			Constellation:       req.Streamer.Constellation,
+			City:                req.Streamer.City,
+			Tag:                 req.Streamer.Tag,
+			Fans:                req.Streamer.Fans,
+			AutoResponseMessage: req.Streamer.AutoResponseMessage,
+		},
 	}); err != nil {
 		logger.Error("OpUpdate fail, req: %v, err: %v", util.ToJson(req), err)
 		ec = errcode.ErrCodeStreamerSrvFail
 		return
 	}
+	// 更新user_vas
+	err = _DefaultVas.UpdateWechat(ctx, &vasproto.UpdateWechatReq{
+		BaseRequest: base.BaseRequest{
+			Mid: util.DerefInt64(req.Streamer.Mid),
+		},
+		WechatLockType:  util.DerefInt32(req.Streamer.WechatLockType),
+		WechatContact:   util.DerefString(req.Streamer.WechatContact),
+		WechatCoinPrice: util.DerefInt64(req.Streamer.WechatCoinPrice),
+	})
+	if err != nil {
+		logger.Error("UpdateWechat fail, mid: %v, err: %v", err)
+		return
+	}
 
 	// 审核任务加入队列
 	for i := range imageaudittasks {
diff --git a/app/mix/service/service.go b/app/mix/service/service.go
index d1c8f86e..d4f6e5a2 100644
--- a/app/mix/service/service.go
+++ b/app/mix/service/service.go
@@ -1459,10 +1459,6 @@ func (s *Service) OpDeleteStreamer(ctx *gin.Context, id int64) (ec errcode.ErrCo
 func (s *Service) OpGetStreamerList(ctx *gin.Context, req *streamerproto.OpListReq) (list []*dbstruct.Streamer, ec errcode.ErrCode) {
 	ec = errcode.ErrCodeStreamerSrvOk
 
-	if ec = s.OpGetStreamerListBusinessValidate(ctx, req); ec != errcode.ErrCodeStreamerSrvOk {
-		return
-	}
-
 	list, err := _DefaultStreamer.OpList(ctx, req)
 	if err != nil {
 		logger.Error("OpList fail, req: %v, err: %v", util.ToJson(req), err)
@@ -1707,10 +1703,6 @@ func (s *Service) OpGetStreamerRecommList(ctx *gin.Context, req *streamerproto.O
 
 	ec = errcode.ErrCodeStreamerSrvOk
 
-	if ec = s.OpGetStreamerRecommListBusinessValidate(ctx, req); ec != errcode.ErrCodeStreamerSrvOk {
-		return
-	}
-
 	//1.从redis中获取数据
 	err := redis.GetRedisClient().GetObject(consts.RedisStreamerPrefix+"recomm_list", &recommlist)
 	if err != nil {