From 412350cf8a5707088941da45e78d9969037370cb Mon Sep 17 00:00:00 2001
From: lzh <1625167628@qq.com>
Date: Mon, 16 Jun 2025 14:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/logic/bundleExtendLogic.go | 45 +++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/internal/logic/bundleExtendLogic.go b/internal/logic/bundleExtendLogic.go
index cc39707..9843c2d 100644
--- a/internal/logic/bundleExtendLogic.go
+++ b/internal/logic/bundleExtendLogic.go
@@ -1,11 +1,13 @@
 package logic
 
 import (
+	"errors"
 	"micro-bundle/internal/dao"
 	"micro-bundle/internal/model"
 	"micro-bundle/pb/bundle"
 	"time"
 
+	"dubbo.apache.org/dubbo-go/v3/common/logger"
 	"github.com/jinzhu/copier"
 	"github.com/samber/lo"
 )
@@ -23,15 +25,21 @@ func BundleExtend(req *bundle.BundleExtendRequest) (*bundle.BundleExtendResponse
 		AccountNumber:        int(req.AccountAdditional),
 		ExpansionPacksNumber: 1,
 	}); err != nil {
-		return nil, err
+		return nil, errors.New("用户没有余量信息")
 	}
-	return nil, dao.AddBundleExtendRecord(data)
+	err := dao.AddBundleExtendRecord(data)
+	if err != nil {
+		logger.Error(err)
+		return nil, errors.New("创建扩展记录失败")
+	}
+	return nil, nil
 }
 
 func BundleExtendRecordsList(req *bundle.BundleExtendRecordsListRequest) (*bundle.BundleExtendRecordsListResponse, error) {
 	data, total, err := dao.GetBundleExtendRecordList(req)
 	if err != nil {
-		return nil, err
+		logger.Error(err)
+		return nil, errors.New("查询失败")
 	}
 	resp := &bundle.BundleExtendRecordsListResponse{}
 	resp.Total = total
@@ -46,7 +54,8 @@ func BundleExtendRecordsList(req *bundle.BundleExtendRecordsListRequest) (*bundl
 func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (*bundle.GetBundleBalanceListResp, error) {
 	data, total, err := dao.GetBundleBalanceList(req)
 	if err != nil {
-		return nil, err
+		logger.Error(err)
+		return nil, errors.New("查询失败")
 	}
 	resp := &bundle.GetBundleBalanceListResp{}
 	resp.Total = total
@@ -61,7 +70,8 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (*bundle.GetBundl
 func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (*bundle.GetBundleBalanceByUserIdResp, error) {
 	data, err := dao.GetBundleBalanceByUserId(req)
 	if err != nil {
-		return nil, err
+		logger.Error(err)
+		return nil, errors.New("查询失败")
 	}
 	result := &bundle.GetBundleBalanceByUserIdResp{}
 	copier.Copy(result, &data)
@@ -75,7 +85,8 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (*bundle.
 func AddBundleBalance(req *bundle.AddBundleBalanceReq) (*bundle.AddBundleBalanceResp, error) {
 	var data model.BundleBalance
 	if err := copier.Copy(&data, req); err != nil {
-		return nil, err
+		logger.Error(err)
+		return nil, errors.New("操作失败")
 	}
 	return nil, dao.AddBundleBalanceByUserId(data)
 }
@@ -83,15 +94,22 @@ func AddBundleBalance(req *bundle.AddBundleBalanceReq) (*bundle.AddBundleBalance
 func CreateBundleBalance(req *bundle.CreateBundleBalanceReq) (*bundle.CreateBundleBalanceResp, error) {
 	var data model.BundleBalance
 	if err := copier.Copy(&data, req); err != nil {
-		return nil, err
+		logger.Error(err)
+		return nil, errors.New("操作失败")
 	}
-	return nil, dao.CreateBundleBalance(data)
+	err := dao.CreateBundleBalance(data)
+	if err != nil {
+		logger.Error(err)
+		return nil, errors.New("创建余量信息失败")
+	}
+	return nil, nil
 }
 
 func GetUsedRecord(req *bundle.GetUsedRecordListReq) (*bundle.GetUsedRecordListResp, error) {
 	data, total, err := dao.GetUsedRecord(req)
 	if err != nil {
-		return nil, err
+		logger.Error(err)
+		return nil, errors.New("查询失败")
 	}
 	resp := &bundle.GetUsedRecordListResp{}
 	resp.Total = total
@@ -106,7 +124,8 @@ func GetUsedRecord(req *bundle.GetUsedRecordListReq) (*bundle.GetUsedRecordListR
 func GetImageWorkDetail(req *bundle.GetImageWorkDetailReq) (*bundle.GetImageWorkDetailResp, error) {
 	data, err := dao.GetImageWorkDetail(req)
 	if err != nil {
-		return nil, err
+		logger.Error(err)
+		return nil, errors.New("查询失败")
 	}
 	result := &bundle.GetImageWorkDetailResp{}
 	err = copier.Copy(result, &data)
@@ -116,7 +135,8 @@ func GetImageWorkDetail(req *bundle.GetImageWorkDetailReq) (*bundle.GetImageWork
 func GetVedioWorkDetail(req *bundle.GetVedioWorkDetailReq) (*bundle.GetVedioeWorkDetailResp, error) {
 	data, err := dao.GetVedioWorkDetail(req)
 	if err != nil {
-		return nil, err
+		logger.Error(err)
+		return nil, errors.New("查询失败")
 	}
 	result := &bundle.GetVedioeWorkDetailResp{}
 	err = copier.Copy(result, &data)
@@ -126,7 +146,8 @@ func GetVedioWorkDetail(req *bundle.GetVedioWorkDetailReq) (*bundle.GetVedioeWor
 func ToBeComfirmedWorks(req *bundle.ToBeComfirmedWorksReq) (*bundle.ToBeComfirmedWorksResp, error) {
 	data, total, err := dao.ToBeComfirmedWorks(req)
 	if err != nil {
-		return nil, err
+		logger.Error(err)
+		return nil, errors.New("查询失败")
 	}
 	result := &bundle.ToBeComfirmedWorksResp{}
 	result.Total = total