From 622e99b54357c12728d3a7421efa183315d348cc Mon Sep 17 00:00:00 2001 From: break Date: Tue, 22 Sep 2026 14:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=80=80=E6=AC=BE=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=87=8D=E5=A4=8D=E8=B5=84=E4=BA=A7=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/application/refundapproval/creation.go | 2 +- internal/application/wecom/scene.go | 2 -- pkg/constants/approval.go | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/internal/application/refundapproval/creation.go b/internal/application/refundapproval/creation.go index 47c1c849..b6880085 100644 --- a/internal/application/refundapproval/creation.go +++ b/internal/application/refundapproval/creation.go @@ -614,7 +614,7 @@ func refundSnapshots(refund *model.RefundRequest, attempt *model.RefundRequestAt customerAccountInfo, customerVoucherKeys := refundCustomerMaterialFromAttempt(attempt) requestSnapshot, err := sonic.Marshal(map[string]any{ constants.ApprovalFieldRefundNo: refund.RefundNo, constants.ApprovalFieldOrderID: refund.OrderID, constants.ApprovalFieldOrderNo: refund.OrderNo, - constants.ApprovalFieldAssetIdentifier: refund.AssetIdentifier, constants.ApprovalFieldAssetType: refund.OrderType, + constants.ApprovalFieldAssetIdentifier: refund.AssetIdentifier, constants.ApprovalFieldActualReceivedAmount: formatCentAmount(attempt.FrozenActualReceivedAmount), constants.ApprovalFieldRequestedRefundAmount: formatCentAmount(attempt.RefundAmount), constants.ApprovalFieldRefundVoucherKey: []string(attempt.CustomerVoucherKeys), constants.ApprovalFieldRefundReason: attempt.RefundReason, constants.ApprovalFieldPackageUsageID: refund.PackageUsageID, constants.ApprovalFieldRefundAssetType: material.AssetType, diff --git a/internal/application/wecom/scene.go b/internal/application/wecom/scene.go index a59c15d5..80b70e60 100644 --- a/internal/application/wecom/scene.go +++ b/internal/application/wecom/scene.go @@ -418,8 +418,6 @@ func sceneBusinessFields(businessType string) ([]dto.WeComBusinessFieldResponse, {Code: constants.ApprovalFieldRefundNo, Name: "退款单号", ValueType: constants.ApprovalFieldValueTypeString, Description: "本次退款申请单号"}, {Code: constants.ApprovalFieldOrderID, Name: "订单 ID", ValueType: constants.ApprovalFieldValueTypeInteger, Description: "退款关联订单的系统 ID"}, {Code: constants.ApprovalFieldOrderNo, Name: "订单号", ValueType: constants.ApprovalFieldValueTypeString, Description: "退款关联订单号"}, - {Code: constants.ApprovalFieldAssetIdentifier, Name: "资产标识", ValueType: constants.ApprovalFieldValueTypeString, Description: "退款关联卡或设备的业务标识"}, - {Code: constants.ApprovalFieldAssetType, Name: "资产类型", ValueType: constants.ApprovalFieldValueTypeString, Description: "退款关联资产类型编码"}, {Code: constants.ApprovalFieldActualReceivedAmount, Name: "订单实收金额", ValueType: constants.ApprovalFieldValueTypeMoney, Description: "以元为单位且保留两位小数的订单实收金额"}, {Code: constants.ApprovalFieldRequestedRefundAmount, Name: "申请退款金额", ValueType: constants.ApprovalFieldValueTypeMoney, Description: "以元为单位且保留两位小数的本次申请退款金额"}, {Code: constants.ApprovalFieldRefundVoucherKey, Name: "退款凭证", ValueType: constants.ApprovalFieldValueTypeFileList, Description: "提交时上传到企微文件控件的退款凭证列表"}, diff --git a/pkg/constants/approval.go b/pkg/constants/approval.go index f2168a99..13dd32bc 100644 --- a/pkg/constants/approval.go +++ b/pkg/constants/approval.go @@ -56,8 +56,6 @@ const ( ApprovalFieldOrderNo = "order_no" // ApprovalFieldAssetIdentifier 表示退款资产标识业务字段。 ApprovalFieldAssetIdentifier = "asset_identifier" - // ApprovalFieldAssetType 表示退款资产类型业务字段。 - ApprovalFieldAssetType = "asset_type" // ApprovalFieldActualReceivedAmount 表示退款实收金额业务字段。 ApprovalFieldActualReceivedAmount = "actual_received_amount" // ApprovalFieldRequestedRefundAmount 表示申请退款金额业务字段。 @@ -69,7 +67,6 @@ const ( // ApprovalFieldPackageUsageID 表示退款指定套餐使用记录 ID 业务字段。 ApprovalFieldPackageUsageID = "package_usage_id" // ApprovalFieldRefundAssetType 表示退款资产类型（卡或设备）业务字段。 - // 与 ApprovalFieldAssetType（下单快照的订单类型）语义不同，是本变更新增的审批材料字段。 ApprovalFieldRefundAssetType = "refund_asset_type" // ApprovalFieldRefundDeviceType 表示退款关联设备的设备类型业务字段，无关联设备时为空串。 ApprovalFieldRefundDeviceType = "refund_device_type"