csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复价格不一致的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m28s
Details

Browse Source
This commit is contained in:
break
2026-08-13 17:43:14 +08:00
parent 6883b5b42b
commit cbadf77517
8 changed files with 116 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/model/package.go
View File

@@ -88,7 +88,7 @@ type PackageUsage struct {
HasIndependentExpiry bool `gorm:"column:has_independent_expiry;type:boolean;default:false;comment:加油包是否有独立有效期(true-有独立到期时间 false-跟随主套餐)" json:"has_independent_expiry"`
PendingRealnameActivation bool `gorm:"column:pending_realname_activation;type:boolean;default:false;comment:是否等待实名激活(true-待实名后激活 false-已激活或不需实名)" json:"pending_realname_activation"`
PackageName string `gorm:"column:package_name;type:varchar(255);not null;default:'';comment:套餐名称快照(从Package复制,用于历史记录展示)" json:"package_name"`
PaidAmount *int64 `gorm:"column:paid_amount;type:bigint;comment:购买实付金额快照（分，从订单 actual_paid_amount 复制，无订单或线下支付时为null）" json:"paid_amount,omitempty"`
PaidAmount *int64 `gorm:"column:paid_amount;type:bigint;comment:购买成本价快照（分，从订单 seller_cost_price 复制，无订单或线下支付时为 null）" json:"paid_amount,omitempty"`
RetailAmount *int64 `gorm:"column:retail_amount;type:bigint;comment:购买零售价快照（分，从订单 total_amount 复制，无订单关联时为null）" json:"retail_amount,omitempty"`
PackagePriceConfigStatus int `gorm:"column:package_price_config_status;type:int;default:0;not null;comment:套餐价格配置状态快照 0-未配置 1-赠送0价 2-已配置非0" json:"package_price_config_status"`
PackageIsGift bool `gorm:"column:package_is_gift;type:boolean;default:false;not null;comment:套餐是否赠送快照 true-赠送 false-普通可售" json:"package_is_gift"`

4
internal/service/order/service.go
View File

@@ -2581,7 +2581,7 @@ func (s *Service) activateMainPackage(ctx context.Context, tx *gorm.DB, order *m
Priority: priority,
DataResetCycle: pkg.DataResetCycle,
PendingRealnameActivation: pendingRealnameActivation,
PaidAmount: order.ActualPaidAmount,
PaidAmount: &order.SellerCostPrice,
RetailAmount: &retailAmount,
PackagePriceConfigStatus: pkg.PriceConfigStatus,
PackageIsGift: pkg.IsGift,
@@ -2676,7 +2676,7 @@ func (s *Service) activateAddonPackage(ctx context.Context, tx *gorm.DB, order *
ActivatedAt: &activatedAt,
ExpiresAt: &expiresAt,
DataResetCycle: pkg.DataResetCycle,
PaidAmount: order.ActualPaidAmount,
PaidAmount: &order.SellerCostPrice,
RetailAmount: &addonRetailAmount,
PackagePriceConfigStatus: pkg.PriceConfigStatus,
PackageIsGift: pkg.IsGift,

4
internal/task/auto_purchase.go
View File

@@ -689,7 +689,7 @@ func (h *AutoPurchaseHandler) activateMainPackage(
DataResetCycle: pkg.DataResetCycle,
PendingRealnameActivation: pendingRealnameActivation,
Generation: order.Generation,
PaidAmount: order.ActualPaidAmount,
PaidAmount: &order.SellerCostPrice,
RetailAmount: &retailAmount,
PackagePriceConfigStatus: pkg.PriceConfigStatus,
PackageIsGift: pkg.IsGift,
@@ -809,7 +809,7 @@ func (h *AutoPurchaseHandler) activateAddonPackage(
ExpiresAt: expiresAt,
DataResetCycle: pkg.DataResetCycle,
Generation: order.Generation,
PaidAmount: order.ActualPaidAmount,
PaidAmount: &order.SellerCostPrice,
RetailAmount: &addonRetailAmount,
PackagePriceConfigStatus: pkg.PriceConfigStatus,
PackageIsGift: pkg.IsGift,