|
|
@@ -7,6 +7,7 @@ import (
|
|
|
"math"
|
|
|
"strconv"
|
|
|
"time"
|
|
|
+ "wechat-api/ent/creditbalance"
|
|
|
"wechat-api/ent/custom_types"
|
|
|
"wechat-api/ent/label"
|
|
|
"wechat-api/ent/predicate"
|
|
|
@@ -184,7 +185,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
|
|
|
consumeCoin.Count += hourData.ConsumeCoin
|
|
|
consumeCoin.Val = append(consumeCoin.Val, hourData.ConsumeCoin)
|
|
|
consumeCoin.Label = append(consumeCoin.Label, fmt.Sprintf("%02d-%02d点", addtimeLastTwoDigits, addtimeLastTwoDigits+1))
|
|
|
- consumeCoin.LabelText = "coin"
|
|
|
+ consumeCoin.LabelText = "积分"
|
|
|
|
|
|
//activeUser.Count = hourData.ActiveUser
|
|
|
activeUser.Val = append(activeUser.Val, hourData.ActiveUser)
|
|
|
@@ -298,7 +299,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
|
|
|
consumeCoin.Count += dayData.ConsumeCoin
|
|
|
consumeCoin.Val = append(consumeCoin.Val, dayData.ConsumeCoin)
|
|
|
consumeCoin.Label = append(consumeCoin.Label, fmt.Sprintf("%d", dayData.Addtime))
|
|
|
- consumeCoin.LabelText = "coin"
|
|
|
+ consumeCoin.LabelText = "积分"
|
|
|
|
|
|
//activeUser.Count = dayData.ActiveUser
|
|
|
activeUser.Val = append(activeUser.Val, dayData.ActiveUser)
|
|
|
@@ -483,6 +484,12 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
|
|
|
})
|
|
|
}
|
|
|
|
|
|
+ // 获取积分
|
|
|
+ if req.OrganizationId != nil && *req.OrganizationId > 0 {
|
|
|
+ creditBalance, _ := l.svcCtx.DB.CreditBalance.Query().Where(creditbalance.OrganizationID(*req.OrganizationId)).First(l.ctx)
|
|
|
+ accountBalance.Count = uint64(creditBalance.Balance)
|
|
|
+ }
|
|
|
+
|
|
|
chartsData := types.ChartsData{
|
|
|
AiResponse: &aiResponse,
|
|
|
SopRun: &sopRun,
|
