|
@@ -3,7 +3,6 @@ package service
|
|
import (
|
|
import (
|
|
"app.yhyue.com/moapp/jyResourcesCenter/entity"
|
|
"app.yhyue.com/moapp/jyResourcesCenter/entity"
|
|
"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
|
|
"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
|
|
- "log"
|
|
|
|
"time"
|
|
"time"
|
|
)
|
|
)
|
|
|
|
|
|
@@ -37,28 +36,34 @@ func (service *ResourceManageService) FindAccountBalance(in *resourcesCenter.Res
|
|
orm := entity.Engine.NewSession()
|
|
orm := entity.Engine.NewSession()
|
|
var accountBalanceArr []*entity.AccountBalance
|
|
var accountBalanceArr []*entity.AccountBalance
|
|
dataList := make([]*resourcesCenter.ResourceBalance, 0)
|
|
dataList := make([]*resourcesCenter.ResourceBalance, 0)
|
|
- err := orm.Table("account_resources").
|
|
|
|
- Where("accountId = ?", in.AccountId).Find(&accountBalanceArr)
|
|
|
|
|
|
+ err := orm.Table("account_resources").Select("ANY_VALUE(id) as id,ANY_VALUE(name) as name,resourceType,ANY_VALUE(spec)").
|
|
|
|
+ Where("accountId = ?", in.AccountId).GroupBy("resourceType").Find(&accountBalanceArr)
|
|
|
|
+ //err := orm.Query()
|
|
if err != nil {
|
|
if err != nil {
|
|
return dataList, err
|
|
return dataList, err
|
|
}
|
|
}
|
|
- log.Println(accountBalanceArr)
|
|
|
|
|
|
+ //log.Println(accountBalanceArr)
|
|
for _, v := range accountBalanceArr {
|
|
for _, v := range accountBalanceArr {
|
|
- log.Println(v.ResourceType)
|
|
|
|
|
|
+ //log.Println(v)
|
|
now := time.Now().Format("2006-01-02")
|
|
now := time.Now().Format("2006-01-02")
|
|
oldTime := time.Now().AddDate(0, 0, 30).Format("2006-01-02")
|
|
oldTime := time.Now().AddDate(0, 0, 30).Format("2006-01-02")
|
|
|
|
+ //统计30内到期数量
|
|
var c int64
|
|
var c int64
|
|
b, err := orm.Table("account_resources").Select("sum(number) as number").
|
|
b, err := orm.Table("account_resources").Select("sum(number) as number").
|
|
Where("accountId = ? and resourceType = ? and endTime >= ? and endTime <= ?",
|
|
Where("accountId = ? and resourceType = ? and endTime >= ? and endTime <= ?",
|
|
in.AccountId, v.ResourceType, now, oldTime).Get(&c)
|
|
in.AccountId, v.ResourceType, now, oldTime).Get(&c)
|
|
- if !b && err != nil {
|
|
|
|
|
|
+ var number int64
|
|
|
|
+ //统计总数量
|
|
|
|
+ isOk, err := orm.Table("account_resources").Select("sum(number) as number").
|
|
|
|
+ Where("accountId = ? and resourceType = ?", in.AccountId, v.ResourceType).Get(&number)
|
|
|
|
+ if !b && err != nil && !isOk {
|
|
return dataList, err
|
|
return dataList, err
|
|
}
|
|
}
|
|
dataList = append(dataList, &resourcesCenter.ResourceBalance{
|
|
dataList = append(dataList, &resourcesCenter.ResourceBalance{
|
|
Id: v.Id,
|
|
Id: v.Id,
|
|
Name: v.Name,
|
|
Name: v.Name,
|
|
ResourceType: v.ResourceType,
|
|
ResourceType: v.ResourceType,
|
|
- Number: v.Number,
|
|
|
|
|
|
+ Number: number,
|
|
Spec: v.Spec,
|
|
Spec: v.Spec,
|
|
ThirtyNum: c,
|
|
ThirtyNum: c,
|
|
})
|
|
})
|