统一合同气阀候选与绑定入口

backend/api/internal/logic/platform/gasorder/contract_party_display.go

@@ -1,5 +1,5 @@
 // 功能描述：为配送合同提供关联主体名称和当前服务关系状态，不新增数据库字段。
-// 版本：v1.1.0
+// 版本：v1.2.0
 package gasorder
 
 import (
@@ -15,6 +15,7 @@ type ContractPartyDisplay struct {
 	GasBasicDisplayName    string `gorm:"column:gas_basic_display_name" json:"gas_basic_display_name"`
 	DeliveryDisplayName    string `gorm:"column:delivery_basic_display_name" json:"delivery_basic_display_name"`
 	UserServiceActive      bool   `gorm:"column:user_service_active" json:"user_service_active"`
+	UserDeliveryActive     bool   `gorm:"column:user_delivery_service_active" json:"user_delivery_service_active"`
 }
 
 // ContractPartyDisplayQuery 仅通过合同已保存的关联主键读取名称，不开放平台主体全集。
@@ -33,7 +34,18 @@ func ContractPartyDisplayQuery(databaseService *gorm.DB) *gorm.DB {
 					AND contract_relation.gas_basic_id = gasorder_contract.gas_basic_id
 					AND contract_relation.status <> ?
 					AND contract_relation.deleted_at IS NULL
-			) AS user_service_active`, common.StatusArchived).
+			) AS user_service_active,
+			CASE
+				WHEN gasorder_contract.delivery_basic_id = 0 THEN FALSE
+				ELSE EXISTS (
+					SELECT 1 FROM user_service_relation AS delivery_relation
+					WHERE delivery_relation.user_account_id = gasorder_contract.user_account_id
+						AND delivery_relation.gas_basic_id = gasorder_contract.gas_basic_id
+						AND delivery_relation.delivery_basic_id = gasorder_contract.delivery_basic_id
+						AND delivery_relation.status <> ?
+						AND delivery_relation.deleted_at IS NULL
+				)
+			END AS user_delivery_service_active`, common.StatusArchived, common.StatusArchived).
 		Joins("LEFT JOIN user_account AS contract_user ON contract_user.id = gasorder_contract.user_account_id").
 		Joins("LEFT JOIN gas_basic AS contract_gas ON contract_gas.id = gasorder_contract.gas_basic_id").
 		Joins("LEFT JOIN delivery_basic AS contract_delivery ON contract_delivery.id = gasorder_contract.delivery_basic_id")

backend/api/internal/logic/platform/gasorder/contract_product_candidate.go

@@ -0,0 +1,22 @@
+// 功能描述：提供跨管理端一致的合同可绑定智能气阀候选查询。
+// 版本：v1.0.0。
+package gasorder
+
+import (
+	"git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
+	"git.apinb.com/heqiapp/platforms/backend/api/internal/models"
+	"gorm.io/gorm"
+)
+
+// ContractProductCandidateQuery 仅返回属于合同用户、可用、未报废且未重复绑定的智能气阀。
+func ContractProductCandidateQuery(query *gorm.DB, contract models.GasorderContract) *gorm.DB {
+	return query.
+		Where("product_info.status = ? AND product_info.product_status <> ? AND product_info.user_account_id = ?",
+			common.StatusEnable, common.StatusScrapped, contract.UserAccountID).
+		Where(`NOT EXISTS (
+			SELECT 1 FROM gasorder_contract_product AS candidate_binding
+			WHERE candidate_binding.product_info_id = product_info.id
+				AND candidate_binding.gasorder_contract_id = ?
+				AND candidate_binding.unbound_at IS NULL
+		)`, contract.ID)
+}

backend/api/internal/logic/platform/gasorder/gasorder_test.go

@@ -1,5 +1,5 @@
 // 功能描述：验证平台配送合同、订单创建和调度状态规则。
-// 版本：v1.3.0
+// 版本：v1.4.0。
 package gasorder
 
 import (
@@ -100,6 +100,8 @@ func TestContractPartyDisplayQuery(t *testing.T) {
 		"delivery_basic_display_name",
 		"contract_relation.user_account_id = gasorder_contract.user_account_id",
 		"contract_relation.gas_basic_id = gasorder_contract.gas_basic_id",
+		"delivery_relation.delivery_basic_id = gasorder_contract.delivery_basic_id",
+		"user_delivery_service_active",
 		"gasorder_contract.gas_basic_id = 42",
 	} {
 		if !strings.Contains(statement, fragment) {
@@ -108,6 +110,35 @@ func TestContractPartyDisplayQuery(t *testing.T) {
 	}
 }
 
+// TestContractProductCandidateQuery 验证三端共享候选严格按合同用户和设备可用性筛选。
+func TestContractProductCandidateQuery(t *testing.T) {
+	sqlDatabase, _, err := sqlmock.New()
+	if err != nil {
+		t.Fatalf("创建模拟数据库失败：%v", err)
+	}
+	defer sqlDatabase.Close()
+	database, err := gorm.Open(postgres.New(postgres.Config{Conn: sqlDatabase}), &gorm.Config{})
+	if err != nil {
+		t.Fatalf("创建 GORM 数据库失败：%v", err)
+	}
+	statement := database.ToSQL(func(tx *gorm.DB) *gorm.DB {
+		query := common.ActiveRecords(tx.Model(&models.ProductInfo{}))
+		return ContractProductCandidateQuery(query, models.GasorderContract{Entity: models.Entity{ID: 17}, UserAccountID: 23}).
+			Find(&[]models.ProductInfo{})
+	})
+	for _, fragment := range []string{
+		"product_info.status = 1",
+		"product_info.product_status <> 27",
+		"product_info.user_account_id = 23",
+		"candidate_binding.gasorder_contract_id = 17",
+		"candidate_binding.unbound_at IS NULL",
+	} {
+		if !strings.Contains(statement, fragment) {
+			t.Fatalf("合同气阀候选 SQL 缺少 %q：%s", fragment, statement)
+		}
+	}
+}
+
 // TestFilterGasorderContractProductCandidates 验证订单候选仅包含当前合同未解绑气瓶并按业务字段排序。
 func TestFilterGasorderContractProductCandidates(t *testing.T) {
 	sqlDatabase, _, err := sqlmock.New()

backend/api/internal/logic/platform/product/product.go

@@ -11,6 +11,7 @@ import (
 	"git.apinb.com/bsm-sdk/core/middleware"
 	"git.apinb.com/heqiapp/platforms/backend/api/internal/impl"
 	"git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
+	platformgasorder "git.apinb.com/heqiapp/platforms/backend/api/internal/logic/platform/gasorder"
 	"git.apinb.com/heqiapp/platforms/backend/api/internal/models"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -47,9 +48,7 @@ func listProductInfo(ctx *gin.Context) {
 		return
 	}
 	common.ListPageFiltered[models.ProductInfo](ctx, func(query *gorm.DB) *gorm.DB {
-		return query.
-			Where("status = ? AND product_status <> ? AND user_account_id = ?", common.StatusEnable, common.StatusScrapped, contract.UserAccountID).
-			Where("NOT EXISTS (SELECT 1 FROM gasorder_contract_product WHERE gasorder_contract_product.product_info_id = product_info.id AND gasorder_contract_product.gasorder_contract_id = ? AND gasorder_contract_product.unbound_at IS NULL)", contract.ID)
+		return platformgasorder.ContractProductCandidateQuery(query, contract)
 	})
 }