tijiao

api/integral.api

@@ -32,6 +32,12 @@ type resourcesRes {
 	Code    int64  `json:"code"`
 	Message string `json:"message"`
 }
+type useUserResponse {
+	// TODO: add members here and delete this comment
+	Code          int64  `json:"code"`
+	Message       string `json:"message"`
+	DeductionNumb int64  `json:"deductionNumb"`
+}
 type previewReq {
 	InfoId       string `form:"infoId,optional"`       //信息标识
 	AccountId    string `form:"accountId,optional"`    //企业标识
@@ -97,7 +103,7 @@ service integral-api {
 	post /resources/useUserDetailed (useResourcesReq) returns(resourcesRes)
 	//购买资源
 	@handler PurchaseUserBalanceHandler // TODO: set handler name and delete this comment
-	post /resources/purchaseUserBalance (purchResourcesReq) returns(resourcesRes)
+	post /resources/purchaseUserBalance (purchResourcesReq) returns(useUserResponse)
 	//预览信息
 	@handler FindPreviewHandler // TODO: set handler name and delete this comment
 	post /resources/findPreview (previewReq) returns(previewRes)

api/internal/logic/useuserdetailedlogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenterclient"
+	 "app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenterclient"
 	"context"
 
 	"app.yhyue.com/moapp/jyResourcesCenter/api/internal/svc"
@@ -24,12 +24,12 @@ func NewUseUserDetailedLogic(ctx context.Context, svcCtx *svc.ServiceContext) Us
 	}
 }
 
-func (l *UseUserDetailedLogic) UseUserDetailed(req types.UseResourcesReq) (*types.ResourcesRes, error) {
+func (l *UseUserDetailedLogic) UseUserDetailed(req types.UseResourcesReq) (*types.UseUserResponse, error) {
 	// todo: add your logic here and delete this line
-	result := &types.ResourcesRes{}
+	result := &types.UseUserResponse{}
 	lsi := l.svcCtx.ResourcesCenter
 	var err error
-	resp := &resourcesCenterclient.Response{}
+	resp := &resourcesCenterclient.UseUserResponse{}
 	resp, err = lsi.UseUserDetailed(l.ctx, &resourcesCenterclient.Resources{
 
 		AccountId:        req.AccountId,
@@ -50,5 +50,6 @@ func (l *UseUserDetailedLogic) UseUserDetailed(req types.UseResourcesReq) (*type
 	}
 	result.Code = resp.Code
 	result.Message = resp.Message
+	result.DeductionNumb=resp.DeductionNumb
 	return result, nil
 }

api/internal/types/types.go

@@ -34,6 +34,12 @@ type ResourcesRes struct {
 	Message string `json:"message"`
 }
 
+type UseUserResponse struct {
+	Code          int64  `json:"code"`
+	Message       string `json:"message"`
+	DeductionNumb int64  `json:"deductionNumb"`
+}
+
 type PreviewReq struct {
 	InfoId       string `form:"infoId,optional"`       //信息标识
 	AccountId    string `form:"accountId,optional"`    //企业标识

rpc/internal/logic/useuserdetailedlogic.go

@@ -25,7 +25,7 @@ func NewUseUserDetailedLogic(ctx context.Context, svcCtx *svc.ServiceContext) *U
 }
 
 // 根据账户标识使用资源
-func (l *UseUserDetailedLogic) UseUserDetailed(in *resourcesCenter.Resources) (*resourcesCenter.Response, error) {
+func (l *UseUserDetailedLogic) UseUserDetailed(in *resourcesCenter.Resources) (*resourcesCenter.UseUserResponse, error) {
 	// todo: add your logic here and delete this line
 	balance := &resourcesCenter.Balance{
 		AccountId:    in.AccountId,
@@ -51,9 +51,10 @@ func (l *UseUserDetailedLogic) UseUserDetailed(in *resourcesCenter.Resources) (*
 		Remarks:      in.Remarks,
 		RuleId:       in.RuleId,
 	}
-	code, msg := balanceService.UseUserDetailed(in.DuplicateRemoval, balance, detailed, in.InfoId, config.ConfigJson.DedupUrl)
-	return &resourcesCenter.Response{
-		Code:    code,
-		Message: msg,
+	code, msg, deductionNumb := balanceService.UseUserDetailed(in.DuplicateRemoval, balance, detailed, in.InfoId, config.ConfigJson.DedupUrl)
+	return &resourcesCenter.UseUserResponse{
+		Code:          code,
+		Message:       msg,
+		DeductionNumb: deductionNumb,
 	}, nil
 }

rpc/internal/server/resourcescenterserver.go

@@ -46,7 +46,7 @@ func (s *ResourcesCenterServer) PurchaseUserBalance(ctx context.Context, in *res
 }
 
 // 根据账户标识使用资源
-func (s *ResourcesCenterServer) UseUserDetailed(ctx context.Context, in *resourcesCenter.Resources) (*resourcesCenter.Response, error) {
+func (s *ResourcesCenterServer) UseUserDetailed(ctx context.Context, in *resourcesCenter.Resources) (*resourcesCenter.UseUserResponse, error) {
 	l := logic.NewUseUserDetailedLogic(ctx, s.svcCtx)
 	return l.UseUserDetailed(in)
 }

rpc/resourcesCenter.proto

@@ -1,11 +1,16 @@
 syntax = "proto3";
 
 package resourcesCenter;
-//option go_package = "resourcesCenter/";
+option go_package = "resourcesCenter/";
 message Response {
     int64 code = 1; //响应代码
     string message = 2; //响应消息
 }
+message UseUserResponse{
+    int64 code = 1; //响应代码
+    string message = 2; //响应消息
+    int64 deductionNumb = 3; //扣除数量
+}
 message Balance {
     string accountId = 1; //账户标识
     int64 companyId = 2; //企业标识
@@ -145,7 +150,7 @@ service ResourcesCenter {
     //根据账户标识购买资源
     rpc purchaseUserBalance (Resources) returns (Response);
     //根据账户标识使用资源
-    rpc useUserDetailed (Resources) returns (Response);
+    rpc useUserDetailed (Resources) returns (UseUserResponse);
     //预览信息
     rpc findPreview (PreviewReq) returns (PreviewRes);
      //合并账号

rpc/resourcesCenterclient/resourcescenter.go

@@ -14,21 +14,22 @@ import (
 )
 
 type (
+	ResourcesReq      = resourcesCenter.ResourcesReq
+	PreviewRes        = resourcesCenter.PreviewRes
+	UseUserResponse   = resourcesCenter.UseUserResponse
+	Resources         = resourcesCenter.Resources
+	ConsumeRecord     = resourcesCenter.ConsumeRecord
+	Balance           = resourcesCenter.Balance
+	Detailed          = resourcesCenter.Detailed
+	Response          = resourcesCenter.Response
+	PreviewReq        = resourcesCenter.PreviewReq
 	AccountBalanceRes = resourcesCenter.AccountBalanceRes
-	ConsumeRecordRes  = resourcesCenter.ConsumeRecordRes
-	ResourcesAuthRes  = resourcesCenter.ResourcesAuthRes
 	RecordReq         = resourcesCenter.RecordReq
+	ConsumeRecordRes  = resourcesCenter.ConsumeRecordRes
 	MergeInfo         = resourcesCenter.MergeInfo
-	Balance           = resourcesCenter.Balance
 	ResourcesAuth     = resourcesCenter.ResourcesAuth
-	PreviewRes        = resourcesCenter.PreviewRes
 	ResourceBalance   = resourcesCenter.ResourceBalance
-	ConsumeRecord     = resourcesCenter.ConsumeRecord
-	ResourcesReq      = resourcesCenter.ResourcesReq
-	PreviewReq        = resourcesCenter.PreviewReq
-	Response          = resourcesCenter.Response
-	Resources         = resourcesCenter.Resources
-	Detailed          = resourcesCenter.Detailed
+	ResourcesAuthRes  = resourcesCenter.ResourcesAuthRes
 
 	ResourcesCenter interface {
 		// 查询账户资源权限
@@ -40,7 +41,7 @@ type (
 		// 根据账户标识购买资源
 		PurchaseUserBalance(ctx context.Context, in *Resources) (*Response, error)
 		// 根据账户标识使用资源
-		UseUserDetailed(ctx context.Context, in *Resources) (*Response, error)
+		UseUserDetailed(ctx context.Context, in *Resources) (*UseUserResponse, error)
 		// 预览信息
 		FindPreview(ctx context.Context, in *PreviewReq) (*PreviewRes, error)
 		// 合并账号
@@ -83,7 +84,7 @@ func (m *defaultResourcesCenter) PurchaseUserBalance(ctx context.Context, in *Re
 }
 
 // 根据账户标识使用资源
-func (m *defaultResourcesCenter) UseUserDetailed(ctx context.Context, in *Resources) (*Response, error) {
+func (m *defaultResourcesCenter) UseUserDetailed(ctx context.Context, in *Resources) (*UseUserResponse, error) {
 	client := resourcesCenter.NewResourcesCenterClient(m.cli.Conn())
 	return client.UseUserDetailed(ctx, in)
 }

service/balanceService.go

@@ -110,11 +110,12 @@ func (service *BalanceService) PurchaseUserBalance(balanceData *resourcesCenter.
 }
 
 //根据账户标识使用资源
-func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceData *resourcesCenter.Balance, detailedData *resourcesCenter.Detailed, infoId, url string) (int64, string) {
+func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceData *resourcesCenter.Balance, detailedData *resourcesCenter.Detailed, infoId, url string) (int64, string,int64) {
 	orm := entity.Engine.NewSession()
 	err := orm.Begin()
 	//去重
 	deductionNumb := detailedData.Number
+	deductionNumbs:= detailedData.Number
 	if duplicateRemoval == 1 {
 		dataDesc:=0
 		if detailedData.ResourceType == "标准字段包" {
@@ -125,7 +126,7 @@ func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceDa
 		url = url + "/data/dedupAndSave?dataDesc="+fmt.Sprint(dataDesc)+"&personId=" + detailedData.UserId + "&infoId=" + infoId + "&accountId=" + detailedData.AccountId
 		res, urlerr := http.PostForm(url, nil)
 		if urlerr != nil {
-			return entity.ErrorCode, "去重失败"
+			return entity.ErrorCode, "去重失败",0
 		}
 		defer res.Body.Close()
 		body, _ := ioutil.ReadAll(res.Body)
@@ -133,6 +134,7 @@ func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceDa
 		_ = json.Unmarshal([]byte(body), &dat)
 		if dat.Code == 0 {
 			deductionNumb = dat.Data.NewCount
+			deductionNumbs= dat.Data.NewCount
 		}
 	}
 	//查询结存是否够用
@@ -147,11 +149,11 @@ func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceDa
 	if err != nil {
 		fmt.Println("结存查询失败：", err)
 		orm.Rollback()
-		return entity.ErrorCode, "结存查询失败"
+		return entity.ErrorCode, "结存查询失败",0
 	}
 	surplusNumb, err := strconv.ParseInt(sumStruct, 10, 64)
 	if surplusNumb < deductionNumb {
-		return entity.ErrorCode, "结存不足,请立即充值"
+		return entity.ErrorCode, "结存不足,请立即充值",0
 	}
 	//新增流水记录
 	detailed := entity.Detailed{
@@ -172,11 +174,11 @@ func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceDa
 	if err != nil || insertNumb <= 0 {
 		fmt.Println("新增流水失败：", err)
 		orm.Rollback()
-		return entity.ErrorCode, "新增流水失败"
+		return entity.ErrorCode, "新增流水失败",0
 	}
 	if deductionNumb == 0 {
 		orm.Commit()
-		return entity.SuccessCode, "修改结存成功"
+		return entity.SuccessCode, "修改结存成功",deductionNumb
 	}
 	//修改结存
 	balanceList := []entity.Balance{}
@@ -188,7 +190,7 @@ func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceDa
 	if err != nil {
 		fmt.Println("结存查询失败：", err)
 		orm.Rollback()
-		return entity.ErrorCode, "企业下的组织查询失败"
+		return entity.ErrorCode, "企业下的组织查询失败",0
 	}
 	for _, value := range balanceList {
 		if value.Number > deductionNumb {
@@ -204,14 +206,14 @@ func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceDa
 		if err != nil || updateNumb <= 0 {
 			fmt.Println("结存修改失败：", err)
 			orm.Rollback()
-			return entity.ErrorCode, "结存修改失败"
+			return entity.ErrorCode, "结存修改失败",0
 		}
 		if deductionNumb == 0 {
 			break
 		}
 	}
 	orm.Commit()
-	return entity.SuccessCode, "使用结存成功"
+	return entity.SuccessCode, "使用结存成功",deductionNumbs
 }
 
 //去重查询