Merge pull request 'by Robin at 20240628' (#572) from feat-IRONFANS-148-Robin into main

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/572

app/mix/service/vasservice.go

@@ -3,7 +3,6 @@ package service
 import (
 	"encoding/base64"
 	"fmt"
-	goproto "google.golang.org/protobuf/proto"
 	"service/api/base"
 	"service/api/errcode"
 	"service/api/errs"
@@ -20,6 +19,8 @@ import (
 	"strconv"
 	"strings"
 
+	goproto "google.golang.org/protobuf/proto"
+
 	"github.com/gin-gonic/gin"
 )
 
@@ -472,6 +473,18 @@ func (s *Service) chListWithdraw(ctx *gin.Context, chList []*dbstruct.ConsumeHis
 			if chDB.GetChange() < 0 {
 				item.Change = fmt.Sprintf("%d钻石", chDB.GetChange())
 			}
+		case dbstruct.CHSTypeWithdrawDiamondHvyogo:
+			item.Desc = "钻石提现"
+			item.Change = changeMark + fmt.Sprintf("%d钻石", chDB.GetChange())
+			if chDB.GetChange() < 0 {
+				item.Change = fmt.Sprintf("%d钻石", chDB.GetChange())
+			}
+		case dbstruct.CHSTypeWithdrawDiamondReversal:
+			item.Desc = "钻石返还"
+			item.Change = changeMark + fmt.Sprintf("%d钻石", chDB.GetChange())
+			if chDB.GetChange() < 0 {
+				item.Change = fmt.Sprintf("%d钻石", chDB.GetChange())
+			}
 		}
 		list = append(list, item)
 	}

dbstruct/vas_mysql.go

@@ -553,7 +553,7 @@ const (
 
 	CHSTypeWithdrawDiamondAuto     = 40001 // 自动提现明细
 	CHSTypeWithdrawDiamondHvyogo   = 40002 // 慧用工提现明细
-	CHSTypeWithdrawDiamondReversal = 40002 // 提现冲正明细
+	CHSTypeWithdrawDiamondReversal = 40003 // 提现冲正明细
 )
 
 type ConsumeHistory struct {