feat:新增订单发票,下单地址调整

server/order/internal/config/config.go

@@ -19,4 +19,13 @@ type Config struct {
 			SuccessURL     string
 		}
 	}
+	AWS struct {
+		S3 struct {
+			Credentials struct {
+				AccessKeyID string
+				Secret      string
+				Token       string
+			}
+		}
+	}
 }

server/order/internal/handler/orderinvoicehandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/order/internal/logic"
+	"fusenapi/server/order/internal/svc"
+	"fusenapi/server/order/internal/types"
+)
+
+func OrderInvoiceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.OrderInvoiceReq
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewOrderInvoiceLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.OrderInvoice(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl, resp) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/order/internal/handler/routes.go

@@ -37,6 +37,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/order/close",
 				Handler: CloseOrderHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/api/order/invoice",
+				Handler: OrderInvoiceHandler(serverCtx),
+			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/api/order/list",

server/order/internal/logic/createprepaymentbydepositlogic.go

@@ -43,16 +43,28 @@ func (l *CreatePrePaymentByDepositLogic) CreatePrePaymentByDeposit(req *types.Cr
 		if req.DeliveryAddress == nil {
 			return resp.SetStatus(basic.CodeErrOrderCreatePrePaymentParam)
 		} else {
-			if req.DeliveryAddress.Address == "" || req.DeliveryAddress.Mobile == "" || req.DeliveryAddress.Name == "" {
+			if req.DeliveryAddress.Street == "" ||
+				req.DeliveryAddress.City == "" ||
+				req.DeliveryAddress.Mobile == "" ||
+				req.DeliveryAddress.State == "" ||
+				req.DeliveryAddress.Suite == "" ||
+				req.DeliveryAddress.ZipCode == "" ||
+				req.DeliveryAddress.LastName == "" ||
+				req.DeliveryAddress.FirstName == "" {
 				return resp.SetStatus(basic.CodeErrOrderCreatePrePaymentParam)
 			}
 		}
 	}
 	var orderAddress repositories.OrderAddress
 	if req.DeliveryAddress != nil {
-		orderAddress.Address = req.DeliveryAddress.Address
+		orderAddress.Street = req.DeliveryAddress.Street
+		orderAddress.City = req.DeliveryAddress.City
+		orderAddress.FirstName = req.DeliveryAddress.FirstName
+		orderAddress.LastName = req.DeliveryAddress.LastName
 		orderAddress.Mobile = req.DeliveryAddress.Mobile
-		orderAddress.Name = req.DeliveryAddress.Name
+		orderAddress.State = req.DeliveryAddress.State
+		orderAddress.Suite = req.DeliveryAddress.Suite
+		orderAddress.ZipCode = req.DeliveryAddress.ZipCode
 	}
 	res, err := l.svcCtx.Repositories.NewOrder.CreatePrePaymentByDeposit(l.ctx, &repositories.CreatePrePaymentByDepositReq{
 		UserId:          userinfo.UserId,

server/order/internal/logic/orderinvoicelogic.go

@@ -0,0 +1,57 @@
+package logic
+
+import (
+	"fusenapi/service/repositories"
+	"fusenapi/utils/auth"
+	"fusenapi/utils/basic"
+
+	"context"
+
+	"fusenapi/server/order/internal/svc"
+	"fusenapi/server/order/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type OrderInvoiceLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewOrderInvoiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *OrderInvoiceLogic {
+	return &OrderInvoiceLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+// 处理进入前逻辑w,r
+// func (l *OrderInvoiceLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
+// }
+
+func (l *OrderInvoiceLogic) OrderInvoice(req *types.OrderInvoiceReq, 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.Invoice(l.ctx, &repositories.InvoiceReq{
+		OrderSn: req.OrderSn,
+		UserId:  userinfo.UserId,
+	})
+	if err != nil {
+		return resp.SetStatus(&res.ErrorCode)
+	}
+
+	return resp.SetStatus(basic.CodeOK, map[string]interface{}{
+		"invoice_urls": res.InvoiceUrls,
+	})
+}
+
+// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
+// func (l *OrderInvoiceLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
+// // httpx.OkJsonCtx(r.Context(), w, resp)
+// }

server/order/internal/svc/servicecontext.go

@@ -7,6 +7,9 @@ import (
 	"fusenapi/initalize"
 	"fusenapi/model/gmodel"
 
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"gorm.io/gorm"
 )
 
@@ -20,10 +23,14 @@ type ServiceContext struct {
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
+	configAWS := aws.Config{
+		Credentials: credentials.NewStaticCredentials(c.AWS.S3.Credentials.AccessKeyID, c.AWS.S3.Credentials.Secret, c.AWS.S3.Credentials.Token),
+	}
 	conn := initalize.InitMysql(c.SourceMysql)
 	// delayQueue := initalize.InitDelayMessage()
 	repositories := initalize.NewAllRepositories(&initalize.NewAllRepositorieData{
-		GormDB: conn,
+		GormDB:     conn,
+		AwsSession: session.Must(session.NewSession(&configAWS)),
 		// DelayQueue: delayQueue,
 	})
 

server/order/internal/types/types.go

@@ -5,6 +5,10 @@ import (
 	"fusenapi/utils/basic"
 )
 
+type OrderInvoiceReq struct {
+	OrderSn string `form:"order_sn"`
+}
+
 type CloseOrderReq struct {
 	OrderSn string `json:"order_sn"`
 }
@@ -28,9 +32,14 @@ type CreatePrePaymentByDepositReq struct {
 }
 
 type DeliveryAddress struct {
-	Address string `json:"address,optional"`
-	Name    string `json:"name,optional"`
-	Mobile  string `json:"mobile,optional"`
+	Street    string `json:"street,optional"`     // 街道
+	City      string `json:"city,optional"`       // 城市
+	FirstName string `json:"first_name,optional"` // 姓
+	LastName  string `json:"last_name,optional"`  // 名
+	Mobile    string `json:"mobile,optional"`     // 手机
+	State     string `json:"state,optional"`      // 州
+	Suite     string `json:"suite,optional"`      // 房号
+	ZipCode   string `json:"zip_code,optional"`   // 邮编
 }
 
 type CreatePrePaymentByBalanceReq struct {