red-future/slogan
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 虎皮棋适配器内联 payment_order_service + member 服务拆 4 表文件 + file_storage 移入 common

Browse Source
This commit is contained in:
admin
2026-07-31 15:08:36 +08:00
parent 033860d571
commit 527f2e0d18
12 changed files with 383 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
styleagent/controller/member_controller.go
+8 -15
View File
@@ -6,10 +6,7 @@ import (
"fmt"
commonHttp "slogan-agent/common"
"slogan-agent/styleagent/dao"
"slogan-agent/styleagent/model/dto"
"slogan-agent/styleagent/model/entity"
"slogan-agent/styleagent/payment"
"slogan-agent/styleagent/service"
"github.com/gogf/gf/v2/frame/g"
@@ -22,7 +19,7 @@ var Member = new(member)
// PlanList 会员套餐列表
func (c *member) PlanList(ctx context.Context, req *dto.MemberPlanListReq) (res *dto.MemberPlanListRes, err error) {
list, err := service.MemberService.PlanList(ctx)
list, err := service.MemberPlanService.PlanList(ctx)
if err != nil {
return nil, err
}
@@ -31,7 +28,7 @@ func (c *member) PlanList(ctx context.Context, req *dto.MemberPlanListReq) (res
// Status 我的会员状态
func (c *member) Status(ctx context.Context, req *dto.MemberStatusReq) (res *dto.MemberStatusRes, err error) {
st, err := service.MemberService.Status(ctx, commonHttp.GetUserId(g.RequestFromCtx(ctx)))
st, err := service.MemberPlanService.Status(ctx, commonHttp.GetUserId(g.RequestFromCtx(ctx)))
if err != nil {
return nil, err
}
@@ -42,7 +39,7 @@ func (c *member) Status(ctx context.Context, req *dto.MemberStatusReq) (res *dto
// OrderCreate 下单 → 返回支付 URL
func (c *member) OrderCreate(ctx context.Context, req *dto.MemberOrderCreateReq) (res *dto.MemberOrderCreateRes, err error) {
order, payURL, err := service.MemberService.CreateOrder(ctx, commonHttp.GetUserId(g.RequestFromCtx(ctx)), req.PlanId)
order, payURL, err := service.PaymentOrderService.CreateMemberOrder(ctx, commonHttp.GetUserId(g.RequestFromCtx(ctx)), req.PlanId)
if err != nil {
return nil, err
}
@@ -51,7 +48,7 @@ func (c *member) OrderCreate(ctx context.Context, req *dto.MemberOrderCreateReq)
// OrderStatus 订单状态（App 轮询）
func (c *member) OrderStatus(ctx context.Context, req *dto.MemberOrderStatusReq) (res *dto.MemberOrderStatusRes, err error) {
order, err := service.MemberService.OrderStatus(ctx, req.OrderNo)
order, err := service.PaymentOrderService.OrderStatus(ctx, req.OrderNo)
if err != nil || order == nil {
return nil, errors.New("订单不存在")
}
@@ -75,21 +72,17 @@ func MemberNotify(r *ghttp.Request) {
for k, v := range r.GetRequestMap() {
params[k] = fmt.Sprint(v)
}
ok := payment.VerifyNotify(params, hash, g.Cfg().MustGet(ctx, "payment.xunhu_appsecret", "").String())
ok := service.PaymentOrderService.VerifyNotify(params, hash, g.Cfg().MustGet(ctx, "payment.xunhu_appsecret", "").String())
if !ok {
_ = dao.PayNotifyLog.Insert(ctx, &entity.PayNotifyLog{
OrderNo: orderNo, Body: body, Sign: hash, RemoteIp: remoteIP, Status: "bad_sign",
})
_ = service.PayNotifyLogService.Insert(ctx, orderNo, body, hash, remoteIP, "bad_sign")
r.Response.Write("fail")
r.ExitAll()
return
}
state, err := service.MemberService.HandlePaidNotify(ctx, orderNo, r.Get("transaction_id").String(), body)
_ = dao.PayNotifyLog.Insert(ctx, &entity.PayNotifyLog{
OrderNo: orderNo, Body: body, Sign: hash, RemoteIp: remoteIP, Status: state,
})
state, err := service.PaymentOrderService.HandlePaidNotify(ctx, orderNo, r.Get("transaction_id").String(), body)
_ = service.PayNotifyLogService.Insert(ctx, orderNo, body, hash, remoteIP, state)
// duplicate（幂等重复回调）同样返回 success，避免支付渠道无限重试
if err != nil || state == "no_order" {
r.Response.Write("fail")