|
|
@@ -4,6 +4,7 @@ import (
|
|
|
"app.yhyue.com/moapp/jyResourcesCenter/entity"
|
|
|
"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
|
|
|
"log"
|
|
|
+ "time"
|
|
|
)
|
|
|
|
|
|
type ResourceManageService struct{}
|
|
|
@@ -41,12 +42,15 @@ func (service *ResourceManageService) FindAccountBalance(in *resourcesCenter.Res
|
|
|
if err != nil {
|
|
|
return dataList, err
|
|
|
}
|
|
|
+ log.Println(accountBalanceArr)
|
|
|
for _, v := range accountBalanceArr {
|
|
|
log.Println(v.ResourceType)
|
|
|
+ now := time.Now().Format("2006-01-02")
|
|
|
+ oldTime := time.Now().AddDate(0, 0, 30).Format("2006-01-02")
|
|
|
var c int64
|
|
|
b, err := orm.Table("account_resources").Select("sum(number) as number").
|
|
|
- Where("accountId = ? and resourceType = ? and DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(endTime)",
|
|
|
- in.AccountId, v.ResourceType).Get(&c)
|
|
|
+ Where("accountId = ? and resourceType = ? and endTime >= ? and endTime <= ?",
|
|
|
+ in.AccountId, v.ResourceType, now, oldTime).Get(&c)
|
|
|
if !b && err != nil {
|
|
|
return dataList, err
|
|
|
}
|
