fix: allow clearing user remark in basic info update

Co-authored-by: multica-agent <github@multica.ai>

apis/admin/user.api

@@ -38,20 +38,20 @@ type (
 		Id int64 `form:"id" validate:"required"`
 	}
 	UpdateUserBasiceInfoRequest {
-		UserId             int64  `json:"user_id" validate:"required"`
-		Password           string `json:"password"`
-		Avatar             string `json:"avatar"`
-		Balance            int64  `json:"balance"`
-		Commission         int64  `json:"commission"`
-		ReferralPercentage uint8  `json:"referral_percentage"`
-		OnlyFirstPurchase  *bool  `json:"only_first_purchase"`
-		GiftAmount         int64  `json:"gift_amount"`
-		Telegram           int64  `json:"telegram"`
-		ReferCode          string `json:"refer_code"`
-		RefererId          int64  `json:"referer_id"`
-		Enable             *bool  `json:"enable"`
-		IsAdmin            *bool  `json:"is_admin"`
-		Remark             string `json:"remark"`
+		UserId             int64   `json:"user_id" validate:"required"`
+		Password           string  `json:"password"`
+		Avatar             string  `json:"avatar"`
+		Balance            *int64  `json:"balance"`
+		Commission         *int64  `json:"commission"`
+		ReferralPercentage uint8   `json:"referral_percentage"`
+		OnlyFirstPurchase  *bool   `json:"only_first_purchase"`
+		GiftAmount         *int64  `json:"gift_amount"`
+		Telegram           int64   `json:"telegram"`
+		ReferCode          string  `json:"refer_code"`
+		RefererId          *int64  `json:"referer_id"`
+		Enable             *bool   `json:"enable"`
+		IsAdmin            *bool   `json:"is_admin"`
+		Remark             *string `json:"remark"`
 	}
 	UpdateUserNotifySettingRequest {
 		UserId                int64 `json:"user_id" validate:"required"`

internal/logic/admin/user/updateUserBasicInfoLogic.go

@@ -46,13 +46,13 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 	}
 
 	err = l.svcCtx.UserModel.Transaction(l.ctx, func(tx *gorm.DB) error {
-		if userInfo.Balance != req.Balance {
-			change := req.Balance - userInfo.Balance
+		if req.Balance != nil && userInfo.Balance != *req.Balance {
+			change := *req.Balance - userInfo.Balance
 			balanceLog := log.Balance{
 				Type:      log.BalanceTypeAdjust,
 				Amount:    change,
 				OrderNo:   "",
-				Balance:   req.Balance,
+				Balance:   *req.Balance,
 				Timestamp: time.Now().UnixMilli(),
 			}
 			content, _ := balanceLog.Marshal()
@@ -66,14 +66,14 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 			if err != nil {
 				return err
 			}
-			userInfo.Balance = req.Balance
+			userInfo.Balance = *req.Balance
 		}
 
-		if userInfo.GiftAmount != req.GiftAmount {
-			change := req.GiftAmount - userInfo.GiftAmount
+		if req.GiftAmount != nil && userInfo.GiftAmount != *req.GiftAmount {
+			change := *req.GiftAmount - userInfo.GiftAmount
 			if change != 0 {
 				var changeType uint16
-				if userInfo.GiftAmount < req.GiftAmount {
+				if userInfo.GiftAmount < *req.GiftAmount {
 					changeType = log.GiftTypeIncrease
 				} else {
 					changeType = log.GiftTypeReduce
@@ -81,7 +81,7 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 				giftLog := log.Gift{
 					Type:      changeType,
 					Amount:    change,
-					Balance:   req.GiftAmount,
+					Balance:   *req.GiftAmount,
 					Remark:    "Admin adjustment",
 					Timestamp: time.Now().UnixMilli(),
 				}
@@ -96,23 +96,27 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 				if err != nil {
 					return err
 				}
-				userInfo.GiftAmount = req.GiftAmount
+				userInfo.GiftAmount = *req.GiftAmount
 			}
 		}
 
-		if req.Commission != userInfo.Commission {
-			if isWithdrawalScene(req.Remark) {
+		if req.Commission != nil && *req.Commission != userInfo.Commission {
+			remark := ""
+			if req.Remark != nil {
+				remark = *req.Remark
+			}
+			if isWithdrawalScene(remark) {
 				logWithdrawalGuard(l.Logger, userInfo.Id)
 				return errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "commission overwrite is blocked in withdrawal scene")
 			}
-			change := req.Commission - userInfo.Commission
+			change := *req.Commission - userInfo.Commission
 			if err = l.svcCtx.UserModel.UpdateCommission(l.ctx, userInfo.Id, change, tx); err != nil {
 				return err
 			}
 			if err = logicCommon.WriteCommissionLog(tx, userInfo.Id, log.CommissionTypeAdjust, change, ""); err != nil {
 				return err
 			}
-			userInfo.Commission = req.Commission
+			userInfo.Commission = *req.Commission
 		}
 		if req.Avatar != "" {
 			userInfo.Avatar = req.Avatar
@@ -120,15 +124,17 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 		if req.ReferCode != "" {
 			userInfo.ReferCode = req.ReferCode
 		}
-		userInfo.RefererId = req.RefererId
+		if req.RefererId != nil {
+			userInfo.RefererId = *req.RefererId
+		}
 		if req.Enable != nil {
 			userInfo.Enable = req.Enable
 		}
 		if req.IsAdmin != nil {
 			userInfo.IsAdmin = req.IsAdmin
 		}
-		if req.Remark != "" {
-			userInfo.Remark = req.Remark
+		if req.Remark != nil {
+			userInfo.Remark = *req.Remark
 		}
 		if req.OnlyFirstPurchase != nil {
 			userInfo.OnlyFirstPurchase = req.OnlyFirstPurchase

internal/types/types.go

@@ -3223,20 +3223,20 @@ type UpdateUserAuthMethodRequest struct {
 }
 
 type UpdateUserBasiceInfoRequest struct {
-	UserId             int64  `json:"user_id" validate:"required"`
-	Password           string `json:"password"`
-	Avatar             string `json:"avatar"`
-	Balance            int64  `json:"balance"`
-	Commission         int64  `json:"commission"`
-	ReferralPercentage uint8  `json:"referral_percentage"`
-	OnlyFirstPurchase  *bool  `json:"only_first_purchase"`
-	GiftAmount         int64  `json:"gift_amount"`
-	Telegram           int64  `json:"telegram"`
-	ReferCode          string `json:"refer_code"`
-	RefererId          int64  `json:"referer_id"`
-	Enable             *bool  `json:"enable"`
-	IsAdmin            *bool  `json:"is_admin"`
-	Remark             string `json:"remark"`
+	UserId             int64   `json:"user_id" validate:"required"`
+	Password           string  `json:"password"`
+	Avatar             string  `json:"avatar"`
+	Balance            *int64  `json:"balance"`
+	Commission         *int64  `json:"commission"`
+	ReferralPercentage uint8   `json:"referral_percentage"`
+	OnlyFirstPurchase  *bool   `json:"only_first_purchase"`
+	GiftAmount         *int64  `json:"gift_amount"`
+	Telegram           int64   `json:"telegram"`
+	ReferCode          string  `json:"refer_code"`
+	RefererId          *int64  `json:"referer_id"`
+	Enable             *bool   `json:"enable"`
+	IsAdmin            *bool   `json:"is_admin"`
+	Remark             *string `json:"remark"`
 }
 
 type UpdateUserNotifyRequest struct {

internal/types/types_test.go

@@ -0,0 +1,33 @@
+package types
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestUpdateUserBasiceInfoRequestDistinguishesOmittedAndEmptyRemark(t *testing.T) {
+	var omitted UpdateUserBasiceInfoRequest
+	if err := json.Unmarshal([]byte(`{"user_id":1001}`), &omitted); err != nil {
+		t.Fatalf("unmarshal omitted remark: %v", err)
+	}
+	if omitted.Remark != nil {
+		t.Fatalf("omitted remark should stay nil, got %q", *omitted.Remark)
+	}
+	if omitted.RefererId != nil {
+		t.Fatalf("omitted referer_id should stay nil, got %d", *omitted.RefererId)
+	}
+	if omitted.Balance != nil || omitted.GiftAmount != nil || omitted.Commission != nil {
+		t.Fatalf("omitted money fields should stay nil, got balance=%v gift=%v commission=%v", omitted.Balance, omitted.GiftAmount, omitted.Commission)
+	}
+
+	var cleared UpdateUserBasiceInfoRequest
+	if err := json.Unmarshal([]byte(`{"user_id":1001,"remark":""}`), &cleared); err != nil {
+		t.Fatalf("unmarshal empty remark: %v", err)
+	}
+	if cleared.Remark == nil {
+		t.Fatal("explicit empty remark should be present")
+	}
+	if *cleared.Remark != "" {
+		t.Fatalf("explicit empty remark should decode to empty string, got %q", *cleared.Remark)
+	}
+}