From 7317ea2a65bc58487d5d205b5e12cb47bd9608cc Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Wed, 1 May 2024 04:32:09 +0800
Subject: [PATCH 1/2] by Robin at 20240501

---
 api/consts/consts.go          |  1 +
 app/mix/service/apiservice.go | 19 ++++++++++++++++++-
 app/mix/service/service.go    | 19 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/api/consts/consts.go b/api/consts/consts.go
index 630aedeb..7367855f 100644
--- a/api/consts/consts.go
+++ b/api/consts/consts.go
@@ -53,6 +53,7 @@ const (
 	ReferentialZoneMomentKey         = "referential_zone_moment"
 	IsMomentImageEncryptEnabledKey   = "is_moment_image_encrypt_enabled"
 	RestrictedVisitorMomentKey       = "restricted_visitor_moment"
+	AppConfigReflectKey              = "app_config_reflect"
 )
 
 // del_flag
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 4e45744b..fc324e1d 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -40,6 +40,7 @@ import (
 	"service/library/contentaudit/textaudit"
 	videomoderation "service/library/contentaudit/video_moderation"
 	"service/library/logger"
+	"strings"
 	"time"
 
 	"go.mongodb.org/mongo-driver/mongo"
@@ -2110,7 +2111,23 @@ func (s *Service) ApiGetThumbsUpList(ctx *gin.Context, req *thumbsupproto.ApiLis
 func (s *Service) ApiGetAppConfigListByKey(ctx *gin.Context, req *appconfigproto.ApiListByKeyReq) (appconfig *dbstruct.AppConfig, ec errcode.ErrCode) {
 	ec = errcode.ErrCodeAppConfigSrvOk
 
-	appconfig, err := _DefaultAppConfig.OpListByKey(ctx, &appconfigproto.OpListByKeyReq{
+	//读取版本下是否有字段需要进行版本映射
+	appConfigReflect, err := apollo.GetStringValue(consts.AppConfigReflectKey+"_"+req.BaseRequest.Version, apollo.ApolloOpts().SetNamespace("version"))
+	if err != nil {
+		logger.Error("Apollo read failed : %v", err)
+		ec = errcode.ErrCodeApolloReadFail
+		return
+	}
+	if appConfigReflect != "" {
+		appConfigReflectColumns := strings.Split(appConfigReflect, ";")
+		for _, column := range appConfigReflectColumns {
+			if req.ConfigKey == column {
+				req.ConfigKey = req.ConfigKey + "_" + req.BaseRequest.Version
+			}
+		}
+	}
+
+	appconfig, err = _DefaultAppConfig.OpListByKey(ctx, &appconfigproto.OpListByKeyReq{
 		ConfigKey: req.ConfigKey,
 	})
 	if err != nil {
diff --git a/app/mix/service/service.go b/app/mix/service/service.go
index f1d1cde1..742ffe4c 100644
--- a/app/mix/service/service.go
+++ b/app/mix/service/service.go
@@ -57,6 +57,7 @@ import (
 	"service/library/payclients/alipaycli"
 	"service/library/payclients/wxpaycli"
 	"service/library/redis"
+	"strings"
 	"time"
 
 	accountpunishmentproto "service/api/proto/accountpunishment/proto"
@@ -2968,7 +2969,23 @@ func (s *Service) OpGetAppConfigListByKey(ctx *gin.Context, req *appconfigproto.
 		return
 	}
 
-	appconfig, err := _DefaultAppConfig.OpListByKey(ctx, req)
+	//读取版本下是否有字段需要进行版本映射
+	appConfigReflect, err := apollo.GetStringValue(consts.AppConfigReflectKey+"_"+req.BaseRequest.Version, apollo.ApolloOpts().SetNamespace("version"))
+	if err != nil {
+		logger.Error("Apollo read failed : %v", err)
+		ec = errcode.ErrCodeApolloReadFail
+		return
+	}
+	if appConfigReflect != "" {
+		appConfigReflectColumns := strings.Split(appConfigReflect, ";")
+		for _, column := range appConfigReflectColumns {
+			if req.ConfigKey == column {
+				req.ConfigKey = req.ConfigKey + "_" + req.BaseRequest.Version
+			}
+		}
+	}
+
+	appconfig, err = _DefaultAppConfig.OpListByKey(ctx, req)
 	if err != nil {
 		logger.Error("OpGetAppConfigListByKey fail, req: %v, err: %v", util.ToJson(req), err)
 		ec = errcode.ErrCodeAppConfigSrvFail

From bb90fafef6e997ee7ee7c48bd4ab0a6374f4d05a Mon Sep 17 00:00:00 2001
From: lwl0608 <lwl0608@foxmail.com>
Date: Fri, 3 May 2024 02:56:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=20req.WechatCoinPrice=20=E5=85=9C=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/mix/service/logic/vas.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/mix/service/logic/vas.go b/app/mix/service/logic/vas.go
index b07d1b4b..87871a40 100644
--- a/app/mix/service/logic/vas.go
+++ b/app/mix/service/logic/vas.go
@@ -1001,6 +1001,11 @@ func (v *Vas) GetCHList(ctx *gin.Context, mid int64, typ int32, offset, limit in
 
 // 更新微信
 func (v *Vas) UpdateWechat(ctx *gin.Context, req *vasproto.UpdateWechatReq) (err error) {
+	if req.WechatCoinPrice <= 0 {
+		logger.Warn("invalid req.WechatCoinPrice, req: %v", util.ToJson(req))
+		return nil
+	}
+
 	err = v.store.UpdateUserVasInfo(ctx, req)
 	return
 }