heqiapp/platforms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: integrate unified payment and wallet refunds

Browse Source
This commit is contained in:
yanweidong
2026-08-02 23:24:32 +08:00
parent f0b8af0bc8
commit 82a2106a97
64 changed files with 1519 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
backend/api/internal/logic/client/user/gasorder.go
View File

@@ -5,6 +5,7 @@ import (
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/heqiapp/platforms/backend/api/internal/impl"
common "git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
"git.apinb.com/heqiapp/platforms/backend/api/internal/logic/payment"
"git.apinb.com/heqiapp/platforms/backend/api/internal/models"
"github.com/gin-gonic/gin"
)
@@ -36,6 +37,36 @@ func ServiceRelation(ctx *gin.Context) {
infra.Response.Success(ctx, response)
}
// PayGasOrder 为本人未履约供气订单创建统一第三方支付单。
func PayGasOrder(ctx *gin.Context) {
account, ok := common.UserAccount(ctx)
if !ok {
return
}
var request struct {
RequestNo string `json:"request_no" binding:"required"`
Channel string `json:"channel" binding:"required,oneof=alipay wechat"`
PayType string `json:"pay_type" binding:"required"`
OpenID string `json:"openid"`
}
if ctx.ShouldBindJSON(&request) != nil {
infra.Response.Error(ctx, errcode.ErrInvalidArgument)
return
}
var order models.GasorderBasic
if err := impl.DBService.Where("identity = ? AND user_account_id = ? AND order_status IN ?", ctx.Param("identity"), account.ID, []int{common.StatusCreated, common.StatusAssigned}).First(&order).Error; err != nil {
infra.Response.Error(ctx, err)
return
}
payOrder, err := payment.Create(ctx, payment.CreateInput{RequestNo: request.RequestNo, BusinessType: "gasorder", BusinessIdentity: order.Identity,
UserIdentity: account.Identity, Channel: request.Channel, PayType: request.PayType, Subject: "和气供气订单 " + order.OrderNo, OpenID: request.OpenID, Amount: order.PayableAmount})
if err != nil {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, payment.PublicResponse(payOrder))
}
// ListGasContracts 返回用户自己的供气合同。
func ListGasContracts(ctx *gin.Context) {
account, ok := common.UserAccount(ctx)
@@ -47,7 +78,18 @@ func ListGasContracts(ctx *gin.Context) {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, common.ResourceResponse(list))
response := make([]gin.H, 0, len(list))
for _, order := range list {
var items []models.GasorderItem
if err := impl.DBService.Where("gasorder_basic_id = ?", order.ID).Find(&items).Error; err != nil {
infra.Response.Error(ctx, err)
return
}
value := common.ResourceResponse(order).(map[string]any)
value["items"] = common.ResourceResponse(items)
response = append(response, value)
}
infra.Response.Success(ctx, response)
}
// ListGasOrders 返回用户自己的供气订单。

48
backend/api/internal/logic/client/user/refund.go Normal file
View File

@@ -0,0 +1,48 @@
package user
import (
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/heqiapp/platforms/backend/api/internal/impl"
"git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
"git.apinb.com/heqiapp/platforms/backend/api/internal/logic/payment"
"git.apinb.com/heqiapp/platforms/backend/api/internal/models"
"github.com/gin-gonic/gin"
)
func CreateRefund(businessType string) gin.HandlerFunc {
return func(ctx *gin.Context) {
account, ok := common.UserAccount(ctx)
if !ok {
return
}
var request struct {
RequestNo string `json:"request_no" binding:"required"`
Reason string `json:"reason" binding:"required"`
Description string `json:"description"`
Items []payment.RefundItemInput `json:"items" binding:"required,min=1"`
}
if ctx.ShouldBindJSON(&request) != nil {
infra.Response.Error(ctx, errcode.ErrInvalidArgument)
return
}
refund, err := payment.CreateRefund(account.ID, account.Identity, businessType, ctx.Param("identity"), payment.RefundInput{RequestNo: request.RequestNo, Reason: request.Reason, Description: request.Description, Items: request.Items})
if err != nil {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, common.ResourceResponse(refund))
}
}
func ListRefunds(ctx *gin.Context) {
account, ok := common.UserAccount(ctx)
if !ok {
return
}
var list []models.PaymentRefund
if err := impl.DBService.Where("user_identity = ?", account.Identity).Order("created_at desc").Find(&list).Error; err != nil {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, common.ResourceResponse(list))
}

34
backend/api/internal/logic/client/user/shop.go
View File

@@ -8,6 +8,7 @@ import (
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/heqiapp/platforms/backend/api/internal/impl"
common "git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
"git.apinb.com/heqiapp/platforms/backend/api/internal/logic/payment"
"git.apinb.com/heqiapp/platforms/backend/api/internal/models"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
@@ -21,7 +22,18 @@ func PublicProducts(ctx *gin.Context) {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, common.ResourceResponse(list))
response := make([]gin.H, 0, len(list))
for _, order := range list {
var items []models.EcOrderItem
if err := impl.DBService.Where("ec_order_id = ?", order.ID).Find(&items).Error; err != nil {
infra.Response.Error(ctx, err)
return
}
value := common.ResourceResponse(order).(map[string]any)
value["items"] = common.ResourceResponse(items)
response = append(response, value)
}
infra.Response.Success(ctx, response)
}
// CreateShopOrder 按服务端价格创建订单并原子扣减库存。
@@ -150,13 +162,31 @@ func PayShopOrder(ctx *gin.Context) {
return
}
var request struct {
PaymentPassword string `json:"payment_password" binding:"required"`
PaymentPassword string `json:"payment_password"`
RequestNo string `json:"request_no" binding:"required"`
Channel string `json:"channel" binding:"required,oneof=wallet alipay wechat"`
PayType string `json:"pay_type"`
OpenID string `json:"openid"`
}
if ctx.ShouldBindJSON(&request) != nil {
infra.Response.Error(ctx, errcode.ErrInvalidArgument)
return
}
if request.Channel != "wallet" {
var order models.EcOrder
if err := impl.DBService.Where("identity = ? AND user_account_id = ? AND order_status = ?", ctx.Param("identity"), account.ID, 16).First(&order).Error; err != nil {
infra.Response.Error(ctx, err)
return
}
payOrder, err := payment.Create(ctx, payment.CreateInput{RequestNo: request.RequestNo, BusinessType: "ec_order", BusinessIdentity: order.Identity,
UserIdentity: account.Identity, Channel: request.Channel, PayType: request.PayType, Subject: "和气商城订单 " + order.OrderNo, OpenID: request.OpenID, Amount: order.PayableAmount})
if err != nil {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, payment.PublicResponse(payOrder))
return
}
err := impl.DBService.Transaction(func(tx *gorm.DB) error {
var order models.EcOrder
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).