Merge branch 'feat-zjy-issue-008' into dev

fix: 处理冲突，增加自行购买
Merge branch 'jng' into feat-zjy-issue-008
2025-06-20 11:27:21 +08:00 · 2025-06-20 11:26:16 +08:00 · 2025-06-20 11:21:22 +08:00
1 changed files with 1 additions and 0 deletions
--- a/pkg/service/bundle/pay.go
+++ b/pkg/service/bundle/pay.go
@ -417,6 +417,7 @@ func CreateAntomPay(c *gin.Context) {
 			AvailableDurationAdditional: uint32(orderLimit.Duration),
 			TimeUnit:                    timeUnit,
 			AssociatedorderNumber:       req.OutTradeNo, //增值服务订单号
 			Type:                        2,              //自行购买
 		})
 		if err != nil {
 			service.Error(c, err)
Author	SHA1	Message	Date
zhoujunyao	c56465dd18	Merge branch 'feat-zjy-issue-008' into dev	2025-06-20 11:27:21 +08:00
zhoujunyao	c20c6871c9	fix: 处理冲突，增加自行购买	2025-06-20 11:26:16 +08:00
zhoujunyao	383f8bef10	Merge branch 'jng' into feat-zjy-issue-008 # Conflicts: # api/bundle/bundle.pb.go # api/bundle/bundle_triple.pb.go	2025-06-20 11:21:22 +08:00