fix:支付

server/order/internal/logic/createprepaymentbybalancelogic.go

@@ -33,6 +33,10 @@ func NewCreatePrePaymentByBalanceLogic(ctx context.Context, svcCtx *svc.ServiceC
 func (l *CreatePrePaymentByBalanceLogic) CreatePrePaymentByBalance(req *types.CreatePrePaymentByBalanceReq, userinfo *auth.UserInfo) (resp *basic.Response) {
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
+	if !userinfo.IsUser() {
+		// 如果是，返回未授权的错误码
+		return resp.SetStatus(basic.CodeUnAuth)
+	}
 
 	return resp.SetStatus(basic.CodeOK)
 }

server/order/internal/logic/createprepaymentbydepositlogic.go

@@ -1,6 +1,8 @@
 package logic
 
 import (
+	"fusenapi/constants"
+	"fusenapi/service/repositories"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 
@@ -33,8 +35,43 @@ func NewCreatePrePaymentByDepositLogic(ctx context.Context, svcCtx *svc.ServiceC
 func (l *CreatePrePaymentByDepositLogic) CreatePrePaymentByDeposit(req *types.CreatePrePaymentByDepositReq, userinfo *auth.UserInfo) (resp *basic.Response) {
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
+	if !userinfo.IsUser() {
+		// 如果是，返回未授权的错误码
+		return resp.SetStatus(basic.CodeUnAuth)
+	}
+	if req.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL {
+		if req.DeliveryAddress == nil {
+			return resp.SetStatus(basic.CodeErrOrderCreatePrePaymentParam)
+		} else {
+			if req.DeliveryAddress.Address == "" || req.DeliveryAddress.Mobile == "" || req.DeliveryAddress.Name == "" {
+				return resp.SetStatus(basic.CodeErrOrderCreatePrePaymentParam)
+			}
+		}
+	}
+	var orderAddress repositories.OrderAddress
+	if req.DeliveryAddress != nil {
+		orderAddress.Address = req.DeliveryAddress.Address
+		orderAddress.Mobile = req.DeliveryAddress.Mobile
+		orderAddress.Name = req.DeliveryAddress.Name
+	}
+	res, err := l.svcCtx.Repositories.NewOrder.CreatePrePaymentByDeposit(l.ctx, &repositories.CreatePrePaymentByDepositReq{
+		UserId:          userinfo.UserId,
+		OrderSn:         req.OrderSn,
+		DeliveryMethod:  req.DeliveryMethod,
+		DeliveryAddress: &orderAddress,
+		Country:         "US",
+		Currency:        "usd",
+		StripeKey:       l.svcCtx.Config.PayConfig.Stripe.Key,
+	})
 
-	return resp.SetStatus(basic.CodeOK)
+	if err != nil {
+		return resp.SetStatus(&res.ErrorCode)
+	}
+
+	return resp.SetStatus(basic.CodeOK, map[string]interface{}{
+		"order_detail": res.OrderDetail,
+		"order_pay":    res.OrderPay,
+	})
 }
 
 // 处理逻辑后 w,r 如:重定向, resp 必须重新处理

server/order/internal/logic/orderdetaillogic.go

@@ -43,7 +43,7 @@ func (l *OrderDetailLogic) OrderDetail(req *types.OrderDetailReq, userinfo *auth
 		UserId:  userinfo.UserId,
 	})
 	if err != nil {
-		return resp.SetStatus(basic.CodeApiErr)
+		return resp.SetStatus(&res.ErrorCode)
 	}
 
 	return resp.SetStatus(basic.CodeOK, map[string]interface{}{

server/order/internal/logic/orderlistlogic.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"fusenapi/service/repositories"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 
@@ -33,8 +34,25 @@ func NewOrderListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *OrderLi
 func (l *OrderListLogic) OrderList(req *types.OrderListReq, userinfo *auth.UserInfo) (resp *basic.Response) {
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
+	if !userinfo.IsUser() {
+		// 如果是，返回未授权的错误码
+		return resp.SetStatus(basic.CodeUnAuth)
+	}
+	res, err := l.svcCtx.Repositories.NewOrder.List(l.ctx, &repositories.ListReq{
+		UserId:         userinfo.UserId,
+		DeliveryMethod: req.DeliveryMethod,
+		OrderCycle:     req.OrderCycle,
+		CurrentPage:    req.CurrentPage,
+		PerPage:        req.PerPage,
+	})
+	if err != nil {
+		return resp.SetStatus(basic.CodeApiErr)
+	}
 
-	return resp.SetStatus(basic.CodeOK)
+	return resp.SetStatus(basic.CodeOK, map[string]interface{}{
+		"list": res.OrderDetailList,
+		"meta": res.Meta,
+	})
 }
 
 // 处理逻辑后 w,r 如:重定向, resp 必须重新处理