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

fix: 调整校验状态
Merge branch 'jng' into feat-zjy-issue-008
2025-06-15 20:57:25 +08:00 · 2025-06-15 20:57:02 +08:00 · 2025-06-15 20:54:42 +08:00
1 changed files with 1 additions and 1 deletions
--- a/pkg/service/bundle/bundleOrder.go
+++ b/pkg/service/bundle/bundleOrder.go
@ -221,7 +221,7 @@ func CreateBundleOrderSignature(c *gin.Context) {
 	//有套餐并且套餐未过期
 	if orderRecordsList.OrderRecords != nil {
 		for _, orderInfo := range orderRecordsList.OrderRecords {
-			if orderInfo.CustomerID == strconv.FormatUint(userInfo.ID, 10) && orderInfo.PayType == 1 {
+			if orderInfo.CustomerID == strconv.FormatUint(userInfo.ID, 10) && orderInfo.Status == 1 {
 				service.Error(c, errors.New(common.ThereAreOutstandingOrders))
 				return
 			}
Author	SHA1	Message	Date
zhoujunyao	49137828da	Merge branch 'feat-zjy-issue-008' into dev	2025-06-15 20:57:25 +08:00
zhoujunyao	e370308b10	fix: 调整校验状态	2025-06-15 20:57:02 +08:00
zhoujunyao	cf18598b96	Merge branch 'jng' into feat-zjy-issue-008 # Conflicts: # api/bundle/bundle.pb.go	2025-06-15 20:54:42 +08:00