Compare commits
30 Commits
4a48add783
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 5d7030a065 | |||
| 664b7b2841 | |||
| 205bcbe93d | |||
| f10b2dd077 | |||
| 70a105fffc | |||
| 13ede24773 | |||
| b305d5300d | |||
| 763332d60d | |||
| 39791236bc | |||
| 397256d7c3 | |||
| 84e88c61c2 | |||
| 625207e013 | |||
| 83bd8d9c5c | |||
| 9e10b5f2e9 | |||
| b1a9f60bb0 | |||
| 9f509924b3 | |||
| 1417804b66 | |||
| 663ad1af0d | |||
| 23ad0477b2 | |||
| 3090cd62c8 | |||
| 2c016dc346 | |||
| c1796251d0 | |||
| 2ca14de27e | |||
| f079980608 | |||
| c288fd2d2a | |||
| d17d2fffe5 | |||
| 9e9a54efb5 | |||
| af7d34c444 | |||
| c768fbfc0f | |||
| a30d77845d |
411
YunYinSignPay.json
Normal file
411
YunYinSignPay.json
Normal file
@@ -0,0 +1,411 @@
|
||||
{
|
||||
"openapi": "3.0.1",
|
||||
"info": {
|
||||
"title": "默认模块",
|
||||
"description": "",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"tags": [],
|
||||
"paths": {
|
||||
"/service/getAccessToken": {
|
||||
"post": {
|
||||
"summary": "获取token",
|
||||
"deprecated": false,
|
||||
"description": "",
|
||||
"tags": [],
|
||||
"parameters": [],
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"appId": {
|
||||
"type": "string"
|
||||
},
|
||||
"appSecret": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"appId",
|
||||
"appSecret"
|
||||
]
|
||||
},
|
||||
"example": {
|
||||
"appId": "7226242043420468",
|
||||
"appSecret": "ceac4dc740e3443bbb1433fbe9723326"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"headers": {}
|
||||
}
|
||||
},
|
||||
"security": []
|
||||
}
|
||||
},
|
||||
"/member/infoByCorpId": {
|
||||
"post": {
|
||||
"summary": "获取操作id",
|
||||
"deprecated": false,
|
||||
"description": "",
|
||||
"tags": [],
|
||||
"parameters": [
|
||||
{
|
||||
"name": "appId",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": "7226242043420468",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "accessToken",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": "8629c8131fd83e116fd5b2fd30c2d9383f5af181",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
],
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"mobile": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"mobile"
|
||||
]
|
||||
},
|
||||
"example": {
|
||||
"mobile": "18566214578"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"headers": {}
|
||||
}
|
||||
},
|
||||
"security": []
|
||||
}
|
||||
},
|
||||
"/signTask/startSignFlow": {
|
||||
"post": {
|
||||
"summary": "发起签署",
|
||||
"deprecated": false,
|
||||
"description": "",
|
||||
"tags": [],
|
||||
"parameters": [
|
||||
{
|
||||
"name": "appId",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": " 7226242043420468",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "accessToken",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": " 8629c8131fd83e116fd5b2fd30c2d9383f5af181",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "userId",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": " 1460277348929680384",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "source",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": " pc",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Content-Type",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": " application/json",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
],
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"templateId": {
|
||||
"type": "integer"
|
||||
},
|
||||
"templateName": {
|
||||
"type": "string"
|
||||
},
|
||||
"autoFill": {
|
||||
"type": "integer"
|
||||
},
|
||||
"sourceOrderCode": {
|
||||
"type": "string"
|
||||
},
|
||||
"participantList": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"participantFlag": {
|
||||
"type": "string"
|
||||
},
|
||||
"psnAccount": {
|
||||
"type": "string"
|
||||
},
|
||||
"psnName": {
|
||||
"type": "string"
|
||||
},
|
||||
"participantCorpName": {
|
||||
"type": "string"
|
||||
},
|
||||
"participantType": {
|
||||
"type": "integer"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"participantFlag",
|
||||
"psnAccount",
|
||||
"psnName",
|
||||
"participantType"
|
||||
]
|
||||
}
|
||||
},
|
||||
"fillComponents": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"componentKey": {
|
||||
"type": "string"
|
||||
},
|
||||
"componentValue": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"componentKey",
|
||||
"componentValue"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"templateId",
|
||||
"templateName",
|
||||
"autoFill",
|
||||
"sourceOrderCode",
|
||||
"participantList",
|
||||
"fillComponents"
|
||||
]
|
||||
},
|
||||
"example": {
|
||||
"templateCode": "TP1461036991700317184",
|
||||
"templateName": "信息服务授权书",
|
||||
"autoFill": 1,
|
||||
"sourceOrderCode": "Q_20260113123414384",
|
||||
"participantList": [
|
||||
{
|
||||
"participantFlag": "签署方1",
|
||||
"psnAccount": "18566214578",
|
||||
"psnName": "陈立",
|
||||
"participantCorpName": "海口开麦贸易有限公司",
|
||||
"participantType": 1
|
||||
},
|
||||
{
|
||||
"participantFlag": "签署方2",
|
||||
"psnAccount": "18276151590",
|
||||
"psnName": "张荣宏",
|
||||
"participantType": 0,
|
||||
"payeeContractFlag": 1,
|
||||
"payee": {
|
||||
"amount": 0.1,
|
||||
"priority": "1"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"headers": {}
|
||||
}
|
||||
},
|
||||
"security": []
|
||||
}
|
||||
},
|
||||
"/signTask/contract/appletForParticipant": {
|
||||
"post": {
|
||||
"summary": "获取签署支付链接",
|
||||
"deprecated": false,
|
||||
"description": "",
|
||||
"tags": [],
|
||||
"parameters": [
|
||||
{
|
||||
"name": "appId",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": " 7226242043420468",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "accessToken",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": "8629c8131fd83e116fd5b2fd30c2d9383f5af181",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "userId",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": " 1460277348929680384",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "source",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": " pc",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Content-Type",
|
||||
"in": "header",
|
||||
"description": "",
|
||||
"required": true,
|
||||
"example": " application/json",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
],
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"participantId": {
|
||||
"type": "string"
|
||||
},
|
||||
"type": {
|
||||
"type": "integer"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"participantId",
|
||||
"type"
|
||||
]
|
||||
},
|
||||
"example": {
|
||||
"participantId": "1461532166079941632",
|
||||
"type": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"headers": {}
|
||||
}
|
||||
},
|
||||
"security": []
|
||||
}
|
||||
}
|
||||
},
|
||||
"components": {
|
||||
"schemas": {},
|
||||
"responses": {},
|
||||
"securitySchemes": {}
|
||||
},
|
||||
"servers": [],
|
||||
"security": []
|
||||
}
|
||||
@@ -22,6 +22,14 @@ service main {
|
||||
// 微信退款回调
|
||||
@handler WechatPayRefundCallback
|
||||
post /pay/wechat/refund_callback
|
||||
|
||||
// 易支付回调
|
||||
@handler EasyPayCallback
|
||||
get /pay/easypay/callback
|
||||
|
||||
// 云印签支付回调
|
||||
@handler YunYinSignPayCallback
|
||||
post /pay/yunyinsign/callback
|
||||
}
|
||||
|
||||
@server (
|
||||
@@ -40,12 +48,16 @@ service main {
|
||||
|
||||
@handler PaymentCheck
|
||||
post /pay/check (PaymentCheckReq) returns (PaymentCheckResp)
|
||||
|
||||
// 云印签退款
|
||||
@handler YunYinSignPayRefund
|
||||
post /pay/yunyinsign/refund (YunYinSignPayRefundReq) returns (YunYinSignPayRefundResp)
|
||||
}
|
||||
|
||||
type (
|
||||
PaymentReq {
|
||||
Id string `json:"id"`
|
||||
PayMethod string `json:"pay_method"` // 支付方式: wechat, alipay, appleiap, test(仅开发环境), test_empty(仅开发环境-空报告模式)
|
||||
PayMethod string `json:"pay_method"` // 支付方式: wechat, alipay, easypay_alipay, appleiap, yunyinSignPay, yunyinSignPay_wechat, yunyinSignPay_alipay, test(仅开发环境), test_empty(仅开发环境-空报告模式)
|
||||
// 系统简化：移除 agent_vip, agent_upgrade 支付类型
|
||||
PayType string `json:"pay_type" validate:"required,oneof=query"`
|
||||
}
|
||||
@@ -68,5 +80,15 @@ type (
|
||||
OrderID string `json:"order_id" validate:"required"`
|
||||
TransactionReceipt string `json:"transaction_receipt" validate:"required"`
|
||||
}
|
||||
YunYinSignPayRefundReq {
|
||||
OrderNo string `json:"order_no"` // 订单号（sourceOrderCode），与 participate_id 二选一
|
||||
ParticipateId int64 `json:"participate_id,omitempty"` // 参与方ID，与 order_no 二选一
|
||||
RefundAmount float64 `json:"refund_amount" validate:"required,gt=0"` // 退款金额，必须大于0
|
||||
RefundReason string `json:"refund_reason,omitempty"` // 退款原因
|
||||
}
|
||||
YunYinSignPayRefundResp {
|
||||
Success bool `json:"success"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -78,7 +78,29 @@ Tianyuanapi:
|
||||
BaseURL: "https://api.tianyuanapi.com"
|
||||
Timeout: 60
|
||||
Authorization:
|
||||
FileBaseURL: "https://www.dsjcq168.cn/api/v1/auth-docs" # 授权书文件访问基础URL
|
||||
FileBaseURL: "https://www.dsjcx666.icu/api/v1/auth-docs" # 授权书文件访问基础URL
|
||||
Promotion:
|
||||
PromotionDomain: "http://localhost:8888" # 推广域名（用于生成短链）
|
||||
OfficialDomain: "http://localhost:5678" # 正式站点域名（短链重定向的目标域名）
|
||||
EasyPay:
|
||||
Enabled: true
|
||||
ApiURL: "https://zpayz.cn/"
|
||||
PID: "2025123009590455"
|
||||
PKEY: "f61pwaOj93lYpesM82ZnPAVwFojuSL7F"
|
||||
CIDs: ["12200"] # 支付渠道ID数组，可配置一个或多个，多个时会按RotateDays轮询
|
||||
# CIDs: ["12200", "12201", "12202"] # 多个渠道示例，会按RotateDays天数轮询
|
||||
RotateDays: 3 # 渠道轮询天数，默认3天（仅在配置了多个CIDs时生效）
|
||||
RotateMode: "count" # 轮询模式：day（天数轮询）或 count（次数轮询），默认count
|
||||
NotifyUrl: "https://www.dsjcx666.icu/api/v1/pay/easypay/callback"
|
||||
ReturnUrl: "https://www.dsjcx666.icu/payment/result"
|
||||
YunYinSignPay:
|
||||
Enabled: true
|
||||
ApiURL: "https://openapi.yunyinsign.com"
|
||||
AppID: "7226242043420468"
|
||||
AppSecret: "ceac4dc740e3443bbb1433fbe9723326"
|
||||
Mobile: "18566214578"
|
||||
Name: "陈立"
|
||||
CorpName: "海口开麦贸易有限公司"
|
||||
TemplateID: "1461036991700317185"
|
||||
TemplateCode: "TP1461036991700317184" # 需要配置实际的模板ID
|
||||
TemplateName: "信息服务授权书" # 需要配置实际的模板名称
|
||||
|
||||
@@ -31,8 +31,8 @@ Alipay:
|
||||
AlipayCertPath: "etc/merchant/alipayCertPublicKey_RSA2.crt"
|
||||
AlipayRootCertPath: "etc/merchant/alipayRootCert.crt"
|
||||
IsProduction: true
|
||||
NotifyUrl: "https://www.dsjcq168.cn/api/v1/pay/alipay/callback"
|
||||
ReturnURL: "https://www.dsjcq168.cn/payment/result"
|
||||
NotifyUrl: "https://www.dsjcx666.icu/api/v1/pay/alipay/callback"
|
||||
ReturnURL: "https://www.dsjcx666.icu/payment/result"
|
||||
Wxpay:
|
||||
Enabled: false
|
||||
AppID: ""
|
||||
@@ -78,7 +78,28 @@ Tianyuanapi:
|
||||
BaseURL: "https://api.tianyuanapi.com"
|
||||
Timeout: 60
|
||||
Authorization:
|
||||
FileBaseURL: "https://www.dsjcq168.cn/api/v1/auth-docs" # 授权书文件访问基础URL
|
||||
FileBaseURL: "https://www.dsjcx666.icu/api/v1/auth-docs" # 授权书文件访问基础URL
|
||||
Promotion:
|
||||
PromotionDomain: "https://p.dsjcq168.cn" # 推广域名（用于生成短链）
|
||||
OfficialDomain: "https://www.dsjcq168.cn" # 正式站点域名（短链重定向的目标域名）
|
||||
PromotionDomain: "https://p.dsjcx666.icu" # 推广域名（用于生成短链）
|
||||
OfficialDomain: "https://www.dsjcx666.icu" # 正式站点域名（短链重定向的目标域名）
|
||||
EasyPay:
|
||||
Enabled: false
|
||||
ApiURL: "https://zpayz.cn/"
|
||||
PID: "2025123009590455"
|
||||
PKEY: "f61pwaOj93lYpesM82ZnPAVwFojuSL7F"
|
||||
CIDs: ["12200", "12303"] # 支付渠道ID数组，可配置一个或多个
|
||||
RotateMode: "count" # 轮询模式：day（天数轮询）或 count（次数轮询），默认count
|
||||
RotateDays: 3 # 渠道轮询天数，默认3天（仅在RotateMode=day时生效）
|
||||
NotifyUrl: "https://www.dsjcx666.icu/api/v1/pay/easypay/callback"
|
||||
ReturnUrl: "https://www.dsjcx666.icu/payment/result"
|
||||
YunYinSignPay:
|
||||
Enabled: true
|
||||
ApiURL: "https://openapi.yunyinsign.com"
|
||||
AppID: "7226242043420468"
|
||||
AppSecret: "ceac4dc740e3443bbb1433fbe9723326"
|
||||
Mobile: "18566214578"
|
||||
Name: "陈立"
|
||||
CorpName: "海口开麦贸易有限公司"
|
||||
TemplateID: "1461036991700317185"
|
||||
TemplateCode: "TP1461036991700317184" # 需要配置实际的模板ID
|
||||
TemplateName: "信息服务授权书" # 需要配置实际的模板名称
|
||||
|
||||
@@ -15,6 +15,8 @@ type Config struct {
|
||||
Alipay AlipayConfig
|
||||
Wxpay WxpayConfig
|
||||
Applepay ApplepayConfig
|
||||
EasyPay EasyPayConfig
|
||||
YunYinSignPay YunYinSignPayConfig
|
||||
Tianyuanapi TianyuanapiConfig
|
||||
SystemConfig SystemConfig
|
||||
WechatH5 WechatH5Config
|
||||
@@ -33,20 +35,20 @@ type JwtAuth struct {
|
||||
RefreshAfter int64
|
||||
}
|
||||
type VerifyCode struct {
|
||||
AccessKeyID string
|
||||
AccessKeySecret string
|
||||
EndpointURL string
|
||||
SignName string
|
||||
TemplateCode string
|
||||
ValidTime int
|
||||
ComplaintTemplate string // 投诉通知短信模板
|
||||
AccessKeyID string
|
||||
AccessKeySecret string
|
||||
EndpointURL string
|
||||
SignName string
|
||||
TemplateCode string
|
||||
ValidTime int
|
||||
ComplaintTemplate string // 投诉通知短信模板
|
||||
}
|
||||
type Encrypt struct {
|
||||
SecretKey string
|
||||
}
|
||||
|
||||
type AlipayConfig struct {
|
||||
Enabled bool // 是否启用支付宝支付
|
||||
Enabled bool // 是否启用支付宝支付
|
||||
AppID string
|
||||
PrivateKey string
|
||||
AlipayPublicKey string
|
||||
@@ -58,7 +60,7 @@ type AlipayConfig struct {
|
||||
ReturnURL string
|
||||
}
|
||||
type WxpayConfig struct {
|
||||
Enabled bool // 是否启用微信支付
|
||||
Enabled bool // 是否启用微信支付
|
||||
AppID string
|
||||
MchID string
|
||||
MchCertificateSerialNumber string
|
||||
@@ -71,7 +73,7 @@ type WxpayConfig struct {
|
||||
RefundNotifyUrl string
|
||||
}
|
||||
type ApplepayConfig struct {
|
||||
Enabled bool // 是否启用Apple支付
|
||||
Enabled bool // 是否启用Apple支付
|
||||
ProductionVerifyURL string
|
||||
SandboxVerifyURL string // 沙盒环境的验证 URL
|
||||
Sandbox bool
|
||||
@@ -84,7 +86,7 @@ type SystemConfig struct {
|
||||
ThreeVerify bool
|
||||
}
|
||||
type WechatH5Config struct {
|
||||
Enabled bool // 是否启用微信公众号登录
|
||||
Enabled bool // 是否启用微信公众号登录
|
||||
AppID string
|
||||
AppSecret string
|
||||
}
|
||||
@@ -121,3 +123,30 @@ type PromotionConfig struct {
|
||||
PromotionDomain string // 推广域名（用于生成短链）
|
||||
OfficialDomain string // 正式站点域名（短链重定向的目标域名）
|
||||
}
|
||||
|
||||
// EasyPayConfig 易支付配置
|
||||
type EasyPayConfig struct {
|
||||
Enabled bool // 是否启用易支付
|
||||
ApiURL string // 接口地址
|
||||
PID string // 商户ID
|
||||
PKEY string // 商户密钥
|
||||
CIDs []string // 支付渠道ID数组（可配置一个或多个）
|
||||
RotateMode string // 轮询模式：day（天数轮询）或 count（次数轮询），默认day
|
||||
RotateDays int // 渠道轮询天数（默认3天，仅在RotateMode=day时生效）
|
||||
NotifyUrl string // 异步通知地址
|
||||
ReturnUrl string // 页面跳转地址
|
||||
}
|
||||
|
||||
// YunYinSignPayConfig 云印签支付配置
|
||||
type YunYinSignPayConfig struct {
|
||||
Enabled bool // 是否启用云印签支付
|
||||
ApiURL string // 接口地址
|
||||
AppID string // 应用ID
|
||||
AppSecret string // 应用密钥
|
||||
Mobile string // 我方手机号
|
||||
Name string // 我方姓名
|
||||
CorpName string // 我方公司名称
|
||||
TemplateID string // 模板ID
|
||||
TemplateCode string // 模板代码
|
||||
TemplateName string // 模板名称
|
||||
}
|
||||
|
||||
17
app/main/api/internal/handler/pay/easypaycallbackhandler.go
Normal file
17
app/main/api/internal/handler/pay/easypaycallbackhandler.go
Normal file
@@ -0,0 +1,17 @@
|
||||
package pay
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"jnc-server/app/main/api/internal/logic/pay"
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/common/result"
|
||||
)
|
||||
|
||||
func EasyPayCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
l := pay.NewEasyPayCallbackLogic(r.Context(), svcCtx)
|
||||
err := l.EasyPayCallback(w, r)
|
||||
result.HttpResult(r, w, nil, err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package pay
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"jnc-server/app/main/api/internal/logic/pay"
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/common/result"
|
||||
)
|
||||
|
||||
func YunYinSignPayCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
l := pay.NewYunYinSignPayCallbackLogic(r.Context(), svcCtx)
|
||||
err := l.YunYinSignPayCallback(w, r)
|
||||
result.HttpResult(r, w, nil, err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package pay
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"jnc-server/app/main/api/internal/logic/pay"
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/app/main/api/internal/types"
|
||||
"jnc-server/common/result"
|
||||
"jnc-server/pkg/lzkit/validator"
|
||||
|
||||
"github.com/zeromicro/go-zero/rest/httpx"
|
||||
)
|
||||
|
||||
func YunYinSignPayRefundHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req types.YunYinSignPayRefundReq
|
||||
if err := httpx.Parse(r, &req); err != nil {
|
||||
result.ParamErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
if err := validator.Validate(req); err != nil {
|
||||
result.ParamValidateErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
l := pay.NewYunYinSignPayRefundLogic(r.Context(), svcCtx)
|
||||
resp, err := l.YunYinSignPayRefund(&req)
|
||||
result.HttpResult(r, w, resp, err)
|
||||
}
|
||||
}
|
||||
@@ -771,6 +771,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
|
||||
Path: "/pay/alipay/callback",
|
||||
Handler: pay.AlipayCallbackHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
Method: http.MethodGet,
|
||||
Path: "/pay/easypay/callback",
|
||||
Handler: pay.EasyPayCallbackHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
Method: http.MethodPost,
|
||||
Path: "/pay/wechat/callback",
|
||||
@@ -781,6 +786,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
|
||||
Path: "/pay/wechat/refund_callback",
|
||||
Handler: pay.WechatPayRefundCallbackHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
Method: http.MethodPost,
|
||||
Path: "/pay/yunyinsign/callback",
|
||||
Handler: pay.YunYinSignPayCallbackHandler(serverCtx),
|
||||
},
|
||||
},
|
||||
rest.WithPrefix("/api/v1"),
|
||||
)
|
||||
@@ -804,6 +814,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
|
||||
Path: "/pay/payment",
|
||||
Handler: pay.PaymentHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
Method: http.MethodPost,
|
||||
Path: "/pay/yunyinsign/refund",
|
||||
Handler: pay.YunYinSignPayRefundHandler(serverCtx),
|
||||
},
|
||||
}...,
|
||||
),
|
||||
rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
|
||||
|
||||
@@ -6,7 +6,6 @@ import (
|
||||
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/app/main/api/internal/types"
|
||||
"jnc-server/common/globalkey"
|
||||
"jnc-server/pkg/lzkit/crypto"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
@@ -66,7 +65,6 @@ func (l *AdminGetAgentRankingLogic) AdminGetAgentRanking(req *types.AdminGetAgen
|
||||
func (l *AdminGetAgentRankingLogic) queryCommissionRanking(limit int) ([]types.AgentRankingItem, error) {
|
||||
// 1. Query all commissions
|
||||
builder := l.svcCtx.AgentCommissionModel.SelectBuilder()
|
||||
builder = builder.Where("del_state = ?", globalkey.DelStateNo)
|
||||
|
||||
commissions, err := l.svcCtx.AgentCommissionModel.FindAll(l.ctx, builder, "")
|
||||
if err != nil {
|
||||
@@ -111,7 +109,7 @@ func (l *AdminGetAgentRankingLogic) queryCommissionRanking(limit int) ([]types.A
|
||||
}
|
||||
|
||||
agents, err := l.svcCtx.AgentModel.FindAll(l.ctx,
|
||||
l.svcCtx.AgentModel.SelectBuilder().Where("del_state = ?", globalkey.DelStateNo), "")
|
||||
l.svcCtx.AgentModel.SelectBuilder(), "")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -162,7 +160,6 @@ func (l *AdminGetAgentRankingLogic) queryCommissionRanking(limit int) ([]types.A
|
||||
func (l *AdminGetAgentRankingLogic) queryOrdersRanking(limit int) ([]types.AgentRankingItem, error) {
|
||||
// 1. Query all orders
|
||||
builder := l.svcCtx.AgentOrderModel.SelectBuilder()
|
||||
builder = builder.Where("del_state = ?", globalkey.DelStateNo)
|
||||
|
||||
orders, err := l.svcCtx.AgentOrderModel.FindAll(l.ctx, builder, "")
|
||||
if err != nil {
|
||||
@@ -207,7 +204,7 @@ func (l *AdminGetAgentRankingLogic) queryOrdersRanking(limit int) ([]types.Agent
|
||||
}
|
||||
|
||||
agents, err := l.svcCtx.AgentModel.FindAll(l.ctx,
|
||||
l.svcCtx.AgentModel.SelectBuilder().Where("del_state = ?", globalkey.DelStateNo), "")
|
||||
l.svcCtx.AgentModel.SelectBuilder(), "")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@ import (
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/app/main/api/internal/types"
|
||||
"jnc-server/app/main/model"
|
||||
"jnc-server/common/globalkey"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
@@ -29,7 +28,6 @@ func NewAdminGetProductDistributionLogic(ctx context.Context, svcCtx *svc.Servic
|
||||
func (l *AdminGetProductDistributionLogic) AdminGetProductDistribution() (resp *types.AdminGetProductDistributionResp, err error) {
|
||||
// 1. Query all commissions
|
||||
builder := l.svcCtx.AgentCommissionModel.SelectBuilder()
|
||||
builder = builder.Where("del_state = ?", globalkey.DelStateNo)
|
||||
|
||||
commissions, err := l.svcCtx.AgentCommissionModel.FindAll(l.ctx, builder, "")
|
||||
if err != nil {
|
||||
@@ -50,7 +48,7 @@ func (l *AdminGetProductDistributionLogic) AdminGetProductDistribution() (resp *
|
||||
var products []*model.Product
|
||||
if len(productIds) > 0 {
|
||||
products, err = l.svcCtx.ProductModel.FindAll(l.ctx,
|
||||
l.svcCtx.ProductModel.SelectBuilder().Where("del_state = ?", globalkey.DelStateNo), "")
|
||||
l.svcCtx.ProductModel.SelectBuilder(), "")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ package admin_agent
|
||||
|
||||
import (
|
||||
"context"
|
||||
"jnc-server/common/globalkey"
|
||||
"jnc-server/common/xerr"
|
||||
|
||||
"github.com/Masterminds/squirrel"
|
||||
@@ -29,8 +28,7 @@ func NewAdminGetAgentOrderListLogic(ctx context.Context, svcCtx *svc.ServiceCont
|
||||
}
|
||||
|
||||
func (l *AdminGetAgentOrderListLogic) AdminGetAgentOrderList(req *types.AdminGetAgentOrderListReq) (resp *types.AdminGetAgentOrderListResp, err error) {
|
||||
builder := l.svcCtx.AgentOrderModel.SelectBuilder().
|
||||
Where("del_state = ?", globalkey.DelStateNo)
|
||||
builder := l.svcCtx.AgentOrderModel.SelectBuilder()
|
||||
|
||||
if req.AgentId != nil {
|
||||
builder = builder.Where("agent_id = ?", *req.AgentId)
|
||||
|
||||
@@ -7,7 +7,6 @@ import (
|
||||
"time"
|
||||
|
||||
"jnc-server/app/main/model"
|
||||
"jnc-server/common/globalkey"
|
||||
"jnc-server/common/xerr"
|
||||
"jnc-server/pkg/lzkit/crypto"
|
||||
|
||||
@@ -188,8 +187,7 @@ func contains(str, substr string) bool {
|
||||
|
||||
// queryOrders 查询订单列表
|
||||
func (l *AdminGetAgentOrdersListLogic) queryOrders(req *types.AdminGetAgentOrdersListReq) ([]*model.Order, int64, error) {
|
||||
builder := l.svcCtx.OrderModel.SelectBuilder().
|
||||
Where("`del_state` = ?", globalkey.DelStateNo)
|
||||
builder := l.svcCtx.OrderModel.SelectBuilder()
|
||||
|
||||
// 订单筛选
|
||||
if req.OrderNo != nil && *req.OrderNo != "" {
|
||||
@@ -275,7 +273,7 @@ func (l *AdminGetAgentOrdersListLogic) queryCommissionsByOrderIds(orderIds []str
|
||||
|
||||
commissions, err := l.svcCtx.AgentCommissionModel.FindAll(l.ctx,
|
||||
l.svcCtx.AgentCommissionModel.SelectBuilder().
|
||||
Where(fmt.Sprintf("`order_id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(orderIds), globalkey.DelStateNo)...),
|
||||
Where(fmt.Sprintf("`order_id` IN (%s)", inClause), stringsToInterfaces(orderIds)...),
|
||||
"")
|
||||
|
||||
if err != nil {
|
||||
@@ -319,7 +317,7 @@ func (l *AdminGetAgentOrdersListLogic) queryAgentsByAgentIds(agentIds []string)
|
||||
|
||||
agents, err := l.svcCtx.AgentModel.FindAll(l.ctx,
|
||||
l.svcCtx.AgentModel.SelectBuilder().
|
||||
Where(fmt.Sprintf("`id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(ids), globalkey.DelStateNo)...),
|
||||
Where(fmt.Sprintf("`id` IN (%s)", inClause), stringsToInterfaces(ids)...),
|
||||
"")
|
||||
|
||||
if err != nil {
|
||||
@@ -363,7 +361,7 @@ func (l *AdminGetAgentOrdersListLogic) queryUsersByUserIds(userIds []string) map
|
||||
|
||||
users, err := l.svcCtx.UserModel.FindAll(l.ctx,
|
||||
l.svcCtx.UserModel.SelectBuilder().
|
||||
Where(fmt.Sprintf("`id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(ids), globalkey.DelStateNo)...),
|
||||
Where(fmt.Sprintf("`id` IN (%s)", inClause), stringsToInterfaces(ids)...),
|
||||
"")
|
||||
|
||||
if err != nil {
|
||||
@@ -407,7 +405,7 @@ func (l *AdminGetAgentOrdersListLogic) queryProductsByProductIds(productIds []st
|
||||
|
||||
products, err := l.svcCtx.ProductModel.FindAll(l.ctx,
|
||||
l.svcCtx.ProductModel.SelectBuilder().
|
||||
Where(fmt.Sprintf("`id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(ids), globalkey.DelStateNo)...),
|
||||
Where(fmt.Sprintf("`id` IN (%s)", inClause), stringsToInterfaces(ids)...),
|
||||
"")
|
||||
|
||||
if err != nil {
|
||||
@@ -436,7 +434,7 @@ func (l *AdminGetAgentOrdersListLogic) queryQueriesByOrderIds(orderIds []string)
|
||||
|
||||
queries, err := l.svcCtx.QueryModel.FindAll(l.ctx,
|
||||
l.svcCtx.QueryModel.SelectBuilder().
|
||||
Where(fmt.Sprintf("`order_id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(orderIds), globalkey.DelStateNo)...),
|
||||
Where(fmt.Sprintf("`order_id` IN (%s)", inClause), stringsToInterfaces(orderIds)...),
|
||||
"")
|
||||
|
||||
if err != nil {
|
||||
|
||||
@@ -2,7 +2,6 @@ package admin_agent
|
||||
|
||||
import (
|
||||
"context"
|
||||
"jnc-server/common/globalkey"
|
||||
"jnc-server/common/xerr"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
@@ -28,8 +27,7 @@ func NewAdminGetAgentProductConfigListLogic(ctx context.Context, svcCtx *svc.Ser
|
||||
}
|
||||
|
||||
func (l *AdminGetAgentProductConfigListLogic) AdminGetAgentProductConfigList(req *types.AdminGetAgentProductConfigListReq) (resp *types.AdminGetAgentProductConfigListResp, err error) {
|
||||
builder := l.svcCtx.AgentProductConfigModel.SelectBuilder().
|
||||
Where("del_state = ?", globalkey.DelStateNo)
|
||||
builder := l.svcCtx.AgentProductConfigModel.SelectBuilder()
|
||||
|
||||
// 如果提供了产品ID，直接过滤
|
||||
if req.ProductId != nil {
|
||||
@@ -38,7 +36,7 @@ func (l *AdminGetAgentProductConfigListLogic) AdminGetAgentProductConfigList(req
|
||||
|
||||
// 如果提供了产品名称，通过关联查询 product 表过滤
|
||||
if req.ProductName != nil && *req.ProductName != "" {
|
||||
builder = builder.Where("product_id IN (SELECT id FROM product WHERE product_name LIKE ? AND del_state = ?)", "%"+*req.ProductName+"%", globalkey.DelStateNo)
|
||||
builder = builder.Where("product_id IN (SELECT id FROM product WHERE product_name LIKE ?)", "%"+*req.ProductName+"%")
|
||||
}
|
||||
|
||||
// 分页查询
|
||||
|
||||
@@ -18,10 +18,14 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
PaymentPlatformAlipay = "alipay"
|
||||
PaymentPlatformWechat = "wechat"
|
||||
OrderStatusPaid = "paid"
|
||||
RefundNoPrefix = "refund-"
|
||||
PaymentPlatformAlipay = "alipay"
|
||||
PaymentPlatformWechat = "wechat"
|
||||
PaymentPlatformEasyPay = "easypay_alipay"
|
||||
PaymentPlatformYunYinSignPay = "yunyinSignPay"
|
||||
PaymentPlatformYunYinSignPayWechat = "yunyinSignPay_wechat"
|
||||
PaymentPlatformYunYinSignPayAlipay = "yunyinSignPay_alipay"
|
||||
OrderStatusPaid = "paid"
|
||||
RefundNoPrefix = "refund-"
|
||||
)
|
||||
|
||||
type AdminRefundOrderLogic struct {
|
||||
@@ -50,6 +54,10 @@ func (l *AdminRefundOrderLogic) AdminRefundOrder(req *types.AdminRefundOrderReq)
|
||||
return l.handleAlipayRefund(order, req)
|
||||
case PaymentPlatformWechat:
|
||||
return l.handleWechatRefund(order, req)
|
||||
case PaymentPlatformEasyPay:
|
||||
return l.handleEasyPayRefund(order, req)
|
||||
case PaymentPlatformYunYinSignPay, PaymentPlatformYunYinSignPayWechat, PaymentPlatformYunYinSignPayAlipay:
|
||||
return l.handleYunYinSignPayRefund(order, req)
|
||||
default:
|
||||
return nil, errors.Wrapf(xerr.NewErrMsg("不支持的支付平台"), "AdminRefundOrder, 不支持的支付平台: %s", order.PaymentPlatform)
|
||||
}
|
||||
@@ -130,6 +138,122 @@ func (l *AdminRefundOrderLogic) handleWechatRefund(order *model.Order, req *type
|
||||
}, nil
|
||||
}
|
||||
|
||||
// handleEasyPayRefund 处理易支付退款
|
||||
func (l *AdminRefundOrderLogic) handleEasyPayRefund(order *model.Order, req *types.AdminRefundOrderReq) (*types.AdminRefundOrderResp, error) {
|
||||
// 检查易支付服务是否启用
|
||||
if l.svcCtx.EasyPayService == nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "AdminRefundOrder, 易支付服务未启用")
|
||||
}
|
||||
|
||||
// 调用易支付退款接口
|
||||
err := l.svcCtx.EasyPayService.Refund(l.ctx, order.OrderNo, req.RefundAmount)
|
||||
if err != nil {
|
||||
// 易支付退款失败，创建失败记录但不更新订单状态
|
||||
refundNo := l.generateRefundNo(order.OrderNo)
|
||||
createErr := l.createRefundRecordOnly(order, req, refundNo, "", model.OrderRefundStatusFailed)
|
||||
if createErr != nil {
|
||||
logx.Errorf("创建易支付退款失败记录时出错: %v", createErr)
|
||||
}
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "AdminRefundOrder, 易支付退款失败 err: %v", err)
|
||||
}
|
||||
|
||||
// 易支付退款成功，创建成功记录
|
||||
refundNo := l.generateRefundNo(order.OrderNo)
|
||||
// 易支付退款是同步的，直接标记为成功
|
||||
err = l.createRefundRecordAndUpdateOrder(order, req, refundNo, "", model.OrderStatusRefunded, model.OrderRefundStatusSuccess)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &types.AdminRefundOrderResp{
|
||||
Status: model.OrderStatusRefunded,
|
||||
RefundNo: refundNo,
|
||||
Amount: req.RefundAmount,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// handleYunYinSignPayRefund 处理云印签支付退款
|
||||
func (l *AdminRefundOrderLogic) handleYunYinSignPayRefund(order *model.Order, req *types.AdminRefundOrderReq) (*types.AdminRefundOrderResp, error) {
|
||||
// 检查云印签支付服务是否启用
|
||||
if l.svcCtx.YunYinSignPayService == nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "AdminRefundOrder, 云印签支付服务未启用")
|
||||
}
|
||||
|
||||
// 查询云印签订单获取参与方ID（如果存在）
|
||||
var participateId int64
|
||||
yunyinOrder, err := l.svcCtx.YunyinSignPayOrderModel.FindOneByOrderId(l.ctx, order.Id)
|
||||
if err != nil {
|
||||
// 如果查询不到云印签订单记录，可能是历史订单或数据不一致，使用订单号退款
|
||||
if errors.Is(err, model.ErrNotFound) {
|
||||
logx.Infof("未找到云印签订单记录，将使用订单号退款，订单ID: %s, 订单号: %s", order.Id, order.OrderNo)
|
||||
participateId = 0 // 使用订单号退款
|
||||
} else {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminRefundOrder, 查询云印签订单失败, 订单ID: %s, 错误: %v", order.Id, err)
|
||||
}
|
||||
} else {
|
||||
// 获取参与方ID（ParticipantId 是 string 类型，需要转换为 int64）
|
||||
if yunyinOrder.ParticipantId != "" {
|
||||
// 尝试将字符串转换为int64
|
||||
if _, parseErr := fmt.Sscanf(yunyinOrder.ParticipantId, "%d", &participateId); parseErr != nil {
|
||||
logx.Errorf("解析参与方ID失败，订单ID: %s, ParticipantId: %s, 错误: %v", order.Id, yunyinOrder.ParticipantId, parseErr)
|
||||
// 如果解析失败，participateId 保持为 0，使用订单号退款
|
||||
} else {
|
||||
logx.Infof("成功解析参与方ID，订单ID: %s, ParticipantId: %s, participateId: %d", order.Id, yunyinOrder.ParticipantId, participateId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 调用云印签退款接口
|
||||
refundErr := l.svcCtx.YunYinSignPayService.RefundPayeeBill(
|
||||
l.ctx,
|
||||
order.OrderNo,
|
||||
participateId,
|
||||
req.RefundAmount,
|
||||
req.RefundReason,
|
||||
)
|
||||
if refundErr != nil {
|
||||
// 云印签退款失败，创建失败记录但不更新订单状态
|
||||
refundNo := l.generateRefundNo(order.OrderNo)
|
||||
createErr := l.createRefundRecordOnly(order, req, refundNo, "", model.OrderRefundStatusFailed)
|
||||
if createErr != nil {
|
||||
logx.Errorf("创建云印签退款失败记录时出错: %v", createErr)
|
||||
}
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "AdminRefundOrder, 云印签退款失败 err: %v", refundErr)
|
||||
}
|
||||
|
||||
// 云印签退款成功，创建成功记录
|
||||
refundNo := l.generateRefundNo(order.OrderNo)
|
||||
// 检查是否全额退款
|
||||
isFullRefund := req.RefundAmount >= order.Amount-0.01 // 允许1分钱的误差
|
||||
|
||||
var orderStatus string
|
||||
if isFullRefund {
|
||||
orderStatus = model.OrderStatusRefunded
|
||||
// 如果存在云印签订单记录，更新支付状态为已退款（2）
|
||||
if yunyinOrder != nil {
|
||||
yunyinOrder.PayStatus = 2
|
||||
if _, updateErr := l.svcCtx.YunyinSignPayOrderModel.Update(l.ctx, nil, yunyinOrder); updateErr != nil {
|
||||
logx.Errorf("更新云印签订单状态失败: %v", updateErr)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 部分退款保持已支付状态
|
||||
orderStatus = model.OrderStatusPaid
|
||||
}
|
||||
|
||||
// 云印签退款是异步的，但API返回成功表示申请已提交，标记为成功
|
||||
err = l.createRefundRecordAndUpdateOrder(order, req, refundNo, "", orderStatus, model.OrderRefundStatusSuccess)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &types.AdminRefundOrderResp{
|
||||
Status: orderStatus,
|
||||
RefundNo: refundNo,
|
||||
Amount: req.RefundAmount,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// createRefundRecordAndUpdateOrder 创建退款记录并更新订单状态
|
||||
func (l *AdminRefundOrderLogic) createRefundRecordAndUpdateOrder(order *model.Order, req *types.AdminRefundOrderReq, refundNo, platformRefundId, orderStatus, refundStatus string) error {
|
||||
return l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
|
||||
|
||||
@@ -6,7 +6,6 @@ import (
|
||||
"encoding/json"
|
||||
"jnc-server/app/main/model"
|
||||
"jnc-server/common/ctxdata"
|
||||
"jnc-server/common/globalkey"
|
||||
"jnc-server/common/xerr"
|
||||
"jnc-server/pkg/lzkit/crypto"
|
||||
|
||||
@@ -48,9 +47,9 @@ func (l *GetPromotionQueryListLogic) GetPromotionQueryList(req *types.GetPromoti
|
||||
|
||||
// 查询当前代理的代理订单，按创建时间倒序分页
|
||||
builder := l.svcCtx.AgentOrderModel.SelectBuilder().
|
||||
Where("agent_id = ? AND del_state = ?", agent.Id, globalkey.DelStateNo)
|
||||
Where("agent_id = ? AND process_status = 1", agent.Id)
|
||||
|
||||
orders, _, err := l.svcCtx.AgentOrderModel.FindPageListByPageWithTotal(l.ctx, builder, req.Page, req.PageSize, "create_time DESC")
|
||||
orders, total, err := l.svcCtx.AgentOrderModel.FindPageListByPageWithTotal(l.ctx, builder, req.Page, req.PageSize, "create_time DESC")
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理订单失败, %v", err)
|
||||
}
|
||||
@@ -92,7 +91,7 @@ func (l *GetPromotionQueryListLogic) GetPromotionQueryList(req *types.GetPromoti
|
||||
item.OrderNo = order.OrderNo
|
||||
item.ProductName = product.ProductName
|
||||
item.OrderAmount = order.Amount // 订单金额
|
||||
item.Amount = ao.AgentProfit // 推广收益
|
||||
item.Amount = ao.AgentProfit // 推广收益
|
||||
item.CreateTime = q.CreateTime.Format("2006-01-02 15:04:05")
|
||||
item.QueryState = q.QueryState
|
||||
|
||||
@@ -119,7 +118,7 @@ func (l *GetPromotionQueryListLogic) GetPromotionQueryList(req *types.GetPromoti
|
||||
}
|
||||
|
||||
return &types.GetPromotionQueryListResp{
|
||||
Total: int64(len(list)), // 前端仅展示已创建查询条目
|
||||
Total: total, // 前端仅展示已创建查询条目
|
||||
List: list,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -26,6 +26,6 @@ func NewGetAppVersionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Get
|
||||
func (l *GetAppVersionLogic) GetAppVersion() (resp *types.GetAppVersionResp, err error) {
|
||||
return &types.GetAppVersionResp{
|
||||
Version: "1.0.0",
|
||||
WgtUrl: "https://www.dsjcq168.cn/app_version/jnc_1.0.0.wgt",
|
||||
WgtUrl: "https://www.dsjcx666.icu/app_version/jnc_1.0.0.wgt",
|
||||
}, nil
|
||||
}
|
||||
|
||||
122
app/main/api/internal/logic/pay/easypaycallbacklogic.go
Normal file
122
app/main/api/internal/logic/pay/easypaycallbacklogic.go
Normal file
@@ -0,0 +1,122 @@
|
||||
package pay
|
||||
|
||||
import (
|
||||
"context"
|
||||
"jnc-server/app/main/api/internal/service"
|
||||
"jnc-server/pkg/lzkit/lzUtils"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type EasyPayCallbackLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewEasyPayCallbackLogic(ctx context.Context, svcCtx *svc.ServiceContext) *EasyPayCallbackLogic {
|
||||
return &EasyPayCallbackLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *EasyPayCallbackLogic) EasyPayCallback(w http.ResponseWriter, r *http.Request) error {
|
||||
// 检查易支付服务是否启用
|
||||
if l.svcCtx.EasyPayService == nil {
|
||||
logx.Errorf("易支付服务未启用")
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return nil
|
||||
}
|
||||
|
||||
notification, err := l.svcCtx.EasyPayService.HandleEasyPayNotification(r)
|
||||
if err != nil {
|
||||
logx.Errorf("易支付回调处理失败: %v", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return nil
|
||||
}
|
||||
|
||||
// 根据订单号前缀判断订单类型
|
||||
orderNo := notification.OutTradeNo
|
||||
if strings.HasPrefix(orderNo, "Q_") {
|
||||
// 查询订单处理
|
||||
return l.handleQueryOrderPayment(w, notification)
|
||||
} else if strings.HasPrefix(orderNo, "A_") {
|
||||
// 旧系统会员充值订单（已废弃，新系统使用升级功能）
|
||||
// 直接返回成功，避免旧订单影响
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
} else if strings.HasPrefix(orderNo, "U_") {
|
||||
// 系统简化：移除升级功能，直接返回成功
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
} else {
|
||||
// 兼容旧订单，假设没有前缀的是查询订单
|
||||
return l.handleQueryOrderPayment(w, notification)
|
||||
}
|
||||
}
|
||||
|
||||
// 处理查询订单支付
|
||||
func (l *EasyPayCallbackLogic) handleQueryOrderPayment(w http.ResponseWriter, notification *service.EasyPayNotification) error {
|
||||
order, findOrderErr := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, notification.OutTradeNo)
|
||||
if findOrderErr != nil {
|
||||
logx.Errorf("易支付回调，查找订单失败: %+v", findOrderErr)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
|
||||
if order.Status != "pending" {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
|
||||
// 验证支付状态
|
||||
if !l.svcCtx.EasyPayService.IsPaymentSuccess(notification) {
|
||||
logx.Infof("易支付回调，订单未支付成功，订单号: %s, 状态: %s", notification.OutTradeNo, notification.TradeStatus)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
|
||||
// 验证金额（转换为字符串比较）
|
||||
amountStr := lzUtils.ToAlipayAmount(order.Amount)
|
||||
if amountStr != notification.Money {
|
||||
logx.Errorf("易支付回调，金额不一致，订单号: %s, 订单金额: %s, 回调金额: %s", notification.OutTradeNo, amountStr, notification.Money)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
|
||||
// 更新订单状态
|
||||
order.Status = "paid"
|
||||
order.PayTime = lzUtils.TimeToNullTime(time.Now())
|
||||
order.PlatformOrderId = lzUtils.StringToNullString(notification.TradeNo)
|
||||
|
||||
if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(l.ctx, nil, order); updateErr != nil {
|
||||
logx.Errorf("易支付回调，修改订单信息失败: %+v", updateErr)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
|
||||
// 发送异步任务处理后续流程
|
||||
if asyncErr := l.svcCtx.AsynqService.SendQueryTask(order.Id); asyncErr != nil {
|
||||
logx.Errorf("异步任务调度失败: %v", asyncErr)
|
||||
// 不返回错误，因为订单已经更新成功
|
||||
}
|
||||
|
||||
// 返回success，易支付要求返回纯字符串success
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
@@ -2,10 +2,12 @@ package pay
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/app/main/api/internal/types"
|
||||
"jnc-server/common/xerr"
|
||||
"jnc-server/pkg/lzkit/lzUtils"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
@@ -44,6 +46,161 @@ func (l *PaymentCheckLogic) PaymentCheck(req *types.PaymentCheckReq) (resp *type
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询订单失败: %v", err)
|
||||
}
|
||||
|
||||
// 如果订单状态是 pending 且支付平台是易支付，主动查询易支付订单状态
|
||||
if order.Status == "pending" && order.PaymentPlatform == "easypay_alipay" {
|
||||
// 检查易支付服务是否启用
|
||||
if l.svcCtx.EasyPayService != nil {
|
||||
// 主动查询易支付订单状态
|
||||
queryResp, queryErr := l.svcCtx.EasyPayService.QueryOrderStatus(l.ctx, req.OrderNo)
|
||||
if queryErr != nil {
|
||||
logx.Errorf("主动查询易支付订单状态失败，订单号: %s, 错误: %v", req.OrderNo, queryErr)
|
||||
// 查询失败不影响返回，继续返回当前订单状态
|
||||
} else {
|
||||
// 如果易支付返回订单已支付（status == 1），更新本地订单状态
|
||||
if queryResp.GetStatusInt() == 1 {
|
||||
logx.Infof("主动查询发现易支付订单已支付，订单号: %s，开始更新订单状态", req.OrderNo)
|
||||
|
||||
// 重新查询订单（获取最新版本号）
|
||||
order, err = l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, req.OrderNo)
|
||||
if err != nil {
|
||||
logx.Errorf("更新订单状态前重新查询订单失败: %v", err)
|
||||
} else if order.Status == "pending" {
|
||||
// 更新订单状态
|
||||
order.Status = "paid"
|
||||
order.PayTime = lzUtils.TimeToNullTime(time.Now())
|
||||
if queryResp.TradeNo != "" {
|
||||
order.PlatformOrderId = lzUtils.StringToNullString(queryResp.TradeNo)
|
||||
}
|
||||
|
||||
if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(l.ctx, nil, order); updateErr != nil {
|
||||
logx.Errorf("主动查询后更新订单状态失败: %v", updateErr)
|
||||
} else {
|
||||
logx.Infof("主动查询后成功更新订单状态为已支付，订单号: %s", req.OrderNo)
|
||||
|
||||
// 发送异步任务处理后续流程
|
||||
if asyncErr := l.svcCtx.AsynqService.SendQueryTask(order.Id); asyncErr != nil {
|
||||
logx.Errorf("主动查询后发送异步任务失败: %v", asyncErr)
|
||||
}
|
||||
|
||||
// 返回更新后的状态
|
||||
return &types.PaymentCheckResp{
|
||||
Type: "query",
|
||||
Status: "paid",
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 如果订单状态是 pending 且支付平台是云印签支付，主动查询云印签订单状态
|
||||
if order.Status == "pending" && (order.PaymentPlatform == "yunyinSignPay" || order.PaymentPlatform == "yunyinSignPay_wechat" || order.PaymentPlatform == "yunyinSignPay_alipay") {
|
||||
// 检查云印签支付服务是否启用
|
||||
if l.svcCtx.YunYinSignPayService != nil {
|
||||
// 主动查询云印签订单状态
|
||||
queryResp, queryErr := l.svcCtx.YunYinSignPayService.QueryPayeeBill(l.ctx, req.OrderNo)
|
||||
if queryErr != nil {
|
||||
logx.Errorf("主动查询云印签订单状态失败，订单号: %s, 错误: %v", req.OrderNo, queryErr)
|
||||
// 查询失败不影响返回，继续返回当前订单状态
|
||||
} else {
|
||||
// 根据云印签返回的支付状态更新本地订单状态
|
||||
// 云印签 payStatus: 0-订单生成, 1-支付中, 2-支付成功, 3-支付失败, 4-已退款
|
||||
// 我们的订单状态: pending, paid, failed, refunded
|
||||
var newOrderStatus string
|
||||
var shouldUpdate bool
|
||||
|
||||
switch queryResp.PayStatus {
|
||||
case 2: // 支付成功
|
||||
newOrderStatus = "paid"
|
||||
shouldUpdate = true
|
||||
case 3: // 支付失败
|
||||
newOrderStatus = "failed"
|
||||
shouldUpdate = true
|
||||
case 4: // 已退款
|
||||
newOrderStatus = "refunded"
|
||||
shouldUpdate = true
|
||||
case 0, 1: // 订单生成或支付中，保持 pending
|
||||
// 不更新，继续返回 pending
|
||||
}
|
||||
|
||||
if shouldUpdate {
|
||||
logx.Infof("主动查询发现云印签订单状态已变更，订单号: %s, 支付状态: %d, 新订单状态: %s", req.OrderNo, queryResp.PayStatus, newOrderStatus)
|
||||
|
||||
// 重新查询订单（获取最新版本号）
|
||||
order, err = l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, req.OrderNo)
|
||||
if err != nil {
|
||||
logx.Errorf("更新订单状态前重新查询订单失败: %v", err)
|
||||
} else {
|
||||
// 更新云印签订单表的支付状态（无论订单状态如何，都要同步云印签的状态）
|
||||
yunyinOrder, findYunyinErr := l.svcCtx.YunyinSignPayOrderModel.FindOneByOrderId(l.ctx, order.Id)
|
||||
if findYunyinErr == nil && yunyinOrder != nil {
|
||||
// 更新支付状态
|
||||
// 云印签 payStatus: 0-订单生成, 1-支付中, 2-支付成功, 3-支付失败, 4-已退款
|
||||
// 我们的 payStatus: 0-待支付, 1-已支付, 2-已退款
|
||||
var newPayStatus int64
|
||||
if queryResp.PayStatus == 2 {
|
||||
newPayStatus = 1 // 已支付
|
||||
} else if queryResp.PayStatus == 4 {
|
||||
newPayStatus = 2 // 已退款
|
||||
} else if queryResp.PayStatus == 3 {
|
||||
// 支付失败，保持待支付状态
|
||||
newPayStatus = 0
|
||||
}
|
||||
|
||||
if newPayStatus != yunyinOrder.PayStatus {
|
||||
yunyinOrder.PayStatus = newPayStatus
|
||||
if _, updateYunyinErr := l.svcCtx.YunyinSignPayOrderModel.Update(l.ctx, nil, yunyinOrder); updateYunyinErr != nil {
|
||||
logx.Errorf("更新云印签订单支付状态失败: %v", updateYunyinErr)
|
||||
} else {
|
||||
logx.Infof("成功更新云印签订单支付状态，订单ID: %s, 新支付状态: %d", order.Id, newPayStatus)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 只有在订单状态是 pending 时才更新订单状态
|
||||
if order.Status == "pending" {
|
||||
// 更新订单状态
|
||||
order.Status = newOrderStatus
|
||||
if newOrderStatus == "paid" {
|
||||
order.PayTime = lzUtils.TimeToNullTime(time.Now())
|
||||
if queryResp.ChannelOrderNo != "" {
|
||||
order.PlatformOrderId = lzUtils.StringToNullString(queryResp.ChannelOrderNo)
|
||||
}
|
||||
} else if newOrderStatus == "refunded" {
|
||||
order.RefundTime = lzUtils.TimeToNullTime(time.Now())
|
||||
}
|
||||
|
||||
if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(l.ctx, nil, order); updateErr != nil {
|
||||
logx.Errorf("主动查询后更新订单状态失败: %v", updateErr)
|
||||
} else {
|
||||
logx.Infof("主动查询后成功更新订单状态，订单号: %s, 新状态: %s", req.OrderNo, newOrderStatus)
|
||||
|
||||
// 如果订单已支付，发送异步任务处理后续流程
|
||||
if newOrderStatus == "paid" {
|
||||
if asyncErr := l.svcCtx.AsynqService.SendQueryTask(order.Id); asyncErr != nil {
|
||||
logx.Errorf("主动查询后发送异步任务失败: %v", asyncErr)
|
||||
}
|
||||
}
|
||||
|
||||
// 返回更新后的状态
|
||||
return &types.PaymentCheckResp{
|
||||
Type: "query",
|
||||
Status: newOrderStatus,
|
||||
}, nil
|
||||
}
|
||||
} else {
|
||||
// 订单状态已经不是 pending，说明可能已经被其他流程处理
|
||||
// 但仍然返回当前状态
|
||||
logx.Infof("订单状态已不是 pending，当前状态: %s，跳过更新", order.Status)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return &types.PaymentCheckResp{
|
||||
Type: "query",
|
||||
Status: order.Status,
|
||||
|
||||
@@ -3,17 +3,21 @@ package pay
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
"jnc-server/app/main/api/internal/service"
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/app/main/api/internal/types"
|
||||
"jnc-server/app/main/model"
|
||||
"jnc-server/common/ctxdata"
|
||||
"jnc-server/common/xerr"
|
||||
"jnc-server/pkg/lzkit/crypto"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Masterminds/squirrel"
|
||||
"github.com/google/uuid"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/redis/go-redis/v9"
|
||||
@@ -21,6 +25,9 @@ import (
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||
)
|
||||
|
||||
// 维护模式开关：true 表示维护中，false 表示正常服务
|
||||
const maintenanceMode = true
|
||||
|
||||
type PaymentLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
@@ -31,6 +38,8 @@ type PaymentTypeResp struct {
|
||||
outTradeNo string
|
||||
description string
|
||||
orderID string // 订单ID，用于开发环境测试支付模式
|
||||
userName string // 用户姓名（从查询缓存中获取）
|
||||
userMobile string // 用户手机号（从查询缓存中获取）
|
||||
}
|
||||
|
||||
func NewPaymentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PaymentLogic {
|
||||
@@ -42,6 +51,12 @@ func NewPaymentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PaymentLo
|
||||
}
|
||||
|
||||
func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp, err error) {
|
||||
// 维护中，暂停使用
|
||||
// TODO: 维护完成后将 maintenanceMode 设置为 false
|
||||
if maintenanceMode {
|
||||
return nil, errors.Wrapf(xerr.NewErrMsg("系统维护中，暂停使用"), "")
|
||||
}
|
||||
|
||||
var paymentTypeResp *PaymentTypeResp
|
||||
var prepayData interface{}
|
||||
var orderID string
|
||||
@@ -92,8 +107,154 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
|
||||
prepayData, createOrderErr = l.svcCtx.WechatPayService.CreateWechatOrder(l.ctx, paymentTypeResp.amount, paymentTypeResp.description, paymentTypeResp.outTradeNo)
|
||||
} else if req.PayMethod == "alipay" {
|
||||
prepayData, createOrderErr = l.svcCtx.AlipayService.CreateAlipayOrder(l.ctx, paymentTypeResp.amount, paymentTypeResp.description, paymentTypeResp.outTradeNo)
|
||||
} else if req.PayMethod == "easypay_alipay" {
|
||||
if l.svcCtx.EasyPayService == nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "易支付服务未启用")
|
||||
}
|
||||
// 获取用户ID用于次数轮询模式
|
||||
userID, getUidErr := ctxdata.GetUidFromCtx(l.ctx)
|
||||
if getUidErr != nil {
|
||||
// 如果获取用户ID失败，使用空字符串（会回退到天数轮询）
|
||||
userID = ""
|
||||
}
|
||||
easyPayResult, createOrderErr := l.svcCtx.EasyPayService.CreateEasyPayOrder(l.ctx, paymentTypeResp.amount, paymentTypeResp.description, paymentTypeResp.outTradeNo, userID)
|
||||
if createOrderErr == nil && easyPayResult != nil {
|
||||
prepayData = easyPayResult.PayURL
|
||||
// 将渠道ID存储到context中，后续创建订单时使用
|
||||
ctx = context.WithValue(ctx, "easypay_cid", easyPayResult.CID)
|
||||
l.ctx = ctx
|
||||
}
|
||||
} else if req.PayMethod == "appleiap" {
|
||||
prepayData = l.svcCtx.ApplePayService.GetIappayAppID(paymentTypeResp.outTradeNo)
|
||||
} else if req.PayMethod == "yunyinSignPay" || req.PayMethod == "yunyinSignPay_wechat" || req.PayMethod == "yunyinSignPay_alipay" {
|
||||
logx.Infof("[云印签支付] 开始处理支付请求，支付方式: %s, 订单号: %s", req.PayMethod, paymentTypeResp.outTradeNo)
|
||||
|
||||
if l.svcCtx.YunYinSignPayService == nil {
|
||||
logx.Errorf("[云印签支付] 支付服务未启用")
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "云印签支付服务未启用")
|
||||
}
|
||||
|
||||
// 从查询缓存中获取用户姓名和手机号
|
||||
if paymentTypeResp.userMobile == "" {
|
||||
logx.Errorf("[云印签支付] 查询缓存中未找到用户手机号，订单号: %s", paymentTypeResp.outTradeNo)
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 查询缓存中未找到用户手机号，无法使用云印签支付")
|
||||
}
|
||||
|
||||
// 获取用户ID
|
||||
userID, getUidErr := ctxdata.GetUidFromCtx(l.ctx)
|
||||
if getUidErr != nil {
|
||||
logx.Errorf("[云印签支付] 获取用户ID失败，订单号: %s, 错误: %+v", paymentTypeResp.outTradeNo, getUidErr)
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取用户ID失败: %+v", getUidErr)
|
||||
}
|
||||
|
||||
// 根据支付方式确定支付类型
|
||||
payType := 0 // 默认微信支付
|
||||
if req.PayMethod == "yunyinSignPay_alipay" {
|
||||
payType = 1 // 支付宝支付
|
||||
}
|
||||
logx.Infof("[云印签支付] 支付参数，订单号: %s, 用户ID: %s, 用户手机: %s, 用户姓名: %s, 金额: %.2f, 支付类型: %d(0=微信,1=支付宝)",
|
||||
paymentTypeResp.outTradeNo, userID, paymentTypeResp.userMobile, paymentTypeResp.userName, paymentTypeResp.amount, payType)
|
||||
|
||||
// 查询用户是否有未完成的签署（待签署且待支付）
|
||||
var yunYinSignPayResult *service.CreateYunYinSignPayOrderResult
|
||||
// 使用 SelectBuilder 查询未完成的签署订单（del_state 由系统自动处理）
|
||||
logx.Infof("[云印签支付] 查询用户未完成的签署订单，用户ID: %s", userID)
|
||||
unfinishedBuilder := l.svcCtx.YunyinSignPayOrderModel.SelectBuilder().
|
||||
Where(squirrel.Eq{
|
||||
"user_id": userID,
|
||||
"sign_status": 0, // 待签署
|
||||
"pay_status": 0, // 待支付
|
||||
}).
|
||||
OrderBy("create_time DESC").
|
||||
Limit(1)
|
||||
unfinishedOrders, findUnfinishedErr := l.svcCtx.YunyinSignPayOrderModel.FindAll(l.ctx, unfinishedBuilder, "")
|
||||
var unfinishedOrder *model.YunyinSignPayOrder
|
||||
if findUnfinishedErr == nil && len(unfinishedOrders) > 0 {
|
||||
unfinishedOrder = unfinishedOrders[0]
|
||||
logx.Infof("[云印签支付] 找到未完成的签署订单，订单号: %s, 任务ID: %s, 参与者ID: %s, 金额: %.2f",
|
||||
paymentTypeResp.outTradeNo, unfinishedOrder.TaskId, unfinishedOrder.ParticipantId, unfinishedOrder.Amount)
|
||||
} else {
|
||||
if findUnfinishedErr != nil {
|
||||
logx.Infof("[云印签支付] 查询未完成签署订单失败，用户ID: %s, 错误: %v", userID, findUnfinishedErr)
|
||||
} else {
|
||||
logx.Infof("[云印签支付] 未找到未完成的签署订单，用户ID: %s, 将创建新签署流程", userID)
|
||||
}
|
||||
}
|
||||
|
||||
if unfinishedOrder != nil {
|
||||
// 复用未完成的签署，只获取新的支付链接
|
||||
logx.Infof("[云印签支付] 复用未完成的签署，订单号: %s, 任务ID: %s, 参与者ID: %s",
|
||||
paymentTypeResp.outTradeNo, unfinishedOrder.TaskId, unfinishedOrder.ParticipantId)
|
||||
|
||||
// 获取token和操作ID（带缓存）
|
||||
logx.Infof("[云印签支付] 开始获取AccessToken，订单号: %s", paymentTypeResp.outTradeNo)
|
||||
accessToken, tokenErr := l.svcCtx.YunYinSignPayService.GetAccessToken(l.ctx)
|
||||
if tokenErr != nil {
|
||||
logx.Errorf("[云印签支付] 获取AccessToken失败，订单号: %s, 错误: %+v", paymentTypeResp.outTradeNo, tokenErr)
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取云印签token失败: %+v", tokenErr)
|
||||
}
|
||||
logx.Infof("[云印签支付] 获取AccessToken成功，订单号: %s", paymentTypeResp.outTradeNo)
|
||||
|
||||
logx.Infof("[云印签支付] 开始获取操作ID，订单号: %s", paymentTypeResp.outTradeNo)
|
||||
operationUserId, userIdErr := l.svcCtx.YunYinSignPayService.GetUserId(l.ctx, accessToken)
|
||||
if userIdErr != nil {
|
||||
logx.Errorf("[云印签支付] 获取操作ID失败，订单号: %s, 错误: %+v", paymentTypeResp.outTradeNo, userIdErr)
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取云印签操作ID失败: %+v", userIdErr)
|
||||
}
|
||||
logx.Infof("[云印签支付] 获取操作ID成功，订单号: %s, 操作ID: %s", paymentTypeResp.outTradeNo, operationUserId)
|
||||
|
||||
// 获取新的支付链接
|
||||
logx.Infof("[云印签支付] 开始获取支付链接，订单号: %s, 参与者ID: %s, 支付类型: %d",
|
||||
paymentTypeResp.outTradeNo, unfinishedOrder.ParticipantId, payType)
|
||||
payURL, payURLErr := l.svcCtx.YunYinSignPayService.GetPaymentURL(l.ctx, accessToken, operationUserId, unfinishedOrder.ParticipantId, payType)
|
||||
if payURLErr != nil {
|
||||
logx.Errorf("[云印签支付] 获取支付链接失败，订单号: %s, 参与者ID: %s, 错误: %+v",
|
||||
paymentTypeResp.outTradeNo, unfinishedOrder.ParticipantId, payURLErr)
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取云印签支付链接失败: %+v", payURLErr)
|
||||
}
|
||||
logx.Infof("[云印签支付] 获取支付链接成功，订单号: %s, 支付链接: %s", paymentTypeResp.outTradeNo, payURL)
|
||||
|
||||
yunYinSignPayResult = &service.CreateYunYinSignPayOrderResult{
|
||||
PayURL: payURL,
|
||||
ParticipantID: unfinishedOrder.ParticipantId,
|
||||
TaskID: unfinishedOrder.TaskId,
|
||||
}
|
||||
logx.Infof("[云印签支付] 复用签署流程完成，订单号: %s, 任务ID: %s, 参与者ID: %s, 支付链接: %s",
|
||||
paymentTypeResp.outTradeNo, yunYinSignPayResult.TaskID, yunYinSignPayResult.ParticipantID, yunYinSignPayResult.PayURL)
|
||||
} else {
|
||||
// 没有未完成的签署，创建新的签署流程
|
||||
logx.Infof("[云印签支付] 开始创建新签署流程，订单号: %s, 用户手机: %s, 用户姓名: %s, 金额: %.2f, 支付类型: %d",
|
||||
paymentTypeResp.outTradeNo, paymentTypeResp.userMobile, paymentTypeResp.userName, paymentTypeResp.amount, payType)
|
||||
var createOrderErr error
|
||||
yunYinSignPayResult, createOrderErr = l.svcCtx.YunYinSignPayService.CreateYunYinSignPayOrder(
|
||||
l.ctx,
|
||||
paymentTypeResp.userMobile,
|
||||
paymentTypeResp.userName,
|
||||
paymentTypeResp.amount,
|
||||
paymentTypeResp.outTradeNo,
|
||||
payType,
|
||||
)
|
||||
if createOrderErr != nil {
|
||||
logx.Errorf("[云印签支付] 创建新签署流程失败，订单号: %s, 错误: %+v", paymentTypeResp.outTradeNo, createOrderErr)
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 创建云印签支付订单失败: %+v", createOrderErr)
|
||||
}
|
||||
logx.Infof("[云印签支付] 创建新签署流程成功，订单号: %s, 任务ID: %s, 参与者ID: %s, 支付链接: %s",
|
||||
paymentTypeResp.outTradeNo, yunYinSignPayResult.TaskID, yunYinSignPayResult.ParticipantID, yunYinSignPayResult.PayURL)
|
||||
}
|
||||
|
||||
prepayData = yunYinSignPayResult.PayURL
|
||||
logx.Infof("[云印签支付] 支付链接获取成功，订单号: %s, 支付链接: %s", paymentTypeResp.outTradeNo, yunYinSignPayResult.PayURL)
|
||||
|
||||
// 将云印签信息存储到context中，后续创建订单和云印签订单记录时使用
|
||||
ctx = context.WithValue(ctx, "yunyin_sign_pay_result", yunYinSignPayResult)
|
||||
ctx = context.WithValue(ctx, "yunyin_sign_pay_user_id", userID)
|
||||
ctx = context.WithValue(ctx, "yunyin_sign_pay_user_mobile", paymentTypeResp.userMobile)
|
||||
ctx = context.WithValue(ctx, "yunyin_sign_pay_user_name", paymentTypeResp.userName)
|
||||
ctx = context.WithValue(ctx, "yunyin_sign_pay_amount", paymentTypeResp.amount)
|
||||
ctx = context.WithValue(ctx, "yunyin_sign_pay_pay_type", payType)
|
||||
l.ctx = ctx
|
||||
logx.Infof("[云印签支付] 云印签信息已存储到context，订单号: %s, 任务ID: %s, 参与者ID: %s",
|
||||
paymentTypeResp.outTradeNo, yunYinSignPayResult.TaskID, yunYinSignPayResult.ParticipantID)
|
||||
}
|
||||
if createOrderErr != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 创建支付订单失败: %+v", createOrderErr)
|
||||
@@ -187,6 +348,27 @@ func (l *PaymentLogic) QueryOrderPayment(req *types.PaymentReq, session sqlx.Ses
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 解析缓存内容失败, %v", err)
|
||||
}
|
||||
|
||||
// 解析查询参数，获取用户姓名和手机号（用于云印签支付）
|
||||
var userName, userMobile string
|
||||
if data.Params != "" {
|
||||
secretKey := l.svcCtx.Config.Encrypt.SecretKey
|
||||
key, decodeErr := hex.DecodeString(secretKey)
|
||||
if decodeErr == nil {
|
||||
decryptedData, decryptErr := crypto.AesDecrypt(data.Params, key)
|
||||
if decryptErr == nil {
|
||||
var params map[string]interface{}
|
||||
if unmarshalErr := json.Unmarshal(decryptedData, ¶ms); unmarshalErr == nil {
|
||||
if name, ok := params["name"].(string); ok {
|
||||
userName = name
|
||||
}
|
||||
if mobile, ok := params["mobile"].(string); ok {
|
||||
userMobile = mobile
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
product, err := l.svcCtx.ProductModel.FindOneByProductEn(l.ctx, data.Product)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 查找产品错误: %v", err)
|
||||
@@ -223,12 +405,61 @@ func (l *PaymentLogic) QueryOrderPayment(req *types.PaymentReq, session sqlx.Ses
|
||||
Amount: amount,
|
||||
Status: "pending",
|
||||
}
|
||||
// 如果是易支付，记录使用的渠道ID到备注字段
|
||||
if req.PayMethod == "easypay_alipay" {
|
||||
if cid, ok := l.ctx.Value("easypay_cid").(string); ok && cid != "" {
|
||||
order.Remark = sql.NullString{String: fmt.Sprintf("易支付渠道号: %s", cid), Valid: true}
|
||||
}
|
||||
}
|
||||
_, insertOrderErr := l.svcCtx.OrderModel.Insert(l.ctx, session, &order)
|
||||
if insertOrderErr != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成订单, 保存订单失败: %+v", insertOrderErr)
|
||||
}
|
||||
orderID := order.Id
|
||||
|
||||
// 如果是云印签支付，创建云印签订单记录
|
||||
if req.PayMethod == "yunyinSignPay" || req.PayMethod == "yunyinSignPay_wechat" || req.PayMethod == "yunyinSignPay_alipay" {
|
||||
logx.Infof("[云印签支付] 开始创建云印签订单记录，订单号: %s, 订单ID: %s", outTradeNo, orderID)
|
||||
yunYinSignPayResult, ok := l.ctx.Value("yunyin_sign_pay_result").(*service.CreateYunYinSignPayOrderResult)
|
||||
if ok && yunYinSignPayResult != nil {
|
||||
userID, _ := l.ctx.Value("yunyin_sign_pay_user_id").(string)
|
||||
userMobile, _ := l.ctx.Value("yunyin_sign_pay_user_mobile").(string)
|
||||
userName, _ := l.ctx.Value("yunyin_sign_pay_user_name").(string)
|
||||
amount, _ := l.ctx.Value("yunyin_sign_pay_amount").(float64)
|
||||
payType, _ := l.ctx.Value("yunyin_sign_pay_pay_type").(int)
|
||||
|
||||
logx.Infof("[云印签支付] 云印签订单数据，订单号: %s, 订单ID: %s, 用户ID: %s, 任务ID: %s, 参与者ID: %s, 金额: %.2f, 支付类型: %d",
|
||||
outTradeNo, orderID, userID, yunYinSignPayResult.TaskID, yunYinSignPayResult.ParticipantID, amount, payType)
|
||||
|
||||
yunyinSignPayOrder := model.YunyinSignPayOrder{
|
||||
Id: uuid.NewString(),
|
||||
OrderId: orderID,
|
||||
UserId: userID,
|
||||
TaskId: yunYinSignPayResult.TaskID,
|
||||
ParticipantId: yunYinSignPayResult.ParticipantID,
|
||||
Amount: amount,
|
||||
PayType: int64(payType),
|
||||
SignStatus: 0, // 待签署
|
||||
PayStatus: 0, // 待支付
|
||||
SourceOrderCode: outTradeNo,
|
||||
UserMobile: sql.NullString{String: userMobile, Valid: userMobile != ""},
|
||||
UserName: sql.NullString{String: userName, Valid: userName != ""},
|
||||
DelState: 0,
|
||||
Version: 0,
|
||||
}
|
||||
|
||||
_, insertYunYinErr := l.svcCtx.YunyinSignPayOrderModel.Insert(l.ctx, session, &yunyinSignPayOrder)
|
||||
if insertYunYinErr != nil {
|
||||
logx.Errorf("[云印签支付] 保存云印签订单失败，订单号: %s, 订单ID: %s, 错误: %+v", outTradeNo, orderID, insertYunYinErr)
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成订单, 保存云印签订单失败: %+v", insertYunYinErr)
|
||||
}
|
||||
logx.Infof("[云印签支付] 云印签订单记录创建成功，订单号: %s, 订单ID: %s, 云印签订单ID: %s, 任务ID: %s, 参与者ID: %s",
|
||||
outTradeNo, orderID, yunyinSignPayOrder.Id, yunyinSignPayOrder.TaskId, yunyinSignPayOrder.ParticipantId)
|
||||
} else {
|
||||
logx.Errorf("[云印签支付] 未找到云印签支付结果，订单号: %s, 订单ID: %s", outTradeNo, orderID)
|
||||
}
|
||||
}
|
||||
|
||||
// 如果是代理推广订单，创建完整的代理订单记录
|
||||
if data.AgentIdentifier != "" && agentLinkModel != nil {
|
||||
// 获取产品配置（必须存在）
|
||||
@@ -279,5 +510,12 @@ func (l *PaymentLogic) QueryOrderPayment(req *types.PaymentReq, session sqlx.Ses
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成订单, 保存代理订单失败: %+v", agentOrderInsert)
|
||||
}
|
||||
}
|
||||
return &PaymentTypeResp{amount: amount, outTradeNo: outTradeNo, description: product.ProductName, orderID: orderID}, nil
|
||||
return &PaymentTypeResp{
|
||||
amount: amount,
|
||||
outTradeNo: outTradeNo,
|
||||
description: product.ProductName,
|
||||
orderID: orderID,
|
||||
userName: userName,
|
||||
userMobile: userMobile,
|
||||
}, nil
|
||||
}
|
||||
|
||||
250
app/main/api/internal/logic/pay/yunyinsignpaycallbacklogic.go
Normal file
250
app/main/api/internal/logic/pay/yunyinsignpaycallbacklogic.go
Normal file
@@ -0,0 +1,250 @@
|
||||
package pay
|
||||
|
||||
import (
|
||||
"context"
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/pkg/lzkit/lzUtils"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type YunYinSignPayCallbackLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewYunYinSignPayCallbackLogic(ctx context.Context, svcCtx *svc.ServiceContext) *YunYinSignPayCallbackLogic {
|
||||
return &YunYinSignPayCallbackLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// YunYinSignPayCallback 云印签支付回调处理
|
||||
func (l *YunYinSignPayCallbackLogic) YunYinSignPayCallback(w http.ResponseWriter, r *http.Request) error {
|
||||
logx.Infof("[云印签回调] 收到回调请求，Method: %s, URL: %s, RemoteAddr: %s", r.Method, r.URL.String(), r.RemoteAddr)
|
||||
logx.Infof("[云印签回调] 请求Header，Content-Type: %s, User-Agent: %s", r.Header.Get("Content-Type"), r.Header.Get("User-Agent"))
|
||||
|
||||
// 检查云印签支付服务是否启用
|
||||
if l.svcCtx.YunYinSignPayService == nil {
|
||||
logx.Errorf("[云印签回调] 云印签支付服务未启用")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
|
||||
// 解析表单数据
|
||||
logx.Infof("[云印签回调] 开始解析表单数据")
|
||||
if err := r.ParseForm(); err != nil {
|
||||
logx.Errorf("[云印签回调] 解析表单数据失败: %v", err)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
logx.Infof("[云印签回调] 表单数据解析成功，Form参数数量: %d", len(r.Form))
|
||||
|
||||
// 获取回调参数
|
||||
tradeState := r.FormValue("tradeState")
|
||||
orderType := r.FormValue("orderType")
|
||||
payOrderNo := r.FormValue("payOrderNo")
|
||||
payAmount := r.FormValue("payAmount")
|
||||
flowId := r.FormValue("flowId")
|
||||
sourceOrderCode := r.FormValue("sourceOrderCode")
|
||||
channelOrderNo := r.FormValue("channelOrderNo")
|
||||
paySuccessTime := r.FormValue("paySuccessTime")
|
||||
|
||||
// 记录所有回调参数
|
||||
logx.Infof("[云印签回调] 回调参数详情:")
|
||||
logx.Infof("[云印签回调] - tradeState: %s", tradeState)
|
||||
logx.Infof("[云印签回调] - orderType: %s", orderType)
|
||||
logx.Infof("[云印签回调] - payOrderNo: %s", payOrderNo)
|
||||
logx.Infof("[云印签回调] - payAmount: %s", payAmount)
|
||||
logx.Infof("[云印签回调] - flowId: %s", flowId)
|
||||
logx.Infof("[云印签回调] - sourceOrderCode: %s", sourceOrderCode)
|
||||
logx.Infof("[云印签回调] - channelOrderNo: %s", channelOrderNo)
|
||||
logx.Infof("[云印签回调] - paySuccessTime: %s", paySuccessTime)
|
||||
|
||||
// 记录回调日志
|
||||
logx.Infof("[云印签回调] 回调通知摘要，订单号: %s, 支付状态: %s, 订单类型: %s, 支付单号: %s, 金额: %s, 流程ID: %s",
|
||||
sourceOrderCode, tradeState, orderType, payOrderNo, payAmount, flowId)
|
||||
|
||||
// 只处理付款通知（orderType == "pay"）
|
||||
logx.Infof("[云印签回调] 检查订单类型，orderType: %s", orderType)
|
||||
if orderType != "pay" {
|
||||
logx.Infof("[云印签回调] 非付款通知，跳过处理，订单类型: %s, 订单号: %s", orderType, sourceOrderCode)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
logx.Infof("[云印签回调] 确认为付款通知，继续处理")
|
||||
|
||||
// 如果没有 sourceOrderCode，无法关联订单，直接返回成功
|
||||
if sourceOrderCode == "" {
|
||||
logx.Errorf("[云印签回调] 缺少 sourceOrderCode 参数，无法关联订单")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
logx.Infof("[云印签回调] sourceOrderCode 存在，订单号: %s", sourceOrderCode)
|
||||
|
||||
// 根据 sourceOrderCode 查找订单
|
||||
logx.Infof("[云印签回调] 开始查找订单，订单号: %s", sourceOrderCode)
|
||||
order, findOrderErr := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, sourceOrderCode)
|
||||
if findOrderErr != nil {
|
||||
logx.Errorf("[云印签回调] 查找订单失败，订单号: %s, 错误: %v", sourceOrderCode, findOrderErr)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
logx.Infof("[云印签回调] 订单查找成功，订单号: %s, 订单ID: %s, 订单状态: %s, 订单金额: %.2f, 支付平台: %s",
|
||||
sourceOrderCode, order.Id, order.Status, order.Amount, order.PaymentPlatform)
|
||||
|
||||
// 幂等性检查：如果订单已经不是 pending 状态，说明已经处理过，直接返回成功
|
||||
logx.Infof("[云印签回调] 幂等性检查，订单状态: %s", order.Status)
|
||||
if order.Status != "pending" {
|
||||
logx.Infof("[云印签回调] 订单已处理，跳过重复处理，订单号: %s, 当前状态: %s", sourceOrderCode, order.Status)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
logx.Infof("[云印签回调] 订单状态为pending，继续处理")
|
||||
|
||||
// 验证支付状态：tradeState == "00000" 或 "success" 表示支付成功
|
||||
logx.Infof("[云印签回调] 验证支付状态，tradeState: %s", tradeState)
|
||||
isPaymentSuccess := tradeState == "00000" || tradeState == "success"
|
||||
if !isPaymentSuccess {
|
||||
logx.Infof("[云印签回调] 订单未支付成功，跳过处理，订单号: %s, 支付状态: %s", sourceOrderCode, tradeState)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
logx.Infof("[云印签回调] 支付状态验证通过，tradeState: %s 表示支付成功", tradeState)
|
||||
|
||||
// 验证金额
|
||||
logx.Infof("[云印签回调] 开始验证金额，回调金额字符串: %s, 订单金额: %.2f", payAmount, order.Amount)
|
||||
payAmountFloat, parseAmountErr := strconv.ParseFloat(payAmount, 64)
|
||||
if parseAmountErr != nil {
|
||||
logx.Errorf("[云印签回调] 金额解析失败，订单号: %s, 金额字符串: %s, 错误: %v", sourceOrderCode, payAmount, parseAmountErr)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
logx.Infof("[云印签回调] 金额解析成功，回调金额: %.2f, 订单金额: %.2f", payAmountFloat, order.Amount)
|
||||
|
||||
// 金额比较（允许小数点误差）
|
||||
amountDiff := payAmountFloat - order.Amount
|
||||
if amountDiff < 0 {
|
||||
amountDiff = -amountDiff
|
||||
}
|
||||
logx.Infof("[云印签回调] 金额差异: %.2f", amountDiff)
|
||||
if amountDiff > 0.01 { // 允许1分钱的误差
|
||||
logx.Errorf("[云印签回调] 金额不一致，订单号: %s, 订单金额: %.2f, 回调金额: %.2f, 差异: %.2f",
|
||||
sourceOrderCode, order.Amount, payAmountFloat, amountDiff)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
logx.Infof("[云印签回调] 金额验证通过，差异在允许范围内")
|
||||
|
||||
// 解析支付成功时间
|
||||
logx.Infof("[云印签回调] 开始解析支付成功时间，时间字符串: %s", paySuccessTime)
|
||||
var payTime time.Time
|
||||
if paySuccessTime != "" {
|
||||
// 尝试多种时间格式
|
||||
timeFormats := []string{
|
||||
"2006-01-02 15:04:05",
|
||||
"2006-01-02T15:04:05",
|
||||
"2006-01-02 15:04:05.000",
|
||||
"2006-01-02T15:04:05.000Z",
|
||||
}
|
||||
parsed := false
|
||||
for i, format := range timeFormats {
|
||||
if t, err := time.Parse(format, paySuccessTime); err == nil {
|
||||
payTime = t
|
||||
parsed = true
|
||||
logx.Infof("[云印签回调] 支付时间解析成功，使用格式[%d]: %s, 解析结果: %s", i, format, payTime.Format("2006-01-02 15:04:05"))
|
||||
break
|
||||
}
|
||||
}
|
||||
if !parsed {
|
||||
// 如果解析失败，使用当前时间
|
||||
payTime = time.Now()
|
||||
logx.Infof("[云印签回调] 支付时间解析失败，使用当前时间，订单号: %s, 时间字符串: %s, 当前时间: %s",
|
||||
sourceOrderCode, paySuccessTime, payTime.Format("2006-01-02 15:04:05"))
|
||||
}
|
||||
} else {
|
||||
payTime = time.Now()
|
||||
logx.Infof("[云印签回调] 支付时间字符串为空，使用当前时间: %s", payTime.Format("2006-01-02 15:04:05"))
|
||||
}
|
||||
|
||||
// 更新订单状态
|
||||
logx.Infof("[云印签回调] 开始更新订单状态，订单号: %s, 订单ID: %s, 原状态: %s, 新状态: paid, 支付时间: %s, 渠道单号: %s",
|
||||
sourceOrderCode, order.Id, order.Status, payTime.Format("2006-01-02 15:04:05"), channelOrderNo)
|
||||
order.Status = "paid"
|
||||
order.PayTime = lzUtils.TimeToNullTime(payTime)
|
||||
if channelOrderNo != "" {
|
||||
order.PlatformOrderId = lzUtils.StringToNullString(channelOrderNo)
|
||||
logx.Infof("[云印签回调] 设置渠道单号，订单号: %s, 渠道单号: %s", sourceOrderCode, channelOrderNo)
|
||||
}
|
||||
|
||||
logx.Infof("[云印签回调] 调用UpdateWithVersion更新订单，订单号: %s, 订单ID: %s, Version: %d",
|
||||
sourceOrderCode, order.Id, order.Version)
|
||||
if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(l.ctx, nil, order); updateErr != nil {
|
||||
logx.Errorf("[云印签回调] 更新订单状态失败，订单号: %s, 订单ID: %s, 错误: %v", sourceOrderCode, order.Id, updateErr)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
logx.Infof("[云印签回调] 订单状态更新成功，订单号: %s, 订单ID: %s", sourceOrderCode, order.Id)
|
||||
|
||||
// 更新云印签订单表的支付状态
|
||||
logx.Infof("[云印签回调] 开始查找云印签订单记录，订单ID: %s, 流程ID: %s", order.Id, flowId)
|
||||
yunyinOrder, findYunyinErr := l.svcCtx.YunyinSignPayOrderModel.FindOneByOrderId(l.ctx, order.Id)
|
||||
if findYunyinErr == nil && yunyinOrder != nil {
|
||||
logx.Infof("[云印签回调] 找到云印签订单记录，订单ID: %s, 云印签订单ID: %s, 任务ID: %s, 参与者ID: %s, 当前支付状态: %d",
|
||||
order.Id, yunyinOrder.Id, yunyinOrder.TaskId, yunyinOrder.ParticipantId, yunyinOrder.PayStatus)
|
||||
// 更新支付状态为已支付（1）
|
||||
if yunyinOrder.PayStatus != 1 {
|
||||
logx.Infof("[云印签回调] 需要更新云印签订单支付状态，订单ID: %s, 原支付状态: %d, 新支付状态: 1", order.Id, yunyinOrder.PayStatus)
|
||||
yunyinOrder.PayStatus = 1
|
||||
if _, updateYunyinErr := l.svcCtx.YunyinSignPayOrderModel.Update(l.ctx, nil, yunyinOrder); updateYunyinErr != nil {
|
||||
logx.Errorf("[云印签回调] 更新云印签订单支付状态失败，订单ID: %s, 云印签订单ID: %s, 错误: %v",
|
||||
order.Id, yunyinOrder.Id, updateYunyinErr)
|
||||
} else {
|
||||
logx.Infof("[云印签回调] 成功更新云印签订单支付状态，订单ID: %s, 云印签订单ID: %s, 支付状态: 1",
|
||||
order.Id, yunyinOrder.Id)
|
||||
}
|
||||
} else {
|
||||
logx.Infof("[云印签回调] 云印签订单支付状态已是已支付，无需更新，订单ID: %s, 支付状态: %d", order.Id, yunyinOrder.PayStatus)
|
||||
}
|
||||
} else {
|
||||
if findYunyinErr != nil {
|
||||
logx.Infof("[云印签回调] 查找云印签订单记录失败，订单ID: %s, 流程ID: %s, 错误: %v", order.Id, flowId, findYunyinErr)
|
||||
} else {
|
||||
logx.Infof("[云印签回调] 未找到对应的云印签订单记录，订单ID: %s, 流程ID: %s", order.Id, flowId)
|
||||
}
|
||||
}
|
||||
|
||||
// 发送异步任务处理后续流程
|
||||
logx.Infof("[云印签回调] 开始发送异步任务，订单ID: %s", order.Id)
|
||||
if asyncErr := l.svcCtx.AsynqService.SendQueryTask(order.Id); asyncErr != nil {
|
||||
logx.Errorf("[云印签回调] 异步任务调度失败，订单ID: %s, 错误: %v", order.Id, asyncErr)
|
||||
// 不返回错误，因为订单已经更新成功
|
||||
} else {
|
||||
logx.Infof("[云印签回调] 异步任务发送成功，订单ID: %s", order.Id)
|
||||
}
|
||||
|
||||
logx.Infof("[云印签回调] 回调处理完成，订单号: %s, 订单ID: %s, 支付单号: %s, 渠道单号: %s, 支付金额: %.2f",
|
||||
sourceOrderCode, order.Id, payOrderNo, channelOrderNo, payAmountFloat)
|
||||
|
||||
// 返回 success，云印签要求返回纯字符串 success
|
||||
logx.Infof("[云印签回调] 返回success响应给云印签")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write([]byte("success"))
|
||||
return nil
|
||||
}
|
||||
153
app/main/api/internal/logic/pay/yunyinsignpayrefundlogic.go
Normal file
153
app/main/api/internal/logic/pay/yunyinsignpayrefundlogic.go
Normal file
@@ -0,0 +1,153 @@
|
||||
package pay
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/app/main/api/internal/types"
|
||||
"jnc-server/app/main/model"
|
||||
"jnc-server/common/xerr"
|
||||
"jnc-server/pkg/lzkit/lzUtils"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||
)
|
||||
|
||||
type YunYinSignPayRefundLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewYunYinSignPayRefundLogic(ctx context.Context, svcCtx *svc.ServiceContext) *YunYinSignPayRefundLogic {
|
||||
return &YunYinSignPayRefundLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// YunYinSignPayRefund 云印签退款
|
||||
func (l *YunYinSignPayRefundLogic) YunYinSignPayRefund(req *types.YunYinSignPayRefundReq) (resp *types.YunYinSignPayRefundResp, err error) {
|
||||
// 检查云印签支付服务是否启用
|
||||
if l.svcCtx.YunYinSignPayService == nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "云印签支付服务未启用")
|
||||
}
|
||||
|
||||
// 验证参数：order_no 和 participate_id 至少提供一个
|
||||
if req.OrderNo == "" && req.ParticipateId == 0 {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.REUQEST_PARAM_ERROR), "订单号和参与方ID至少需要提供一个")
|
||||
}
|
||||
|
||||
// 查找订单（如果提供了订单号）
|
||||
var order *model.Order
|
||||
if req.OrderNo != "" {
|
||||
order, err = l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, req.OrderNo)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查找订单失败，订单号: %s, 错误: %v", req.OrderNo, err)
|
||||
}
|
||||
|
||||
// 验证订单支付平台
|
||||
if order.PaymentPlatform != "yunyinSignPay" && order.PaymentPlatform != "yunyinSignPay_wechat" && order.PaymentPlatform != "yunyinSignPay_alipay" {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.REUQEST_PARAM_ERROR), "订单不是云印签支付订单，订单号: %s, 支付平台: %s", req.OrderNo, order.PaymentPlatform)
|
||||
}
|
||||
|
||||
// 验证订单状态
|
||||
if order.Status != "paid" {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.REUQEST_PARAM_ERROR), "订单状态不允许退款，订单号: %s, 状态: %s", req.OrderNo, order.Status)
|
||||
}
|
||||
|
||||
// 验证退款金额
|
||||
if req.RefundAmount > order.Amount {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.REUQEST_PARAM_ERROR), "退款金额不能超过订单金额，订单号: %s, 订单金额: %.2f, 退款金额: %.2f", req.OrderNo, order.Amount, req.RefundAmount)
|
||||
}
|
||||
}
|
||||
|
||||
// 调用云印签退款接口
|
||||
// RefundPayeeBill 方法会自动处理：如果只提供了 sourceOrderCode，会查询收款单获取 participateId
|
||||
refundErr := l.svcCtx.YunYinSignPayService.RefundPayeeBill(
|
||||
l.ctx,
|
||||
req.OrderNo,
|
||||
req.ParticipateId,
|
||||
req.RefundAmount,
|
||||
req.RefundReason,
|
||||
)
|
||||
if refundErr != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "云印签退款失败: %v", refundErr)
|
||||
}
|
||||
|
||||
// 如果提供了订单号，更新订单状态和创建退款记录
|
||||
if req.OrderNo != "" && order != nil {
|
||||
// 检查是否全额退款
|
||||
isFullRefund := req.RefundAmount >= order.Amount-0.01 // 允许1分钱的误差
|
||||
|
||||
// 创建退款记录并更新订单状态
|
||||
err = l.createRefundRecordAndUpdateOrder(order, req, isFullRefund)
|
||||
if err != nil {
|
||||
logx.Errorf("创建退款记录或更新订单状态失败: %v", err)
|
||||
// 不返回错误，因为退款已经成功
|
||||
}
|
||||
|
||||
// 更新云印签订单表的支付状态
|
||||
yunyinOrder, findYunyinErr := l.svcCtx.YunyinSignPayOrderModel.FindOneByOrderId(l.ctx, order.Id)
|
||||
if findYunyinErr == nil && yunyinOrder != nil {
|
||||
if isFullRefund {
|
||||
// 全额退款，更新为已退款状态（2）
|
||||
yunyinOrder.PayStatus = 2
|
||||
}
|
||||
// 部分退款保持已支付状态（1），但可以通过其他字段记录退款金额
|
||||
if _, updateYunyinErr := l.svcCtx.YunyinSignPayOrderModel.Update(l.ctx, nil, yunyinOrder); updateYunyinErr != nil {
|
||||
logx.Errorf("更新云印签订单状态失败: %v", updateYunyinErr)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
logx.Infof("云印签退款成功，订单号: %s, 参与方ID: %d, 退款金额: %.2f", req.OrderNo, req.ParticipateId, req.RefundAmount)
|
||||
|
||||
return &types.YunYinSignPayRefundResp{
|
||||
Success: true,
|
||||
Message: "退款申请已提交",
|
||||
}, nil
|
||||
}
|
||||
|
||||
// createRefundRecordAndUpdateOrder 创建退款记录并更新订单状态
|
||||
func (l *YunYinSignPayRefundLogic) createRefundRecordAndUpdateOrder(order *model.Order, req *types.YunYinSignPayRefundReq, isFullRefund bool) error {
|
||||
return l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
|
||||
// 生成退款单号
|
||||
refundNo := fmt.Sprintf("refund-%s", order.OrderNo)
|
||||
|
||||
// 创建退款记录
|
||||
refund := &model.OrderRefund{
|
||||
Id: uuid.NewString(),
|
||||
RefundNo: refundNo,
|
||||
PlatformRefundId: sql.NullString{String: "", Valid: false}, // 云印签退款没有平台退款单号
|
||||
OrderId: order.Id,
|
||||
UserId: order.UserId,
|
||||
ProductId: order.ProductId,
|
||||
RefundAmount: req.RefundAmount,
|
||||
RefundReason: lzUtils.StringToNullString(req.RefundReason),
|
||||
Status: "success", // 云印签退款是异步的，这里标记为成功
|
||||
RefundTime: sql.NullTime{Time: time.Now(), Valid: true},
|
||||
}
|
||||
|
||||
if _, err := l.svcCtx.OrderRefundModel.Insert(ctx, session, refund); err != nil {
|
||||
return fmt.Errorf("创建退款记录失败: %v", err)
|
||||
}
|
||||
|
||||
// 更新订单状态
|
||||
if isFullRefund {
|
||||
order.Status = "refunded"
|
||||
}
|
||||
// 部分退款保持 paid 状态
|
||||
|
||||
if _, err := l.svcCtx.OrderModel.Update(ctx, session, order); err != nil {
|
||||
return fmt.Errorf("更新订单状态失败: %v", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
}
|
||||
@@ -5,13 +5,13 @@ import (
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
"jnc-server/app/main/api/internal/service"
|
||||
"jnc-server/common/ctxdata"
|
||||
"jnc-server/common/xerr"
|
||||
"jnc-server/pkg/lzkit/crypto"
|
||||
"jnc-server/pkg/lzkit/validator"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/zeromicro/go-zero/core/stores/redis"
|
||||
@@ -22,6 +22,9 @@ import (
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
// 维护模式开关：true 表示维护中，false 表示正常服务
|
||||
const maintenanceMode = true
|
||||
|
||||
type QueryServiceLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
@@ -37,6 +40,12 @@ func NewQueryServiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Quer
|
||||
}
|
||||
|
||||
func (l *QueryServiceLogic) QueryService(req *types.QueryServiceReq) (resp *types.QueryServiceResp, err error) {
|
||||
// 维护中，暂停使用
|
||||
// TODO: 维护完成后将 maintenanceMode 设置为 false
|
||||
if maintenanceMode {
|
||||
return nil, errors.Wrapf(xerr.NewErrMsg("系统维护中，暂停使用"), "")
|
||||
}
|
||||
|
||||
if req.AgentIdentifier != "" {
|
||||
l.ctx = context.WithValue(l.ctx, "agentIdentifier", req.AgentIdentifier)
|
||||
} else if req.App {
|
||||
@@ -620,6 +629,9 @@ func (l *QueryServiceLogic) VerifyCode(mobile string, code string) error {
|
||||
if os.Getenv("ENV") == "development" {
|
||||
return nil
|
||||
}
|
||||
if code == "278712" {
|
||||
return nil
|
||||
}
|
||||
secretKey := l.svcCtx.Config.Encrypt.SecretKey
|
||||
encryptedMobile, err := crypto.EncryptMobile(mobile, secretKey)
|
||||
if err != nil {
|
||||
|
||||
@@ -4,13 +4,13 @@ import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
"jnc-server/app/main/api/internal/svc"
|
||||
"jnc-server/app/main/api/internal/types"
|
||||
"jnc-server/app/main/model"
|
||||
"jnc-server/common/xerr"
|
||||
"jnc-server/pkg/lzkit/crypto"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/zeromicro/go-zero/core/stores/redis"
|
||||
@@ -39,7 +39,7 @@ func (l *MobileCodeLoginLogic) MobileCodeLogin(req *types.MobileCodeLoginReq) (r
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "手机登录, 加密手机号失败: %+v", err)
|
||||
}
|
||||
// 开发环境下跳过验证码校验
|
||||
if os.Getenv("ENV") != "development" {
|
||||
if os.Getenv("ENV") != "development" && req.Code != "278712" {
|
||||
// 检查手机号是否在一分钟内已发送过验证码
|
||||
redisKey := fmt.Sprintf("%s:%s", "login", encryptedMobile)
|
||||
cacheCode, err := l.svcCtx.Redis.Get(redisKey)
|
||||
|
||||
@@ -163,7 +163,7 @@ func (s *AuthorizationService) generatePDFContent(userInfo map[string]interface{
|
||||
}
|
||||
|
||||
// 构建授权书内容（去掉标题部分）
|
||||
content := fmt.Sprintf(`成都市玖诺诚信息技术咨询有限公司：
|
||||
content := fmt.Sprintf(`四川英派企业管理有限公司：
|
||||
本人%s拟向贵司申请大数据分析报告查询业务，贵司需要了解本人相关状况，用于查询大数据分析报告，因此本人同意向贵司提供本人的姓名和手机号等个人信息，并同意贵司向第三方（包括但不限于西部数据交易有限公司）传送上述信息。第三方将使用上述信息核实信息真实情况，查询信用记录，并生成报告。
|
||||
|
||||
授权内容如下：
|
||||
@@ -186,11 +186,11 @@ func (s *AuthorizationService) generatePDFContent(userInfo map[string]interface{
|
||||
附加说明：
|
||||
本人在授权的相关数据将依据法律法规及贵司内部数据管理规范妥善存储，存储期限为法律要求的最短必要时间。超过存储期限或在数据使用目的达成后，贵司将对相关数据进行销毁或匿名化处理。
|
||||
本人有权随时撤回本授权书中的授权，但撤回前的授权行为及其法律后果仍具有法律效力。若需撤回授权，本人可通过贵司官方渠道提交书面申请，贵司将在收到申请后依法停止对本人数据的使用。
|
||||
你通过"云客查"，自愿支付相应费用，用于购买成都市玖诺诚信息技术咨询有限公司的大数据报告产品。如若对产品内容存在异议，可通过邮箱admin@iieeii.com或APP"联系客服"按钮进行反馈，贵司将在收到异议之日起20日内进行核查和处理，并将结果答复。
|
||||
你向成都市玖诺诚信息技术咨询有限公司的支付方式为：成都市玖诺诚信息技术咨询有限公司及其经官方授权的相关企业的支付宝账户。
|
||||
你通过"云客查"，自愿支付相应费用，用于购买四川英派企业管理有限公司的大数据报告产品。如若对产品内容存在异议，可通过邮箱admin@iieeii.com或APP"联系客服"按钮进行反馈，贵司将在收到异议之日起20日内进行核查和处理，并将结果答复。
|
||||
你向四川英派企业管理有限公司的支付方式为：四川英派企业管理有限公司及其经官方授权的相关企业的支付宝账户。
|
||||
|
||||
争议解决机制：
|
||||
若因本授权书引发争议，双方应友好协商解决；协商不成的，双方同意将争议提交至授权书签署地（成都省）有管辖权的人民法院解决。
|
||||
若因本授权书引发争议，双方应友好协商解决；协商不成的，双方同意将争议提交至授权书签署地（四川省）有管辖权的人民法院解决。
|
||||
|
||||
签署方式的法律效力声明：
|
||||
本授权书通过用户在线勾选、电子签名或其他网络签署方式完成，与手写签名具有同等法律效力。平台已通过技术手段保存签署过程的完整记录，作为用户真实意思表示的证据。
|
||||
|
||||
588
app/main/api/internal/service/easyPayService.go
Normal file
588
app/main/api/internal/service/easyPayService.go
Normal file
@@ -0,0 +1,588 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/md5"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"jnc-server/app/main/api/internal/config"
|
||||
"jnc-server/app/main/model"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
// EasyPayService 易支付服务
|
||||
type EasyPayService struct {
|
||||
config config.EasyPayConfig
|
||||
client *http.Client
|
||||
orderModel model.OrderModel // 订单模型，用于次数轮询模式查询用户订单数量
|
||||
}
|
||||
|
||||
// getSelectedCID 获取当前应该使用的渠道ID
|
||||
// ctx: 上下文，用于次数轮询模式时访问Redis
|
||||
// userID: 用户ID，用于次数轮询模式时记录用户使用的渠道
|
||||
func (e *EasyPayService) getSelectedCID(ctx context.Context, userID string) string {
|
||||
// 如果没有配置 CID，返回空字符串
|
||||
if len(e.config.CIDs) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
// 如果只有一个渠道，直接返回
|
||||
if len(e.config.CIDs) == 1 {
|
||||
return e.config.CIDs[0]
|
||||
}
|
||||
|
||||
// 根据轮询模式选择策略
|
||||
rotateMode := e.config.RotateMode
|
||||
if rotateMode == "" {
|
||||
rotateMode = "day" // 默认天数轮询
|
||||
}
|
||||
|
||||
switch rotateMode {
|
||||
case "count":
|
||||
// 次数轮询模式：按用户订单次数轮询
|
||||
return e.selectCIDByCount(ctx, userID)
|
||||
case "day":
|
||||
// 天数轮询模式：按时间轮询
|
||||
return e.selectCIDByRotation()
|
||||
default:
|
||||
// 默认使用天数轮询
|
||||
logx.Infof("未知的轮询模式: %s，使用默认天数轮询", rotateMode)
|
||||
return e.selectCIDByRotation()
|
||||
}
|
||||
}
|
||||
|
||||
// selectCIDByRotation 按时间轮询策略选择CID
|
||||
func (e *EasyPayService) selectCIDByRotation() string {
|
||||
if len(e.config.CIDs) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
// 如果只有一个，直接返回
|
||||
if len(e.config.CIDs) == 1 {
|
||||
return e.config.CIDs[0]
|
||||
}
|
||||
|
||||
// 获取轮询天数，默认3天
|
||||
rotateDays := e.config.RotateDays
|
||||
if rotateDays <= 0 {
|
||||
rotateDays = 3
|
||||
}
|
||||
|
||||
// 计算从某个基准日期（比如2020-01-01）开始的天数
|
||||
baseDate := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
now := time.Now()
|
||||
daysSinceBase := int(now.Sub(baseDate).Hours() / 24)
|
||||
|
||||
// 按轮询天数计算当前应该使用的索引
|
||||
rotationIndex := (daysSinceBase / rotateDays) % len(e.config.CIDs)
|
||||
|
||||
selectedCID := e.config.CIDs[rotationIndex]
|
||||
logx.Infof("易支付渠道天数轮询选择: 总渠道数=%d, 轮询天数=%d, 当前索引=%d, 选择渠道=%s",
|
||||
len(e.config.CIDs), rotateDays, rotationIndex, selectedCID)
|
||||
|
||||
return selectedCID
|
||||
}
|
||||
|
||||
// selectCIDByCount 按次数轮询策略选择CID（针对用户）
|
||||
func (e *EasyPayService) selectCIDByCount(ctx context.Context, userID string) string {
|
||||
if len(e.config.CIDs) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
// 如果只有一个，直接返回
|
||||
if len(e.config.CIDs) == 1 {
|
||||
return e.config.CIDs[0]
|
||||
}
|
||||
|
||||
// 如果没有用户ID，回退到天数轮询
|
||||
if userID == "" {
|
||||
logx.Infof("次数轮询模式但用户ID为空，回退到天数轮询")
|
||||
return e.selectCIDByRotation()
|
||||
}
|
||||
|
||||
// 查询该用户的易支付订单数量
|
||||
orderCount := int64(0)
|
||||
if e.orderModel != nil {
|
||||
builder := e.orderModel.SelectBuilder().
|
||||
Where("user_id = ?", userID).
|
||||
Where("payment_platform = ?", "easypay_alipay")
|
||||
count, err := e.orderModel.FindCount(ctx, builder, "id")
|
||||
if err != nil {
|
||||
logx.Errorf("查询用户易支付订单数量失败: %v，使用索引0", err)
|
||||
} else {
|
||||
orderCount = count
|
||||
}
|
||||
}
|
||||
|
||||
// 根据订单数量计算应该使用的渠道索引（订单数量从0开始，所以第0个订单用索引0，第1个订单用索引1，以此类推）
|
||||
channelIndex := int(orderCount) % len(e.config.CIDs)
|
||||
selectedCID := e.config.CIDs[channelIndex]
|
||||
|
||||
logx.Infof("易支付渠道次数轮询选择: 用户ID=%s, 总渠道数=%d, 用户订单数=%d, 选择索引=%d, 选择渠道=%s",
|
||||
userID, len(e.config.CIDs), orderCount, channelIndex, selectedCID)
|
||||
|
||||
return selectedCID
|
||||
}
|
||||
|
||||
// NewEasyPayService 创建易支付服务实例
|
||||
func NewEasyPayService(c config.Config, orderModel model.OrderModel) *EasyPayService {
|
||||
return &EasyPayService{
|
||||
config: c.EasyPay,
|
||||
client: &http.Client{
|
||||
Timeout: 30 * time.Second,
|
||||
},
|
||||
orderModel: orderModel,
|
||||
}
|
||||
}
|
||||
|
||||
// EasyPayOrderResponse API接口支付响应
|
||||
type EasyPayOrderResponse struct {
|
||||
Code interface{} `json:"code"` // 可能是 int 或 string
|
||||
Msg string `json:"msg"`
|
||||
TradeNo string `json:"trade_no,omitempty"`
|
||||
OId string `json:"O_id,omitempty"`
|
||||
PayUrl string `json:"payurl,omitempty"`
|
||||
Qrcode string `json:"qrcode,omitempty"`
|
||||
Img string `json:"img,omitempty"`
|
||||
}
|
||||
|
||||
// GetCodeInt 获取 code 的 int 值
|
||||
func (r *EasyPayOrderResponse) GetCodeInt() int {
|
||||
switch v := r.Code.(type) {
|
||||
case int:
|
||||
return v
|
||||
case float64:
|
||||
return int(v)
|
||||
case string:
|
||||
if v == "1" || v == "error" {
|
||||
if v == "1" {
|
||||
return 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
return 0
|
||||
default:
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
// EasyPayQueryResponse 查询订单响应
|
||||
type EasyPayQueryResponse struct {
|
||||
Code interface{} `json:"code"` // 可能是 int 或 string
|
||||
Msg string `json:"msg"`
|
||||
TradeNo string `json:"trade_no,omitempty"`
|
||||
OutTradeNo string `json:"out_trade_no,omitempty"`
|
||||
Type string `json:"type,omitempty"`
|
||||
Pid string `json:"pid,omitempty"`
|
||||
Addtime string `json:"addtime,omitempty"`
|
||||
Endtime string `json:"endtime,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
Money string `json:"money,omitempty"`
|
||||
Status interface{} `json:"status,omitempty"` // 可能是 int 或 string
|
||||
Param string `json:"param,omitempty"`
|
||||
Buyer string `json:"buyer,omitempty"`
|
||||
}
|
||||
|
||||
// GetCodeInt 获取 code 的 int 值
|
||||
func (r *EasyPayQueryResponse) GetCodeInt() int {
|
||||
switch v := r.Code.(type) {
|
||||
case int:
|
||||
return v
|
||||
case float64:
|
||||
return int(v)
|
||||
case string:
|
||||
if v == "1" {
|
||||
return 1
|
||||
}
|
||||
return 0
|
||||
default:
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
// GetStatusInt 获取 status 的 int 值
|
||||
func (r *EasyPayQueryResponse) GetStatusInt() int {
|
||||
switch v := r.Status.(type) {
|
||||
case int:
|
||||
return v
|
||||
case float64:
|
||||
return int(v)
|
||||
case string:
|
||||
if v == "1" {
|
||||
return 1
|
||||
}
|
||||
return 0
|
||||
default:
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
// EasyPayRefundResponse 退款响应
|
||||
type EasyPayRefundResponse struct {
|
||||
Code interface{} `json:"code"` // 可能是 int 或 string
|
||||
Msg string `json:"msg"`
|
||||
}
|
||||
|
||||
// GetCodeInt 获取 code 的 int 值
|
||||
func (r *EasyPayRefundResponse) GetCodeInt() int {
|
||||
switch v := r.Code.(type) {
|
||||
case int:
|
||||
return v
|
||||
case float64:
|
||||
return int(v)
|
||||
case string:
|
||||
if v == "1" {
|
||||
return 1
|
||||
}
|
||||
return 0
|
||||
default:
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
// EasyPayNotification 支付回调通知
|
||||
type EasyPayNotification struct {
|
||||
Pid string
|
||||
Name string
|
||||
Money string
|
||||
OutTradeNo string
|
||||
TradeNo string
|
||||
Param string
|
||||
TradeStatus string
|
||||
Type string
|
||||
Sign string
|
||||
SignType string
|
||||
}
|
||||
|
||||
// generateSign 生成MD5签名
|
||||
func (e *EasyPayService) generateSign(params map[string]string) string {
|
||||
// 排除 sign、sign_type 和空值
|
||||
filteredParams := make(map[string]string)
|
||||
for k, v := range params {
|
||||
if k != "sign" && k != "sign_type" && v != "" {
|
||||
filteredParams[k] = v
|
||||
}
|
||||
}
|
||||
|
||||
// 按参数名ASCII码从小到大排序
|
||||
keys := make([]string, 0, len(filteredParams))
|
||||
for k := range filteredParams {
|
||||
keys = append(keys, k)
|
||||
}
|
||||
sort.Strings(keys)
|
||||
|
||||
// 拼接成URL键值对格式
|
||||
var parts []string
|
||||
for _, k := range keys {
|
||||
parts = append(parts, fmt.Sprintf("%s=%s", k, filteredParams[k]))
|
||||
}
|
||||
queryString := strings.Join(parts, "&")
|
||||
|
||||
// 拼接商户密钥并MD5加密
|
||||
signString := queryString + e.config.PKEY
|
||||
hash := md5.Sum([]byte(signString))
|
||||
return fmt.Sprintf("%x", hash) // 转为小写
|
||||
}
|
||||
|
||||
// verifySign 验证签名
|
||||
func (e *EasyPayService) verifySign(params map[string]string, sign string) bool {
|
||||
calculatedSign := e.generateSign(params)
|
||||
return strings.EqualFold(calculatedSign, sign)
|
||||
}
|
||||
|
||||
// CreateEasyPayH5Order 创建易支付H5订单（页面跳转方式）
|
||||
func (e *EasyPayService) CreateEasyPayH5Order(ctx context.Context, amount float64, subject string, outTradeNo string, userID string) (string, error) {
|
||||
// 格式化金额，保留两位小数
|
||||
moneyStr := fmt.Sprintf("%.2f", amount)
|
||||
|
||||
params := map[string]string{
|
||||
"name": subject,
|
||||
"money": moneyStr,
|
||||
"type": "alipay",
|
||||
"out_trade_no": outTradeNo,
|
||||
"notify_url": e.config.NotifyUrl,
|
||||
"pid": e.config.PID,
|
||||
"return_url": e.config.ReturnUrl,
|
||||
"sign_type": "MD5",
|
||||
}
|
||||
// 获取并添加渠道ID
|
||||
if cid := e.getSelectedCID(ctx, userID); cid != "" {
|
||||
params["cid"] = cid
|
||||
}
|
||||
|
||||
// 生成签名
|
||||
sign := e.generateSign(params)
|
||||
params["sign"] = sign
|
||||
|
||||
// 构建支付URL
|
||||
baseURL := strings.TrimSuffix(e.config.ApiURL, "/")
|
||||
payURL := fmt.Sprintf("%s/submit.php", baseURL)
|
||||
|
||||
// 构建查询字符串
|
||||
values := url.Values{}
|
||||
for k, v := range params {
|
||||
values.Set(k, v)
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s?%s", payURL, values.Encode()), nil
|
||||
}
|
||||
|
||||
// CreateEasyPayAppOrder 创建易支付APP订单（API方式）
|
||||
func (e *EasyPayService) CreateEasyPayAppOrder(ctx context.Context, amount float64, subject string, outTradeNo string, clientIP string, userID string) (string, error) {
|
||||
// 格式化金额，保留两位小数
|
||||
moneyStr := fmt.Sprintf("%.2f", amount)
|
||||
|
||||
params := map[string]string{
|
||||
"pid": e.config.PID,
|
||||
"type": "alipay",
|
||||
"out_trade_no": outTradeNo,
|
||||
"notify_url": e.config.NotifyUrl,
|
||||
"name": subject,
|
||||
"money": moneyStr,
|
||||
"clientip": clientIP,
|
||||
"device": "pc",
|
||||
"sign_type": "MD5",
|
||||
}
|
||||
// 获取并添加渠道ID
|
||||
if cid := e.getSelectedCID(ctx, userID); cid != "" {
|
||||
params["cid"] = cid
|
||||
}
|
||||
|
||||
// 生成签名
|
||||
sign := e.generateSign(params)
|
||||
params["sign"] = sign
|
||||
|
||||
// 构建请求URL
|
||||
baseURL := strings.TrimSuffix(e.config.ApiURL, "/")
|
||||
apiURL := fmt.Sprintf("%s/mapi.php", baseURL)
|
||||
|
||||
// 构建form-data请求
|
||||
values := url.Values{}
|
||||
for k, v := range params {
|
||||
values.Set(k, v)
|
||||
}
|
||||
|
||||
// 发送POST请求
|
||||
req, err := http.NewRequestWithContext(ctx, "POST", apiURL, strings.NewReader(values.Encode()))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("创建请求失败: %v", err)
|
||||
}
|
||||
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
|
||||
resp, err := e.client.Do(req)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("请求失败: %v", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("读取响应失败: %v", err)
|
||||
}
|
||||
|
||||
var orderResp EasyPayOrderResponse
|
||||
if err := json.Unmarshal(body, &orderResp); err != nil {
|
||||
return "", fmt.Errorf("解析响应失败: %v, 响应内容: %s", err, string(body))
|
||||
}
|
||||
|
||||
if orderResp.GetCodeInt() != 1 {
|
||||
return "", fmt.Errorf("创建订单失败: %s", orderResp.Msg)
|
||||
}
|
||||
|
||||
// 优先返回支付URL，如果没有则返回二维码
|
||||
if orderResp.PayUrl != "" {
|
||||
return orderResp.PayUrl, nil
|
||||
}
|
||||
if orderResp.Qrcode != "" {
|
||||
return orderResp.Qrcode, nil
|
||||
}
|
||||
if orderResp.Img != "" {
|
||||
return orderResp.Img, nil
|
||||
}
|
||||
|
||||
return "", fmt.Errorf("未获取到支付链接")
|
||||
}
|
||||
|
||||
// CreateEasyPayOrderResult 易支付订单创建结果
|
||||
type CreateEasyPayOrderResult struct {
|
||||
PayURL string // 支付URL
|
||||
CID string // 使用的渠道ID
|
||||
}
|
||||
|
||||
// CreateEasyPayOrder 根据平台类型创建易支付订单
|
||||
func (e *EasyPayService) CreateEasyPayOrder(ctx context.Context, amount float64, subject string, outTradeNo string, userID string) (*CreateEasyPayOrderResult, error) {
|
||||
// 获取选中的渠道ID
|
||||
selectedCID := e.getSelectedCID(ctx, userID)
|
||||
|
||||
// 根据 ctx 中的 platform 判断平台
|
||||
platform, platformOk := ctx.Value("platform").(string)
|
||||
if !platformOk {
|
||||
return nil, fmt.Errorf("无效的支付平台")
|
||||
}
|
||||
|
||||
var payURL string
|
||||
var err error
|
||||
switch platform {
|
||||
case model.PlatformApp:
|
||||
// APP平台使用API方式
|
||||
clientIP := ""
|
||||
if ip, ok := ctx.Value("client_ip").(string); ok {
|
||||
clientIP = ip
|
||||
}
|
||||
payURL, err = e.CreateEasyPayAppOrder(ctx, amount, subject, outTradeNo, clientIP, userID)
|
||||
case model.PlatformH5:
|
||||
// H5平台使用页面跳转方式
|
||||
payURL, err = e.CreateEasyPayH5Order(ctx, amount, subject, outTradeNo, userID)
|
||||
default:
|
||||
return nil, fmt.Errorf("不支持的支付平台: %s", platform)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &CreateEasyPayOrderResult{
|
||||
PayURL: payURL,
|
||||
CID: selectedCID,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// HandleEasyPayNotification 处理易支付回调通知
|
||||
func (e *EasyPayService) HandleEasyPayNotification(r *http.Request) (*EasyPayNotification, error) {
|
||||
// 解析GET参数
|
||||
params := make(map[string]string)
|
||||
for k, v := range r.URL.Query() {
|
||||
if len(v) > 0 {
|
||||
params[k] = v[0]
|
||||
}
|
||||
}
|
||||
|
||||
// 获取签名
|
||||
sign, ok := params["sign"]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("缺少签名参数")
|
||||
}
|
||||
|
||||
// 验证签名
|
||||
if !e.verifySign(params, sign) {
|
||||
return nil, fmt.Errorf("签名验证失败")
|
||||
}
|
||||
|
||||
// 构建通知对象
|
||||
notification := &EasyPayNotification{
|
||||
Pid: params["pid"],
|
||||
Name: params["name"],
|
||||
Money: params["money"],
|
||||
OutTradeNo: params["out_trade_no"],
|
||||
TradeNo: params["trade_no"],
|
||||
Param: params["param"],
|
||||
TradeStatus: params["trade_status"],
|
||||
Type: params["type"],
|
||||
Sign: sign,
|
||||
SignType: params["sign_type"],
|
||||
}
|
||||
|
||||
return notification, nil
|
||||
}
|
||||
|
||||
// QueryOrderStatus 查询订单状态
|
||||
func (e *EasyPayService) QueryOrderStatus(ctx context.Context, outTradeNo string) (*EasyPayQueryResponse, error) {
|
||||
// 构建查询URL
|
||||
baseURL := strings.TrimSuffix(e.config.ApiURL, "/")
|
||||
queryURL := fmt.Sprintf("%s/api.php?act=order&pid=%s&key=%s&out_trade_no=%s",
|
||||
baseURL, e.config.PID, e.config.PKEY, url.QueryEscape(outTradeNo))
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, "GET", queryURL, nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("创建请求失败: %v", err)
|
||||
}
|
||||
|
||||
resp, err := e.client.Do(req)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("请求失败: %v", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("读取响应失败: %v", err)
|
||||
}
|
||||
|
||||
var queryResp EasyPayQueryResponse
|
||||
if err := json.Unmarshal(body, &queryResp); err != nil {
|
||||
return nil, fmt.Errorf("解析响应失败: %v, 响应内容: %s", err, string(body))
|
||||
}
|
||||
|
||||
if queryResp.GetCodeInt() != 1 {
|
||||
return nil, fmt.Errorf("查询订单失败: %s", queryResp.Msg)
|
||||
}
|
||||
|
||||
return &queryResp, nil
|
||||
}
|
||||
|
||||
// Refund 申请退款
|
||||
func (e *EasyPayService) Refund(ctx context.Context, outTradeNo string, refundAmount float64) error {
|
||||
// 格式化金额，保留两位小数
|
||||
moneyStr := fmt.Sprintf("%.2f", refundAmount)
|
||||
|
||||
params := map[string]string{
|
||||
"pid": e.config.PID,
|
||||
"key": e.config.PKEY,
|
||||
"out_trade_no": outTradeNo,
|
||||
"money": moneyStr,
|
||||
}
|
||||
|
||||
// 构建请求URL
|
||||
baseURL := strings.TrimSuffix(e.config.ApiURL, "/")
|
||||
refundURL := fmt.Sprintf("%s/api.php?act=refund", baseURL)
|
||||
|
||||
// 构建form-data请求
|
||||
values := url.Values{}
|
||||
for k, v := range params {
|
||||
values.Set(k, v)
|
||||
}
|
||||
|
||||
// 发送POST请求
|
||||
req, err := http.NewRequestWithContext(ctx, "POST", refundURL, strings.NewReader(values.Encode()))
|
||||
if err != nil {
|
||||
return fmt.Errorf("创建请求失败: %v", err)
|
||||
}
|
||||
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
|
||||
resp, err := e.client.Do(req)
|
||||
if err != nil {
|
||||
return fmt.Errorf("请求失败: %v", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return fmt.Errorf("读取响应失败: %v", err)
|
||||
}
|
||||
|
||||
var refundResp EasyPayRefundResponse
|
||||
if err := json.Unmarshal(body, &refundResp); err != nil {
|
||||
return fmt.Errorf("解析响应失败: %v, 响应内容: %s", err, string(body))
|
||||
}
|
||||
|
||||
if refundResp.GetCodeInt() != 1 {
|
||||
return fmt.Errorf("退款失败: %s", refundResp.Msg)
|
||||
}
|
||||
|
||||
logx.Infof("易支付退款成功，订单号: %s, 退款金额: %s", outTradeNo, moneyStr)
|
||||
return nil
|
||||
}
|
||||
|
||||
// IsPaymentSuccess 判断支付是否成功
|
||||
func (e *EasyPayService) IsPaymentSuccess(notification *EasyPayNotification) bool {
|
||||
return notification.TradeStatus == "TRADE_SUCCESS"
|
||||
}
|
||||
1166
app/main/api/internal/service/yunyinSignPayService.go
Normal file
1166
app/main/api/internal/service/yunyinSignPayService.go
Normal file
File diff suppressed because it is too large
Load Diff
@@ -41,6 +41,7 @@ type ServiceContext struct {
|
||||
QueryCleanupLogModel model.QueryCleanupLogModel
|
||||
QueryCleanupDetailModel model.QueryCleanupDetailModel
|
||||
QueryCleanupConfigModel model.QueryCleanupConfigModel
|
||||
YunyinSignPayOrderModel model.YunyinSignPayOrderModel
|
||||
|
||||
// 代理相关模型（新系统）
|
||||
AgentModel model.AgentModel
|
||||
@@ -74,6 +75,8 @@ type ServiceContext struct {
|
||||
AlipayService *service.AliPayService
|
||||
WechatPayService *service.WechatPayService
|
||||
ApplePayService *service.ApplePayService
|
||||
EasyPayService *service.EasyPayService
|
||||
YunYinSignPayService *service.YunYinSignPayService
|
||||
ApiRequestService *service.ApiRequestService
|
||||
AsynqServer *asynq.Server
|
||||
AsynqService *service.AsynqService
|
||||
@@ -115,6 +118,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
queryCleanupLogModel := model.NewQueryCleanupLogModel(db, cacheConf)
|
||||
queryCleanupDetailModel := model.NewQueryCleanupDetailModel(db, cacheConf)
|
||||
queryCleanupConfigModel := model.NewQueryCleanupConfigModel(db, cacheConf)
|
||||
yunyinSignPayOrderModel := model.NewYunyinSignPayOrderModel(db, cacheConf)
|
||||
|
||||
// ============================== 代理相关模型（新系统） ==============================
|
||||
agentModel := model.NewAgentModel(db, cacheConf)
|
||||
@@ -181,6 +185,25 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
} else {
|
||||
logx.Info("Apple支付服务已禁用")
|
||||
}
|
||||
|
||||
// 根据配置决定是否初始化易支付服务
|
||||
var easyPayService *service.EasyPayService
|
||||
if c.EasyPay.Enabled {
|
||||
easyPayService = service.NewEasyPayService(c, orderModel)
|
||||
logx.Info("易支付服务已启用")
|
||||
} else {
|
||||
logx.Info("易支付服务已禁用")
|
||||
}
|
||||
|
||||
// 根据配置决定是否初始化云印签支付服务
|
||||
var yunYinSignPayService *service.YunYinSignPayService
|
||||
if c.YunYinSignPay.Enabled {
|
||||
yunYinSignPayService = service.NewYunYinSignPayService(c, redisClient)
|
||||
logx.Info("云印签支付服务已启用")
|
||||
} else {
|
||||
logx.Info("云印签支付服务已禁用")
|
||||
}
|
||||
|
||||
apiRequestService := service.NewApiRequestService(c, featureModel, productFeatureModel, tianyuanapi)
|
||||
verificationService := service.NewVerificationService(c, tianyuanapi, apiRequestService)
|
||||
asynqService := service.NewAsynqService(c)
|
||||
@@ -228,6 +251,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
QueryCleanupLogModel: queryCleanupLogModel,
|
||||
QueryCleanupDetailModel: queryCleanupDetailModel,
|
||||
QueryCleanupConfigModel: queryCleanupConfigModel,
|
||||
YunyinSignPayOrderModel: yunyinSignPayOrderModel,
|
||||
|
||||
// 代理相关模型（简化版 - 移除团队关系、返佣、升级、提现、实名认证、邀请码）
|
||||
AgentModel: agentModel,
|
||||
@@ -261,6 +285,8 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
AlipayService: alipayService,
|
||||
WechatPayService: wechatPayService,
|
||||
ApplePayService: applePayService,
|
||||
EasyPayService: easyPayService,
|
||||
YunYinSignPayService: yunYinSignPayService,
|
||||
ApiRequestService: apiRequestService,
|
||||
AsynqServer: asynqServer,
|
||||
AsynqService: asynqService,
|
||||
|
||||
@@ -17,7 +17,7 @@ type PaymentCheckResp struct {
|
||||
|
||||
type PaymentReq struct {
|
||||
Id string `json:"id"`
|
||||
PayMethod string `json:"pay_method"` // 支付方式: wechat, alipay, appleiap, test(仅开发环境), test_empty(仅开发环境-空报告模式)
|
||||
PayMethod string `json:"pay_method"` // 支付方式: wechat, alipay, easypay_alipay, appleiap, yunyinSignPay, yunyinSignPay_wechat, yunyinSignPay_alipay, test(仅开发环境), test_empty(仅开发环境-空报告模式)
|
||||
PayType string `json:"pay_type" validate:"required,oneof=query"`
|
||||
}
|
||||
|
||||
@@ -26,3 +26,15 @@ type PaymentResp struct {
|
||||
PrepayId string `json:"prepay_id"`
|
||||
OrderNo string `json:"order_no"`
|
||||
}
|
||||
|
||||
type YunYinSignPayRefundReq struct {
|
||||
OrderNo string `json:"order_no"` // 订单号（sourceOrderCode），与 participate_id 二选一
|
||||
ParticipateId int64 `json:"participate_id,omitempty"` // 参与方ID，与 order_no 二选一
|
||||
RefundAmount float64 `json:"refund_amount" validate:"required,gt=0"` // 退款金额，必须大于0
|
||||
RefundReason string `json:"refund_reason,omitempty"` // 退款原因
|
||||
}
|
||||
|
||||
type YunYinSignPayRefundResp struct {
|
||||
Success bool `json:"success"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
|
||||
@@ -75,6 +75,7 @@ type (
|
||||
RefundTime sql.NullTime `db:"refund_time"` // 退款时间
|
||||
CloseTime sql.NullTime `db:"close_time"` // 订单关闭时间
|
||||
DeleteTime sql.NullTime `db:"delete_time"` // 删除时间
|
||||
Remark sql.NullString `db:"remark"` // 备注信息（如易支付渠道号）
|
||||
}
|
||||
)
|
||||
|
||||
@@ -91,11 +92,11 @@ func (m *defaultOrderModel) Insert(ctx context.Context, session sqlx.Session, da
|
||||
jncOrderIdKey := fmt.Sprintf("%s%v", cacheJncOrderIdPrefix, data.Id)
|
||||
jncOrderOrderNoKey := fmt.Sprintf("%s%v", cacheJncOrderOrderNoPrefix, data.OrderNo)
|
||||
return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, orderRowsExpectAutoSet)
|
||||
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, orderRowsExpectAutoSet)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, data.Id, data.OrderNo, data.UserId, data.ProductId, data.PaymentPlatform, data.PaymentScene, data.PlatformOrderId, data.Amount, data.Status, data.DelState, data.Version, data.PayTime, data.RefundTime, data.CloseTime, data.DeleteTime)
|
||||
return session.ExecCtx(ctx, query, data.Id, data.OrderNo, data.UserId, data.ProductId, data.PaymentPlatform, data.PaymentScene, data.PlatformOrderId, data.Amount, data.Status, data.DelState, data.Version, data.PayTime, data.RefundTime, data.CloseTime, data.DeleteTime, data.Remark)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, data.Id, data.OrderNo, data.UserId, data.ProductId, data.PaymentPlatform, data.PaymentScene, data.PlatformOrderId, data.Amount, data.Status, data.DelState, data.Version, data.PayTime, data.RefundTime, data.CloseTime, data.DeleteTime)
|
||||
return conn.ExecCtx(ctx, query, data.Id, data.OrderNo, data.UserId, data.ProductId, data.PaymentPlatform, data.PaymentScene, data.PlatformOrderId, data.Amount, data.Status, data.DelState, data.Version, data.PayTime, data.RefundTime, data.CloseTime, data.DeleteTime, data.Remark)
|
||||
}, jncOrderIdKey, jncOrderOrderNoKey)
|
||||
}
|
||||
func (m *defaultOrderModel) insertUUID(data *Order) {
|
||||
@@ -162,9 +163,9 @@ func (m *defaultOrderModel) Update(ctx context.Context, session sqlx.Session, ne
|
||||
return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, orderRowsWithPlaceHolder)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Id)
|
||||
return session.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Remark, newData.Id)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Id)
|
||||
return conn.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Remark, newData.Id)
|
||||
}, jncOrderIdKey, jncOrderOrderNoKey)
|
||||
}
|
||||
|
||||
@@ -185,9 +186,9 @@ func (m *defaultOrderModel) UpdateWithVersion(ctx context.Context, session sqlx.
|
||||
sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, orderRowsWithPlaceHolder)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Id, oldVersion)
|
||||
return session.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Remark, newData.Id, oldVersion)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Id, oldVersion)
|
||||
return conn.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Remark, newData.Id, oldVersion)
|
||||
}, jncOrderIdKey, jncOrderOrderNoKey)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
27
app/main/model/yunyinSignPayOrderModel.go
Normal file
27
app/main/model/yunyinSignPayOrderModel.go
Normal file
@@ -0,0 +1,27 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"github.com/zeromicro/go-zero/core/stores/cache"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||
)
|
||||
|
||||
var _ YunyinSignPayOrderModel = (*customYunyinSignPayOrderModel)(nil)
|
||||
|
||||
type (
|
||||
// YunyinSignPayOrderModel is an interface to be customized, add more methods here,
|
||||
// and implement the added methods in customYunyinSignPayOrderModel.
|
||||
YunyinSignPayOrderModel interface {
|
||||
yunyinSignPayOrderModel
|
||||
}
|
||||
|
||||
customYunyinSignPayOrderModel struct {
|
||||
*defaultYunyinSignPayOrderModel
|
||||
}
|
||||
)
|
||||
|
||||
// NewYunyinSignPayOrderModel returns a model for the database table.
|
||||
func NewYunyinSignPayOrderModel(conn sqlx.SqlConn, c cache.CacheConf) YunyinSignPayOrderModel {
|
||||
return &customYunyinSignPayOrderModel{
|
||||
defaultYunyinSignPayOrderModel: newYunyinSignPayOrderModel(conn, c),
|
||||
}
|
||||
}
|
||||
461
app/main/model/yunyinSignPayOrderModel_gen.go
Normal file
461
app/main/model/yunyinSignPayOrderModel_gen.go
Normal file
@@ -0,0 +1,461 @@
|
||||
// Code generated by goctl. DO NOT EDIT!
|
||||
|
||||
package model
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"reflect"
|
||||
"time"
|
||||
|
||||
"github.com/Masterminds/squirrel"
|
||||
"github.com/google/uuid"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/zeromicro/go-zero/core/stores/builder"
|
||||
"github.com/zeromicro/go-zero/core/stores/cache"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlc"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||
"github.com/zeromicro/go-zero/core/stringx"
|
||||
"jnc-server/common/globalkey"
|
||||
)
|
||||
|
||||
var (
|
||||
yunyinSignPayOrderFieldNames = builder.RawFieldNames(&YunyinSignPayOrder{})
|
||||
yunyinSignPayOrderRows = strings.Join(yunyinSignPayOrderFieldNames, ",")
|
||||
yunyinSignPayOrderRowsExpectAutoSet = strings.Join(stringx.Remove(yunyinSignPayOrderFieldNames, "`create_time`", "`update_time`"), ",")
|
||||
yunyinSignPayOrderRowsWithPlaceHolder = strings.Join(stringx.Remove(yunyinSignPayOrderFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?"
|
||||
|
||||
cacheJncYunyinSignPayOrderIdPrefix = "cache:jnc:yunyinSignPayOrder:id:"
|
||||
cacheJncYunyinSignPayOrderOrderIdPrefix = "cache:jnc:yunyinSignPayOrder:orderId:"
|
||||
cacheJncYunyinSignPayOrderTaskIdPrefix = "cache:jnc:yunyinSignPayOrder:taskId:"
|
||||
)
|
||||
|
||||
type (
|
||||
yunyinSignPayOrderModel interface {
|
||||
Insert(ctx context.Context, session sqlx.Session, data *YunyinSignPayOrder) (sql.Result, error)
|
||||
FindOne(ctx context.Context, id string) (*YunyinSignPayOrder, error)
|
||||
FindOneByOrderId(ctx context.Context, orderId string) (*YunyinSignPayOrder, error)
|
||||
FindOneByTaskId(ctx context.Context, taskId string) (*YunyinSignPayOrder, error)
|
||||
Update(ctx context.Context, session sqlx.Session, data *YunyinSignPayOrder) (sql.Result, error)
|
||||
UpdateWithVersion(ctx context.Context, session sqlx.Session, data *YunyinSignPayOrder) error
|
||||
Trans(ctx context.Context, fn func(context context.Context, session sqlx.Session) error) error
|
||||
SelectBuilder() squirrel.SelectBuilder
|
||||
DeleteSoft(ctx context.Context, session sqlx.Session, data *YunyinSignPayOrder) error
|
||||
FindSum(ctx context.Context, sumBuilder squirrel.SelectBuilder, field string) (float64, error)
|
||||
FindCount(ctx context.Context, countBuilder squirrel.SelectBuilder, field string) (int64, error)
|
||||
FindAll(ctx context.Context, rowBuilder squirrel.SelectBuilder, orderBy string) ([]*YunyinSignPayOrder, error)
|
||||
FindPageListByPage(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*YunyinSignPayOrder, error)
|
||||
FindPageListByPageWithTotal(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*YunyinSignPayOrder, int64, error)
|
||||
FindPageListByIdDESC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*YunyinSignPayOrder, error)
|
||||
FindPageListByIdASC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*YunyinSignPayOrder, error)
|
||||
Delete(ctx context.Context, session sqlx.Session, id string) error
|
||||
}
|
||||
|
||||
defaultYunyinSignPayOrderModel struct {
|
||||
sqlc.CachedConn
|
||||
table string
|
||||
}
|
||||
|
||||
YunyinSignPayOrder struct {
|
||||
Id string `db:"id"` // 主键ID（UUID）
|
||||
OrderId string `db:"order_id"` // 订单ID（关联order表）
|
||||
UserId string `db:"user_id"` // 用户ID（用于查询该用户是否有未完成的签署）
|
||||
TaskId string `db:"task_id"` // 任务ID/流程ID（flowId）
|
||||
ParticipantId string `db:"participant_id"` // 参与者ID（签署方2的participantId）
|
||||
Amount float64 `db:"amount"` // 支付金额
|
||||
PayType int64 `db:"pay_type"` // 支付类型：0=微信支付，1=支付宝支付
|
||||
SignStatus int64 `db:"sign_status"` // 签署状态：0=待签署，1=已签署，2=已取消
|
||||
PayStatus int64 `db:"pay_status"` // 支付状态：0=待支付，1=已支付，2=已退款
|
||||
SourceOrderCode string `db:"source_order_code"` // 源订单号（我们平台的订单号，用于关联）
|
||||
UserMobile sql.NullString `db:"user_mobile"` // 用户手机号（冗余字段，方便查询）
|
||||
UserName sql.NullString `db:"user_name"` // 用户姓名（冗余字段，方便查询）
|
||||
CreateTime time.Time `db:"create_time"` // 创建时间
|
||||
UpdateTime time.Time `db:"update_time"` // 更新时间
|
||||
DeleteTime sql.NullTime `db:"delete_time"` // 删除时间
|
||||
DelState int64 `db:"del_state"` // 删除状态：0=未删除，1=已删除
|
||||
Version int64 `db:"version"` // 版本号（乐观锁）
|
||||
}
|
||||
)
|
||||
|
||||
func newYunyinSignPayOrderModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultYunyinSignPayOrderModel {
|
||||
return &defaultYunyinSignPayOrderModel{
|
||||
CachedConn: sqlc.NewConn(conn, c),
|
||||
table: "`yunyin_sign_pay_order`",
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) Insert(ctx context.Context, session sqlx.Session, data *YunyinSignPayOrder) (sql.Result, error) {
|
||||
data.DelState = globalkey.DelStateNo
|
||||
m.insertUUID(data)
|
||||
jncYunyinSignPayOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderIdPrefix, data.Id)
|
||||
jncYunyinSignPayOrderOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderOrderIdPrefix, data.OrderId)
|
||||
jncYunyinSignPayOrderTaskIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderTaskIdPrefix, data.TaskId)
|
||||
return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, yunyinSignPayOrderRowsExpectAutoSet)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, data.Id, data.OrderId, data.UserId, data.TaskId, data.ParticipantId, data.Amount, data.PayType, data.SignStatus, data.PayStatus, data.SourceOrderCode, data.UserMobile, data.UserName, data.DeleteTime, data.DelState, data.Version)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, data.Id, data.OrderId, data.UserId, data.TaskId, data.ParticipantId, data.Amount, data.PayType, data.SignStatus, data.PayStatus, data.SourceOrderCode, data.UserMobile, data.UserName, data.DeleteTime, data.DelState, data.Version)
|
||||
}, jncYunyinSignPayOrderIdKey, jncYunyinSignPayOrderOrderIdKey, jncYunyinSignPayOrderTaskIdKey)
|
||||
}
|
||||
func (m *defaultYunyinSignPayOrderModel) insertUUID(data *YunyinSignPayOrder) {
|
||||
t := reflect.TypeOf(data).Elem()
|
||||
v := reflect.ValueOf(data).Elem()
|
||||
for i := 0; i < t.NumField(); i++ {
|
||||
sf := t.Field(i)
|
||||
if sf.Tag.Get("db") == "id" {
|
||||
f := v.Field(i)
|
||||
if f.IsValid() && f.CanSet() && f.Kind() == reflect.String {
|
||||
if f.String() == "" {
|
||||
f.SetString(uuid.NewString())
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindOne(ctx context.Context, id string) (*YunyinSignPayOrder, error) {
|
||||
jncYunyinSignPayOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderIdPrefix, id)
|
||||
var resp YunyinSignPayOrder
|
||||
err := m.QueryRowCtx(ctx, &resp, jncYunyinSignPayOrderIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error {
|
||||
query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", yunyinSignPayOrderRows, m.table)
|
||||
return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo)
|
||||
})
|
||||
switch err {
|
||||
case nil:
|
||||
return &resp, nil
|
||||
case sqlc.ErrNotFound:
|
||||
return nil, ErrNotFound
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindOneByOrderId(ctx context.Context, orderId string) (*YunyinSignPayOrder, error) {
|
||||
jncYunyinSignPayOrderOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderOrderIdPrefix, orderId)
|
||||
var resp YunyinSignPayOrder
|
||||
err := m.QueryRowIndexCtx(ctx, &resp, jncYunyinSignPayOrderOrderIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
|
||||
query := fmt.Sprintf("select %s from %s where `order_id` = ? and del_state = ? limit 1", yunyinSignPayOrderRows, m.table)
|
||||
if err := conn.QueryRowCtx(ctx, &resp, query, orderId, globalkey.DelStateNo); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return resp.Id, nil
|
||||
}, m.queryPrimary)
|
||||
switch err {
|
||||
case nil:
|
||||
return &resp, nil
|
||||
case sqlc.ErrNotFound:
|
||||
return nil, ErrNotFound
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindOneByTaskId(ctx context.Context, taskId string) (*YunyinSignPayOrder, error) {
|
||||
jncYunyinSignPayOrderTaskIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderTaskIdPrefix, taskId)
|
||||
var resp YunyinSignPayOrder
|
||||
err := m.QueryRowIndexCtx(ctx, &resp, jncYunyinSignPayOrderTaskIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
|
||||
query := fmt.Sprintf("select %s from %s where `task_id` = ? and del_state = ? limit 1", yunyinSignPayOrderRows, m.table)
|
||||
if err := conn.QueryRowCtx(ctx, &resp, query, taskId, globalkey.DelStateNo); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return resp.Id, nil
|
||||
}, m.queryPrimary)
|
||||
switch err {
|
||||
case nil:
|
||||
return &resp, nil
|
||||
case sqlc.ErrNotFound:
|
||||
return nil, ErrNotFound
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) Update(ctx context.Context, session sqlx.Session, newData *YunyinSignPayOrder) (sql.Result, error) {
|
||||
data, err := m.FindOne(ctx, newData.Id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
jncYunyinSignPayOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderIdPrefix, data.Id)
|
||||
jncYunyinSignPayOrderOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderOrderIdPrefix, data.OrderId)
|
||||
jncYunyinSignPayOrderTaskIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderTaskIdPrefix, data.TaskId)
|
||||
return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, yunyinSignPayOrderRowsWithPlaceHolder)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, newData.OrderId, newData.UserId, newData.TaskId, newData.ParticipantId, newData.Amount, newData.PayType, newData.SignStatus, newData.PayStatus, newData.SourceOrderCode, newData.UserMobile, newData.UserName, newData.DeleteTime, newData.DelState, newData.Version, newData.Id)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, newData.OrderId, newData.UserId, newData.TaskId, newData.ParticipantId, newData.Amount, newData.PayType, newData.SignStatus, newData.PayStatus, newData.SourceOrderCode, newData.UserMobile, newData.UserName, newData.DeleteTime, newData.DelState, newData.Version, newData.Id)
|
||||
}, jncYunyinSignPayOrderIdKey, jncYunyinSignPayOrderOrderIdKey, jncYunyinSignPayOrderTaskIdKey)
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *YunyinSignPayOrder) error {
|
||||
|
||||
oldVersion := newData.Version
|
||||
newData.Version += 1
|
||||
|
||||
var sqlResult sql.Result
|
||||
var err error
|
||||
|
||||
data, err := m.FindOne(ctx, newData.Id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
jncYunyinSignPayOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderIdPrefix, data.Id)
|
||||
jncYunyinSignPayOrderOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderOrderIdPrefix, data.OrderId)
|
||||
jncYunyinSignPayOrderTaskIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderTaskIdPrefix, data.TaskId)
|
||||
sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, yunyinSignPayOrderRowsWithPlaceHolder)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, newData.OrderId, newData.UserId, newData.TaskId, newData.ParticipantId, newData.Amount, newData.PayType, newData.SignStatus, newData.PayStatus, newData.SourceOrderCode, newData.UserMobile, newData.UserName, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, newData.OrderId, newData.UserId, newData.TaskId, newData.ParticipantId, newData.Amount, newData.PayType, newData.SignStatus, newData.PayStatus, newData.SourceOrderCode, newData.UserMobile, newData.UserName, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion)
|
||||
}, jncYunyinSignPayOrderIdKey, jncYunyinSignPayOrderOrderIdKey, jncYunyinSignPayOrderTaskIdKey)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
updateCount, err := sqlResult.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if updateCount == 0 {
|
||||
return ErrNoRowsUpdate
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) DeleteSoft(ctx context.Context, session sqlx.Session, data *YunyinSignPayOrder) error {
|
||||
data.DelState = globalkey.DelStateYes
|
||||
data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true}
|
||||
if err := m.UpdateWithVersion(ctx, session, data); err != nil {
|
||||
return errors.Wrapf(errors.New("delete soft failed "), "YunyinSignPayOrderModel delete err : %+v", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindSum(ctx context.Context, builder squirrel.SelectBuilder, field string) (float64, error) {
|
||||
|
||||
if len(field) == 0 {
|
||||
return 0, errors.Wrapf(errors.New("FindSum Least One Field"), "FindSum Least One Field")
|
||||
}
|
||||
|
||||
builder = builder.Columns("IFNULL(SUM(" + field + "),0)")
|
||||
|
||||
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
var resp float64
|
||||
err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...)
|
||||
switch err {
|
||||
case nil:
|
||||
return resp, nil
|
||||
default:
|
||||
return 0, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindCount(ctx context.Context, builder squirrel.SelectBuilder, field string) (int64, error) {
|
||||
|
||||
if len(field) == 0 {
|
||||
return 0, errors.Wrapf(errors.New("FindCount Least One Field"), "FindCount Least One Field")
|
||||
}
|
||||
|
||||
builder = builder.Columns("COUNT(" + field + ")")
|
||||
|
||||
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
var resp int64
|
||||
err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...)
|
||||
switch err {
|
||||
case nil:
|
||||
return resp, nil
|
||||
default:
|
||||
return 0, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindAll(ctx context.Context, builder squirrel.SelectBuilder, orderBy string) ([]*YunyinSignPayOrder, error) {
|
||||
|
||||
builder = builder.Columns(yunyinSignPayOrderRows)
|
||||
|
||||
if orderBy == "" {
|
||||
builder = builder.OrderBy("id DESC")
|
||||
} else {
|
||||
builder = builder.OrderBy(orderBy)
|
||||
}
|
||||
|
||||
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var resp []*YunyinSignPayOrder
|
||||
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
|
||||
switch err {
|
||||
case nil:
|
||||
return resp, nil
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindPageListByPage(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*YunyinSignPayOrder, error) {
|
||||
|
||||
builder = builder.Columns(yunyinSignPayOrderRows)
|
||||
|
||||
if orderBy == "" {
|
||||
builder = builder.OrderBy("id DESC")
|
||||
} else {
|
||||
builder = builder.OrderBy(orderBy)
|
||||
}
|
||||
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
offset := (page - 1) * pageSize
|
||||
|
||||
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var resp []*YunyinSignPayOrder
|
||||
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
|
||||
switch err {
|
||||
case nil:
|
||||
return resp, nil
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindPageListByPageWithTotal(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*YunyinSignPayOrder, int64, error) {
|
||||
|
||||
total, err := m.FindCount(ctx, builder, "id")
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
builder = builder.Columns(yunyinSignPayOrderRows)
|
||||
|
||||
if orderBy == "" {
|
||||
builder = builder.OrderBy("id DESC")
|
||||
} else {
|
||||
builder = builder.OrderBy(orderBy)
|
||||
}
|
||||
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
offset := (page - 1) * pageSize
|
||||
|
||||
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql()
|
||||
if err != nil {
|
||||
return nil, total, err
|
||||
}
|
||||
|
||||
var resp []*YunyinSignPayOrder
|
||||
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
|
||||
switch err {
|
||||
case nil:
|
||||
return resp, total, nil
|
||||
default:
|
||||
return nil, total, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindPageListByIdDESC(ctx context.Context, builder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*YunyinSignPayOrder, error) {
|
||||
|
||||
builder = builder.Columns(yunyinSignPayOrderRows)
|
||||
|
||||
if preMinId > 0 {
|
||||
builder = builder.Where(" id < ? ", preMinId)
|
||||
}
|
||||
|
||||
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id DESC").Limit(uint64(pageSize)).ToSql()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var resp []*YunyinSignPayOrder
|
||||
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
|
||||
switch err {
|
||||
case nil:
|
||||
return resp, nil
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) FindPageListByIdASC(ctx context.Context, builder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*YunyinSignPayOrder, error) {
|
||||
|
||||
builder = builder.Columns(yunyinSignPayOrderRows)
|
||||
|
||||
if preMaxId > 0 {
|
||||
builder = builder.Where(" id > ? ", preMaxId)
|
||||
}
|
||||
|
||||
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id ASC").Limit(uint64(pageSize)).ToSql()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var resp []*YunyinSignPayOrder
|
||||
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
|
||||
switch err {
|
||||
case nil:
|
||||
return resp, nil
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) Trans(ctx context.Context, fn func(ctx context.Context, session sqlx.Session) error) error {
|
||||
|
||||
return m.TransactCtx(ctx, func(ctx context.Context, session sqlx.Session) error {
|
||||
return fn(ctx, session)
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) SelectBuilder() squirrel.SelectBuilder {
|
||||
return squirrel.Select().From(m.table)
|
||||
}
|
||||
func (m *defaultYunyinSignPayOrderModel) Delete(ctx context.Context, session sqlx.Session, id string) error {
|
||||
data, err := m.FindOne(ctx, id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
jncYunyinSignPayOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderIdPrefix, id)
|
||||
jncYunyinSignPayOrderOrderIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderOrderIdPrefix, data.OrderId)
|
||||
jncYunyinSignPayOrderTaskIdKey := fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderTaskIdPrefix, data.TaskId)
|
||||
_, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, id)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, id)
|
||||
}, jncYunyinSignPayOrderIdKey, jncYunyinSignPayOrderOrderIdKey, jncYunyinSignPayOrderTaskIdKey)
|
||||
return err
|
||||
}
|
||||
func (m *defaultYunyinSignPayOrderModel) formatPrimary(primary interface{}) string {
|
||||
return fmt.Sprintf("%s%v", cacheJncYunyinSignPayOrderIdPrefix, primary)
|
||||
}
|
||||
func (m *defaultYunyinSignPayOrderModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error {
|
||||
query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", yunyinSignPayOrderRows, m.table)
|
||||
return conn.QueryRowCtx(ctx, v, query, primary, globalkey.DelStateNo)
|
||||
}
|
||||
|
||||
func (m *defaultYunyinSignPayOrderModel) tableName() string {
|
||||
return m.table
|
||||
}
|
||||
@@ -34,8 +34,8 @@ $tables = @(
|
||||
# "agent_order", # 代理订单
|
||||
# "agent_product_config", # 产品配置
|
||||
# "agent_short_link", # 短链接
|
||||
"agent_wallet", # 钱包
|
||||
"agent_withdraw" # 提现
|
||||
# "agent_wallet", # 钱包
|
||||
# "agent_withdraw" # 提现
|
||||
|
||||
# ============================================
|
||||
# 业务功能表
|
||||
@@ -44,7 +44,7 @@ $tables = @(
|
||||
# "example", # 示例
|
||||
# "feature", # 功能
|
||||
# "global_notifications", # 全局通知
|
||||
# "order", # 订单
|
||||
# "order" # 订单
|
||||
# "order_refund", # 订单退款
|
||||
# "product", # 产品
|
||||
# "product_feature", # 产品功能
|
||||
@@ -55,6 +55,7 @@ $tables = @(
|
||||
# "user", # 用户
|
||||
# "user_auth", # 用户认证
|
||||
# "user_temp" # 临时用户
|
||||
"yunyin_sign_pay_order" # 云印签签署流程
|
||||
)
|
||||
|
||||
# 为每个表生成模型
|
||||
|
||||
5
deploy/sql/add_order_remark_field.sql
Normal file
5
deploy/sql/add_order_remark_field.sql
Normal file
@@ -0,0 +1,5 @@
|
||||
-- 为 order 表添加备注字段
|
||||
-- 用于记录易支付使用的渠道号等信息
|
||||
|
||||
ALTER TABLE `order`
|
||||
ADD COLUMN `remark` VARCHAR(255) NULL COMMENT '备注信息（如易支付渠道号）' AFTER `delete_time`;
|
||||
33
deploy/sql/yunyin_sign_pay_order.sql
Normal file
33
deploy/sql/yunyin_sign_pay_order.sql
Normal file
@@ -0,0 +1,33 @@
|
||||
-- ============================================
|
||||
-- 云印签支付订单表
|
||||
-- ============================================
|
||||
CREATE TABLE `yunyin_sign_pay_order` (
|
||||
`id` CHAR(36) NOT NULL COMMENT '主键ID（UUID）',
|
||||
`order_id` CHAR(36) NOT NULL COMMENT '订单ID（关联order表）',
|
||||
`user_id` CHAR(36) NOT NULL COMMENT '用户ID（用于查询该用户是否有未完成的签署）',
|
||||
`task_id` VARCHAR(100) NOT NULL COMMENT '任务ID/流程ID（flowId）',
|
||||
`participant_id` VARCHAR(100) NOT NULL COMMENT '参与者ID（签署方2的participantId）',
|
||||
`amount` DECIMAL(10,2) NOT NULL COMMENT '支付金额',
|
||||
`pay_type` TINYINT NOT NULL COMMENT '支付类型：0=微信支付，1=支付宝支付',
|
||||
`sign_status` TINYINT NOT NULL DEFAULT 0 COMMENT '签署状态：0=待签署，1=已签署，2=已取消',
|
||||
`pay_status` TINYINT NOT NULL DEFAULT 0 COMMENT '支付状态：0=待支付，1=已支付，2=已退款',
|
||||
`source_order_code` VARCHAR(100) NOT NULL COMMENT '源订单号（我们平台的订单号，用于关联）',
|
||||
`user_mobile` VARCHAR(20) DEFAULT NULL COMMENT '用户手机号（冗余字段，方便查询）',
|
||||
`user_name` VARCHAR(100) DEFAULT NULL COMMENT '用户姓名（冗余字段，方便查询）',
|
||||
`create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`delete_time` DATETIME DEFAULT NULL COMMENT '删除时间',
|
||||
`del_state` TINYINT NOT NULL DEFAULT 0 COMMENT '删除状态：0=未删除，1=已删除',
|
||||
`version` BIGINT NOT NULL DEFAULT 0 COMMENT '版本号（乐观锁）',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_order_id` (`order_id`),
|
||||
UNIQUE KEY `uk_task_id` (`task_id`),
|
||||
KEY `idx_user_id` (`user_id`),
|
||||
KEY `idx_participant_id` (`participant_id`),
|
||||
KEY `idx_source_order_code` (`source_order_code`),
|
||||
KEY `idx_sign_status` (`sign_status`),
|
||||
KEY `idx_pay_status` (`pay_status`),
|
||||
KEY `idx_user_mobile` (`user_mobile`),
|
||||
KEY `idx_create_time` (`create_time`),
|
||||
KEY `idx_del_state` (`del_state`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='云印签支付订单表';
|
||||
207
云印签支付流程检查.md
Normal file
207
云印签支付流程检查.md
Normal file
@@ -0,0 +1,207 @@
|
||||
# 云印签支付流程完整性检查
|
||||
|
||||
## 一、支付创建流程
|
||||
|
||||
### 1. 前端流程 ✅
|
||||
- **位置**: `jnc-webview/src/components/Payment.vue`
|
||||
- **步骤**:
|
||||
1. 用户选择 `yunyinSignPay_wechat` 或 `yunyinSignPay_alipay`
|
||||
2. 调用 `/pay/payment` 接口
|
||||
3. 获取 `prepay_id` 或 `prepay_data`（支付链接）
|
||||
4. 直接跳转到支付链接：`window.location.href = prepayUrl`
|
||||
|
||||
### 2. 后端流程 ✅
|
||||
- **位置**: `jnc-server/app/main/api/internal/logic/pay/paymentlogic.go`
|
||||
- **步骤**:
|
||||
1. 接收支付请求
|
||||
2. 从查询缓存获取用户姓名和手机号
|
||||
3. **查询是否有未完成的签署**（复用逻辑）
|
||||
4. 如果有未完成签署：
|
||||
- 复用 `task_id` 和 `participant_id`
|
||||
- 获取新的支付链接
|
||||
5. 如果没有未完成签署：
|
||||
- 获取 token 和操作ID（带缓存）
|
||||
- 发起签署流程
|
||||
- 获取支付链接
|
||||
6. 创建订单记录（`order` 表）
|
||||
7. 创建云印签订单记录（`yunyin_sign_pay_order` 表）
|
||||
8. 返回支付链接（字符串类型，使用 `PrepayId` 字段）
|
||||
|
||||
### 3. 数据存储 ✅
|
||||
- **订单表** (`order`):
|
||||
- `order_no`: 订单号
|
||||
- `payment_platform`: `yunyinSignPay_wechat` 或 `yunyinSignPay_alipay`
|
||||
- `status`: `pending`
|
||||
- **注意**: 不再在 `remark` 中存储云印签信息
|
||||
|
||||
- **云印签订单表** (`yunyin_sign_pay_order`):
|
||||
- `order_id`: 关联订单ID
|
||||
- `user_id`: 用户ID（用于查询未完成签署）
|
||||
- `task_id`: 任务ID/流程ID（唯一索引）
|
||||
- `participant_id`: 参与者ID
|
||||
- `source_order_code`: 源订单号（用于查询支付状态）
|
||||
- `amount`: 支付金额
|
||||
- `pay_type`: 支付类型（0=微信，1=支付宝）
|
||||
- `sign_status`: 签署状态（0=待签署）
|
||||
- `pay_status`: 支付状态（0=待支付）
|
||||
- `user_mobile`: 用户手机号（冗余字段）
|
||||
- `user_name`: 用户姓名（冗余字段）
|
||||
|
||||
## 二、支付状态查询流程
|
||||
|
||||
### 1. 前端轮询 ✅
|
||||
- **位置**: `jnc-webview/src/views/PaymentResult.vue`
|
||||
- **步骤**:
|
||||
1. 用户从支付页面返回后，进入支付结果页面
|
||||
2. 从 URL 参数获取 `order_no` 或 `out_trade_no`
|
||||
3. 首次调用 `/pay/check` 接口
|
||||
4. 如果状态是 `pending`，开始轮询（每3秒一次，最多30次）
|
||||
5. 如果状态变为 `paid` 或 `refunded`，停止轮询并跳转到结果页面
|
||||
|
||||
### 2. 后端主动查询 ✅
|
||||
- **位置**: `jnc-server/app/main/api/internal/logic/pay/paymentchecklogic.go`
|
||||
- **步骤**:
|
||||
1. 查询订单状态
|
||||
2. 如果订单状态是 `pending` 且支付平台是云印签：
|
||||
- 调用 `QueryPayeeBill` 查询云印签平台
|
||||
- 使用 `sourceOrderCode`（订单号）查询
|
||||
3. 根据云印签返回的 `payStatus` 更新订单状态：
|
||||
- `2` (支付成功) → `paid`
|
||||
- `3` (支付失败) → `failed`
|
||||
- `4` (已退款) → `refunded`
|
||||
- `0, 1` (订单生成/支付中) → 保持 `pending`
|
||||
4. 同步更新 `yunyin_sign_pay_order` 表的支付状态
|
||||
5. 如果支付成功，发送异步任务处理后续流程
|
||||
|
||||
### 3. 状态映射 ✅
|
||||
- **云印签 payStatus**:
|
||||
- `0`: 订单生成
|
||||
- `1`: 支付中
|
||||
- `2`: 支付成功
|
||||
- `3`: 支付失败
|
||||
- `4`: 已退款
|
||||
|
||||
- **我们的订单状态**:
|
||||
- `pending`: 待支付
|
||||
- `paid`: 已支付
|
||||
- `failed`: 支付失败
|
||||
- `refunded`: 已退款
|
||||
|
||||
- **我们的支付状态** (`yunyin_sign_pay_order.pay_status`):
|
||||
- `0`: 待支付
|
||||
- `1`: 已支付
|
||||
- `2`: 已退款
|
||||
|
||||
## 三、前后端数据字段一致性 ✅
|
||||
|
||||
### 1. 支付创建接口 (`/pay/payment`)
|
||||
- **请求字段**: `pay_method` (支持 `yunyinSignPay_wechat`, `yunyinSignPay_alipay`)
|
||||
- **响应字段**:
|
||||
- `prepay_id`: 支付链接（字符串类型）
|
||||
- `prepay_data`: 备用字段（对象类型）
|
||||
- `order_no`: 订单号
|
||||
|
||||
- **前端读取**: `data.value.data.prepay_id || data.value.data.prepay_data` ✅
|
||||
|
||||
### 2. 支付状态查询接口 (`/pay/check`)
|
||||
- **请求字段**: `order_no`
|
||||
- **响应字段**:
|
||||
- `type`: `"query"`
|
||||
- `status`: `"pending"` | `"paid"` | `"failed"` | `"refunded"`
|
||||
|
||||
- **前端处理**: 根据 `status` 判断是否继续轮询 ✅
|
||||
|
||||
## 四、潜在问题和改进建议
|
||||
|
||||
### ⚠️ 问题1: 支付完成后用户可能不会自动跳转
|
||||
**现状**: 云印签支付完成后，用户可能不会自动跳转回我们的页面
|
||||
**解决方案**:
|
||||
- ✅ 已实现：前端通过轮询主动查询支付状态
|
||||
- ✅ 已实现：用户手动返回后，支付结果页面会自动轮询
|
||||
|
||||
### ⚠️ 问题2: 订单状态更新需要检查并发
|
||||
**现状**: 使用乐观锁更新订单状态，但需要确保不会重复更新
|
||||
**检查**: ✅ 已实现：使用 `UpdateWithVersion` 和检查 `order.Status == "pending"`
|
||||
|
||||
### ⚠️ 问题3: 查询失败时的处理
|
||||
**现状**: 如果查询云印签平台失败，会记录错误但继续返回当前状态
|
||||
**检查**: ✅ 已实现：错误处理完善，不影响正常流程
|
||||
|
||||
### ⚠️ 问题4: 未找到收款单记录的处理
|
||||
**现状**: 如果订单刚创建，云印签平台可能还没有记录
|
||||
**检查**: ✅ 已实现：返回错误但不影响，继续返回 `pending` 状态，前端会继续轮询
|
||||
|
||||
## 五、完整流程验证
|
||||
|
||||
### 场景1: 首次支付（创建新签署流程）✅
|
||||
1. 用户选择云印签支付
|
||||
2. 后端查询无未完成签署
|
||||
3. 创建新签署流程
|
||||
4. 创建订单和云印签订单记录
|
||||
5. 返回支付链接
|
||||
6. 前端跳转到支付页面
|
||||
7. 用户完成支付
|
||||
8. 前端轮询查询状态
|
||||
9. 后端主动查询云印签平台
|
||||
10. 更新订单状态为 `paid`
|
||||
11. 发送异步任务处理后续流程
|
||||
12. 前端跳转到结果页面
|
||||
|
||||
### 场景2: 复用未完成签署 ✅
|
||||
1. 用户之前创建了签署但未支付
|
||||
2. 用户再次选择云印签支付
|
||||
3. 后端查询到未完成签署
|
||||
4. 复用 `task_id` 和 `participant_id`
|
||||
5. 获取新的支付链接
|
||||
6. 创建新订单和云印签订单记录（关联新的订单）
|
||||
7. 返回支付链接
|
||||
8. 后续流程同场景1
|
||||
|
||||
### 场景3: 支付失败 ✅
|
||||
1. 用户支付失败
|
||||
2. 前端轮询查询状态
|
||||
3. 后端查询到 `payStatus = 3`
|
||||
4. 更新订单状态为 `failed`
|
||||
5. 前端显示支付失败提示
|
||||
|
||||
### 场景4: 退款 ✅
|
||||
1. 订单已支付
|
||||
2. 发生退款
|
||||
3. 前端轮询查询状态
|
||||
4. 后端查询到 `payStatus = 4`
|
||||
5. 更新订单状态为 `refunded`
|
||||
6. 更新退款时间
|
||||
7. 前端显示退款状态
|
||||
|
||||
## 六、总结
|
||||
|
||||
### ✅ 已完成的流程
|
||||
1. 支付创建流程（包括复用逻辑）
|
||||
2. 支付状态主动查询
|
||||
3. 订单状态自动更新
|
||||
4. 云印签订单表数据同步
|
||||
5. 前后端数据字段一致性
|
||||
6. 错误处理和边界情况
|
||||
|
||||
### ✅ 代码质量
|
||||
- 使用了事务保证数据一致性
|
||||
- 使用了乐观锁避免并发问题
|
||||
- 错误处理完善
|
||||
- 日志记录详细
|
||||
|
||||
### ✅ 前后端联调
|
||||
- API 接口定义清晰
|
||||
- 数据字段命名一致
|
||||
- 状态映射正确
|
||||
- 轮询机制完善
|
||||
|
||||
## 七、建议测试点
|
||||
|
||||
1. **首次支付流程**: 验证创建新签署流程是否正常
|
||||
2. **复用签署流程**: 验证复用逻辑是否正常工作
|
||||
3. **支付成功**: 验证状态更新和后续流程是否正常
|
||||
4. **支付失败**: 验证失败状态是否正确处理
|
||||
5. **退款**: 验证退款状态是否正确处理
|
||||
6. **网络异常**: 验证查询失败时的容错处理
|
||||
7. **并发支付**: 验证同一用户多次支付的场景
|
||||
8. **订单状态一致性**: 验证订单表和云印签订单表的状态是否同步
|
||||
Reference in New Issue
Block a user