Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

2023-09-25 15:58:40 +08:00
parent f2a0c7608e 29c7dc54e3
commit 8fe6e8be74
16 changed files with 405 additions and 235 deletions
--- a/server/pay/internal/logic/stripewebhooklogic.go
+++ b/server/pay/internal/logic/stripewebhooklogic.go
@@ -3,8 +3,10 @@ package logic
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"fusenapi/constants"
 	"fusenapi/model/gmodel"
+	"fusenapi/service/repositories"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 	"time"
@@ -52,7 +54,7 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo
 	event := stripe.Event{}

 	if err := json.Unmarshal(req.Payload, &event); err != nil {
-		logc.Errorf(l.ctx, "StripeWebhookLogic StripeWebhook Unmarshal err:", err)
+		logc.Errorf(l.ctx, "StripeWebhookLogic StripeWebhook Unmarshal err:%v", err)
 		return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail")
 	}

@@ -106,7 +108,7 @@ func (l *StripeWebhookLogic) StripeWebhook(req *types.StripeWebhookReq, userinfo
 			logx.Errorf("err：%+v，desc：%s", err, "pay notify Unmarshal fail event.Type payment_intent.succeeded")
 			return resp.SetStatusWithMessage(basic.CodeAesCbcDecryptionErr, "pay notify Unmarshal fail event.Type payment_intent.succeeded")
 		}
-		err = l.HandlePaymentIntentSucceeded(&paymentIntent)
+		err = l.HandlePaymentIntentSucceeded(&paymentIntent, event.ID)
 		if err != nil {
 			logx.Errorf("err：%+v，desc：%s", err, "pay notify handle payment_intent.succeeded")
 			return resp.SetStatusWithMessage(basic.CodePaybackNotOk, "pay notify handle payment_intent.succeeded")
@@ -230,119 +232,27 @@ func (l *StripeWebhookLogic) handlePaymentSessionCompleted(sessionId string, tra
 }

 // 付款成功
-func (l *StripeWebhookLogic) HandlePaymentIntentSucceeded(paymentIntent *stripe.PaymentIntent) error {
-	orderSn, ok := paymentIntent.Metadata["order_sn"]
-	if !ok || orderSn == "" {
-		return errors.New("order_sn not found")
+func (l *StripeWebhookLogic) HandlePaymentIntentSucceeded(paymentIntent *stripe.PaymentIntent, eventId string) error {
+	// 支付成功
+	if paymentIntent.Status == "succeeded" {
+		model, ok := paymentIntent.Metadata["model"]
+		if !ok {
+			err := errors.New("model is empty")
+			logc.Errorf(l.ctx, "PaymentSuccessful failed param, eventId:%s,err:%v", eventId, err)
+			return err
+		}
+		switch model {
+		case "product_order":
+			res, err := l.svcCtx.Repositories.NewOrder.PaymentSuccessful(l.ctx, &repositories.PaymentSuccessfulReq{
+				EventId:       eventId,
+				PaymentMethod: 1,
+				PaymentIntent: paymentIntent,
+			})
+			if err != nil {
+				return err
+			}
+			fmt.Println(res)
+		}
 	}
 	return nil
-	// 查询订单
-
-	// 支付成功
-	// if paymentIntent.Status == "succeeded" {
-	// 	var card string
-	// 	var brand string
-	// 	if paymentIntent.LatestCharge.PaymentMethodDetails != nil {
-	// 		if paymentIntent.LatestCharge.PaymentMethodDetails.Card != nil {
-	// 			if paymentIntent.LatestCharge.PaymentMethodDetails.Card.Last4 != "" {
-	// 				card = paymentIntent.LatestCharge.PaymentMethodDetails.Card.Last4
-	// 			}
-	// 			if paymentIntent.LatestCharge.PaymentMethodDetails.Card.Brand != "" {
-	// 				brand = string(paymentIntent.LatestCharge.PaymentMethodDetails.Card.Brand)
-	// 			}
-	// 		}
-	// 	}
-
-	// 	ctx := l.ctx
-	// 	err = l.svcCtx.MysqlConn.Transaction(func(connGorm *gorm.DB) error {
-	// 		// 更新支付信息
-	// 		payModelT := gmodel.NewFsPayModel(connGorm)
-	// 		*payInfo.PayStatus = 1
-	// 		*payInfo.PayTime = nowTime
-	// 		*payInfo.CardNo = card
-	// 		*payInfo.Brand = brand
-	// 		*payInfo.TradeNo = paymentIntent.ID
-	// 		_, err = payModelT.RBCreateOrUpdate(ctx, payInfo)
-	// 		if err != nil {
-	// 			return err
-	// 		}
-
-	// 		// 更新设计数据
-	// 		productDesignModelT := gmodel.NewFsProductDesignModel(connGorm)
-	// 		productDesignModelTRSB := productDesignModelT.BuilderTrans(ctx, nil)
-	// 		var isPay int64 = 1
-	// 		err = productDesignModelT.RBUpdateByIds(productDesignModelTRSB, designIds, &gmodel.FsProductDesign{IsPay: &isPay})
-	// 		if err != nil {
-	// 			return err
-	// 		}
-
-	// 		var orderInfo = &gmodel.FsOrder{}
-	// 		var orderStatus int64
-	// 		var orderIsPartPay int64
-	// 		var orderPayedAmount int64
-	// 		var orderIsPayCompleted int64
-	// 		// 支付记录是首款
-	// 		if *payInfo.PayStage == int64(constants.PAYSTAGE_DEPOSIT) {
-	// 			orderStatus = int64(constants.STATUS_NEW_PART_PAY)
-	// 			orderIsPartPay = 1
-	// 			orderInfo.IsPartPay = &orderIsPartPay
-	// 			orderPayedAmount = paymentIntent.Amount
-
-	// 			// 删除购物车
-	// 			cartModelT := gmodel.NewFsCartModel(connGorm)
-	// 			cartModelTRSB := cartModelT.BuilderTrans(ctx, nil)
-	// 			err = cartModelT.RBDeleteCartsByIds(cartModelTRSB, cartIds)
-	// 			if err != nil {
-	// 				return err
-	// 			}
-	// 		}
-
-	// 		// 支付记录是尾款
-	// 		if *payInfo.PayStage == int64(constants.PAYSTAGE_REMAINING) {
-	// 			if *fsOrderRelInfo.Status < int64(constants.STATUS_NEW_PAY_COMPLETED) {
-	// 				orderStatus = int64(constants.STATUS_NEW_PAY_COMPLETED)
-	// 			}
-	// 			orderIsPayCompleted = 1
-	// 			orderInfo.IsPayCompleted = &orderIsPayCompleted
-	// 			orderPayedAmount = *fsOrderRelInfo.PayedAmount + paymentIntent.Amount
-	// 		}
-
-	// 		// 更新订单信息
-	// 		orderInfo.Id = fsOrderRelInfo.Id
-	// 		orderInfo.Status = &orderStatus
-	// 		orderInfo.Ptime = &nowTime
-	// 		orderInfo.PayedAmount = &orderPayedAmount
-	// 		orderModelT := gmodel.NewFsOrderModel(connGorm)
-	// 		err = orderModelT.RBUpdate(ctx, orderInfo)
-	// 		if err != nil {
-	// 			return err
-	// 		}
-	// 		return err
-	// 	})
-	// 	if err != nil {
-	// 		return err
-	// 	}
-
-	//千人千面的处理
-	// $renderServer = (new RenderService());
-	// $renderServer->thousandsFacesV2($order->id);
-	// //清除用户最新的设计
-	// $cache = \Yii::$app->cache;
-	// $cache->delete(CacheConfigHelper::LAST_DESIGN . $order->user_id);
-	// //缓存最新订单编号
-	// $cache->set(CacheConfigHelper::USER_ORDERNO . $order->user_id, $order->sn);
-
-	// //查询用户邮箱信息
-	// $user = \api\models\User::find()->where(['id' => $order->user_id])->one();
-	// $redisData = [
-	// 	'key' => 'receipt_download',
-	// 	'param' => [
-	// 		'email' => $user->email,
-	// 		'order_id' => $order->id,
-	// 		'pay_id' => $pay->id,
-	// 		'type' => 1,//付款成功为1
-	// 	]
-	// ];
-	// Email::timely($redisData);
-
 }
--- a/server/pay/internal/svc/servicecontext.go
+++ b/server/pay/internal/svc/servicecontext.go
@@ -18,8 +18,9 @@ type ServiceContext struct {
 	Config      config.Config
 	SharedState *shared.SharedState

-	MysqlConn *gorm.DB
-	AllModels *gmodel.AllModelsGen
+	MysqlConn    *gorm.DB
+	AllModels    *gmodel.AllModelsGen
+	Repositories *initalize.Repositories
 }

 func NewServiceContext(c config.Config) *ServiceContext {
@@ -31,6 +32,9 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		MysqlConn:   conn,
 		SharedState: nil,
 		AllModels:   gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
+		Repositories: initalize.NewAllRepositories(&initalize.NewAllRepositorieData{
+			GormDB: conn,
+		}),
 	}
 }

--- a/server/shopping-cart/internal/logic/getcartslogic.go
+++ b/server/shopping-cart/internal/logic/getcartslogic.go
@@ -41,32 +41,24 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo
 	if !userinfo.IsUser() {
 		return resp.SetStatusWithMessage(basic.CodeUnAuth, "please sign in")
 	}
-	if req.CurrentPage <= 0 {
-		req.CurrentPage = constants.DEFAULT_PAGE
-	}
+	currentPage := constants.DEFAULT_PAGE
 	limit := 300
 	//获取用户购物车列表
+	var cartIds []int64
+	if req.CartId > 0 {
+		cartIds = append(cartIds, req.CartId)
+	}
 	carts, total, err := l.svcCtx.AllModels.FsShoppingCart.GetAllCartsByParam(l.ctx, gmodel.GetAllCartsByParamReq{
+		Ids:    cartIds,
 		UserId: userinfo.UserId,
 		Sort:   "id DESC",
-		Page:   req.CurrentPage,
+		Page:   currentPage,
 		Limit:  limit,
 	})
 	if err != nil {
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "system err:failed to get your shopping carts")
 	}
-	if len(carts) == 0 {
-		return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetCartsRsp{
-			Meta: types.Meta{
-				TotalCount:  total,
-				PageCount:   int64(math.Ceil(float64(total) / float64(limit))),
-				CurrentPage: req.CurrentPage,
-				PerPage:     limit,
-			},
-			CartList: nil,
-		})
-	}
 	var (
 		mapSize             = make(map[int64]gmodel.FsProductSize)
 		mapModel            = make(map[int64]gmodel.FsProductModel3d)
@@ -201,7 +193,7 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo
 		Meta: types.Meta{
 			TotalCount:  total,
 			PageCount:   int64(math.Ceil(float64(total) / float64(limit))),
-			CurrentPage: req.CurrentPage,
+			CurrentPage: currentPage,
 			PerPage:     limit,
 		},
 		CartList: list,
--- a/server/shopping-cart/internal/types/types.go
+++ b/server/shopping-cart/internal/types/types.go
@@ -30,7 +30,7 @@ type DeleteCartReq struct {
 }

 type GetCartsReq struct {
-	CurrentPage int `form:"current_page"` //当前页
+	CartId int64 `form:"cart_id,optional"` //购物车ids可选
 }

 type GetCartsRsp struct {
--- a/server/websocket/internal/logic/ws_render_image.go
+++ b/server/websocket/internal/logic/ws_render_image.go
@@ -49,7 +49,7 @@ func (r *renderProcessor) allocationMessage(w *wsConnectItem, data []byte) {
 		return
 	case w.extendRenderProperty.renderChan <- renderImageData: //发入到缓冲队列
 		return
-	case <- time.After(time.Millisecond * 50)://超过50毫秒丢弃
+	case <-time.After(time.Millisecond * 50): //超过50毫秒丢弃
 		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "渲染队列溢出，请稍后再发", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
 		return
 	}
@@ -70,7 +70,9 @@ func (w *wsConnectItem) consumeRenderImageData() {
 		case <-w.closeChan: //已关闭
 			return
 		case data := <-w.extendRenderProperty.renderChan: //消费数据
+			logx.Info("准备执行任务。。。。。")
 			limitChan <- struct{}{}
+			logx.Info("执行任务中。。。。。")
 			go func(d websocket_data.RenderImageReqMsg) {
 				defer func() {
 					if err := recover(); err != nil {
@@ -179,17 +181,11 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
 			Index: renderImageData.RenderData.TemplateTagColor.SelectedColorIndex,
 		},
 	}
-	res := &repositories.LogoCombineRes{}
-	if w.userId == 127{
-		u := "https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/1c4549bea75f9247f8aee5f7f6f3909a551cef97dc7acb0d01568b8bad042a01"
-		res.ResourceUrl = &u
-	}else{
-		res, err = w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
-		if err != nil {
-			w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "合成刀版图失败:"+err.Error(), renderImageData.RenderData.ProductId, w.userId, w.guestId, productTemplate.Id, model3dInfo.Id, productSize.Id, *productTemplate.ElementModelId)
-			logx.Error("合成刀版图失败,合成请求数据:", combineReq, "错误信息:", err)
-			return
-		}
+	res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
+	if err != nil {
+		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "合成刀版图失败:"+err.Error(), renderImageData.RenderData.ProductId, w.userId, w.guestId, productTemplate.Id, model3dInfo.Id, productSize.Id, *productTemplate.ElementModelId)
+		logx.Error("合成刀版图失败,合成请求数据:", combineReq, "错误信息:", err)
+		return
 	}
 	combineImage := "" //刀版图
 	if res != nil && res.ResourceUrl != nil {