update 完善统计逻辑

game/game_cluster/nodes/webadmin/service/synthesis.go

@@ -269,12 +269,12 @@ func (s *Synthesis) FindWithdrawal(req entity.UserWithdrawalReq) (*entity.UserWi
 		},
 		EventBasic: eventmodels.EventBasic{
 			ServerId: s.nodeId,
+			Status:   req.Withdrawal,
 		},
-		WithdrawId:      req.ID,
-		Currency:        req.Currency,
-		Address:         req.Address,
-		State:           req.State,
-		WithdrawalState: req.Withdrawal,
+		WithdrawId: req.ID,
+		Currency:   req.Currency,
+		Address:    req.Address,
+		State:      req.State,
 	}
 	db := mdb.LogstashDB.Model(&eventmodels.UserWithdrawEventContent{}).Where(where).Order("create_at")
 
@@ -304,7 +304,7 @@ func (s *Synthesis) FindWithdrawal(req entity.UserWithdrawalReq) (*entity.UserWi
 			OpenId:      v.TgId,
 			Status:      v.State,
 			Reason:      v.Reason,
-			Withdrawal:  v.WithdrawalState,
+			Withdrawal:  v.Status,
 			Amount:      int(v.Amount),
 			AfterAmount: int(v.AfterBalance),
 			Type:        v.Currency,
@@ -808,6 +808,38 @@ func (s *Synthesis) Assets(req entity.AssetsReq) (*entity.AssetsResp, *code.Resu
 	}
 
 	if req.UserName != "" || req.OpenId != "" {
+		// 构建查询条件
+		filter := bson.M{}
+		if req.UserName != "" {
+			filter["userName"] = req.UserName
+		}
+		if req.OpenId != "" {
+			filter["openId"] = req.OpenId
+		}
+
+		var playerInfo *models.Player
+		err := mdb.MDB.Collection(constant.CNamePlayer).FindOne(context.Background(), filter).Decode(&playerInfo)
+		if err != nil && err != mongo.ErrNoDocuments {
+			mhayaLogger.Warnf("Assets FindOne playerInfo error:%v", err)
+			return nil, common.NewResult(code.InternalError)
+		}
+
+		if playerInfo == nil {
+			var results []*entity.AssetsDetail
+			results = append(results, &entity.AssetsDetail{
+				UserName:        "",
+				OpenId:          "",
+				TonValue:        0,
+				UsdtValue:       0,
+				StatisticalDate: mhayaTime.Now().Unix(),
+			})
+
+			return &entity.AssetsResp{
+				Details: results,
+				Total:   0,
+			}, nil
+		}
+
 		var results []*entity.AssetsDetail
 
 		var totalUsdtAmount int64
@@ -822,7 +854,7 @@ func (s *Synthesis) Assets(req entity.AssetsReq) (*entity.AssetsResp, *code.Resu
 			},
 		}
 		where.Currency = string(constant.UsdtCurrency)
-		err := mdb.LogstashDB.Model(&eventmodels.AssetsEventContent{}).Where(where).Pluck("SUM(amount) as total_amount", &totalUsdtAmount).Error
+		err = mdb.LogstashDB.Model(&eventmodels.AssetsEventContent{}).Where(where).Pluck("SUM(amount) as total_amount", &totalUsdtAmount).Error
 		if err != nil {
 			mhayaLogger.Warnf("Assets Pluck UsdtCurrency error:%v", err)
 			return nil, common.NewResult(code.InternalError)
@@ -836,8 +868,8 @@ func (s *Synthesis) Assets(req entity.AssetsReq) (*entity.AssetsResp, *code.Resu
 		}
 
 		results = append(results, &entity.AssetsDetail{
-			UserName:        req.UserName,
-			OpenId:          req.OpenId,
+			UserName:        playerInfo.UserName,
+			OpenId:          playerInfo.OpenId,
 			TonValue:        totalTonAmount,
 			UsdtValue:       totalUsdtAmount,
 			StatisticalDate: mhayaTime.Now().Unix(),