“tijiao

rpc/internal/logic/findconsumerecordlogic.go

@@ -26,25 +26,28 @@ func NewFindConsumeRecordLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 
 func (l *FindConsumeRecordLogic) FindConsumeRecord(in *resourcesCenter.RecordReq) (*resourcesCenter.ConsumeRecordRes, error) {
 	// todo: add your logic here and delete this line
-	if in.AccountId != "" && in.UserId != "" && in.PageSize != 0 && in.Page != 0 {
-		recordArr, err := resourceManageService.FindConsumeRecord(in)
+	if in.AccountId != "" && in.PageSize != 0 && in.Page != 0 {
+		recordArr, count, err := resourceManageService.FindConsumeRecord(in)
 		if len(recordArr) == 0 && err != nil {
 			return &resourcesCenter.ConsumeRecordRes{
 				Code:    0,
 				Message: "查询出错",
 				Data:    recordArr,
+				Count:   count,
 			}, err
 		}
 		return &resourcesCenter.ConsumeRecordRes{
 			Code:    1,
 			Message: "查询成功",
 			Data:    recordArr,
+			Count:   count,
 		}, nil
 	} else {
 		return &resourcesCenter.ConsumeRecordRes{
 			Code:    0,
 			Message: "缺少参数",
 			Data:    nil,
+			Count:   0,
 		}, errors.New("缺少参数")
 	}
 

rpc/internal/logic/purchaseuserbalancelogic.go

@@ -44,8 +44,8 @@ func (l *PurchaseUserBalanceLogic) PurchaseUserBalance(in *resourcesCenter.Resou
 	detailed := &resourcesCenter.Detailed{
 		AccountId:    in.AccountId,
 		CompanyId:    in.CompanyId,
-		ResourceType: in.AccountId,
 		Number:       in.Number,
+		ResourceType: in.ResourceType,
 		DepartmentId: in.DepartmentId,
 		Name:         in.Name,
 		UserType:     in.Model,

rpc/resourcesCenter.proto

@@ -49,7 +49,6 @@ message Detailed {
     int64 deductionNumb = 11; //扣除数量
     string remarks = 12; //备注
     string name = 5; //资源名称
-
 }
 
 message ResourcesAuth {

rpc/resourcesCenterclient/resourcescenter.go

@@ -14,20 +14,20 @@ import (
 )
 
 type (
-	ResourceBalance   = resourcesCenter.ResourceBalance
+	ResourcesAuth     = resourcesCenter.ResourcesAuth
+	Resources         = resourcesCenter.Resources
 	PreviewRes        = resourcesCenter.PreviewRes
 	ResourcesAuthRes  = resourcesCenter.ResourcesAuthRes
 	ConsumeRecordRes  = resourcesCenter.ConsumeRecordRes
-	Detailed          = resourcesCenter.Detailed
-	ResourcesAuth     = resourcesCenter.ResourcesAuth
 	ResourcesReq      = resourcesCenter.ResourcesReq
+	ResourceBalance   = resourcesCenter.ResourceBalance
+	ConsumeRecord     = resourcesCenter.ConsumeRecord
 	PreviewReq        = resourcesCenter.PreviewReq
+	AccountBalanceRes = resourcesCenter.AccountBalanceRes
 	RecordReq         = resourcesCenter.RecordReq
-	Response          = resourcesCenter.Response
-	Resources         = resourcesCenter.Resources
+	Detailed          = resourcesCenter.Detailed
 	Balance           = resourcesCenter.Balance
-	ConsumeRecord     = resourcesCenter.ConsumeRecord
-	AccountBalanceRes = resourcesCenter.AccountBalanceRes
+	Response          = resourcesCenter.Response
 
 	ResourcesCenter interface {
 		// 查询账户资源权限

service/resourceManageService.go

@@ -63,7 +63,7 @@ func (service *ResourceManageService) FindAccountBalance(in *resourcesCenter.Res
 }
 
 //查询流水账
-func (service *ResourceManageService) FindConsumeRecord(in *resourcesCenter.RecordReq) ([]*resourcesCenter.ConsumeRecord, error) {
+func (service *ResourceManageService) FindConsumeRecord(in *resourcesCenter.RecordReq) ([]*resourcesCenter.ConsumeRecord, int64, error) {
 	orm := entity.Engine.NewSession()
 	var recordArr []*entity.ConsumeRecord
 	dataList := make([]*resourcesCenter.ConsumeRecord, 0)
@@ -74,14 +74,14 @@ func (service *ResourceManageService) FindConsumeRecord(in *resourcesCenter.Reco
 			Where("accountId = ? and userId = ? and userType = 0", in.AccountId, in.UserId).
 			Limit(int(in.PageSize), (int(in.Page)-1)*int(in.PageSize)).OrderBy("id desc").FindAndCount(&recordArr)
 		if err != nil && count == 0 {
-			return dataList, err
+			return dataList, 0, err
 		}
 	} else {
 		count, err = orm.Table("consume_record").
-			Where("accountId = ? and userId = ? and userType = 1", in.AccountId, in.UserId).
+			Where("accountId = ? and userType = 1", in.AccountId).
 			Limit(int(in.PageSize), (int(in.Page)-1)*int(in.PageSize)).OrderBy("id desc").FindAndCount(&recordArr)
 		if err != nil && count == 0 {
-			return dataList, err
+			return dataList, 0, err
 		}
 	}
 
@@ -98,5 +98,5 @@ func (service *ResourceManageService) FindConsumeRecord(in *resourcesCenter.Reco
 			Remarks:       v.Remarks,
 		})
 	}
-	return dataList, nil
+	return dataList, count, nil
 }