From 349ab1254ca1d35b245d4224310a9110013fd8c5 Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 1 Dec 2025 11:35:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AB=E7=91=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productspec/constant/ProductSpecTermNameEnum.java | 4 +++- .../user/response/UserPageProductByMatchmakerVo.java | 3 +++ .../product/WalletAccountAssociateOrderRecordDao.xml | 9 ++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/productspec/constant/ProductSpecTermNameEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/productspec/constant/ProductSpecTermNameEnum.java index eda8097..c1ad74a 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/productspec/constant/ProductSpecTermNameEnum.java +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/productspec/constant/ProductSpecTermNameEnum.java @@ -16,7 +16,9 @@ public enum ProductSpecTermNameEnum { VALIDITY_PERIOD(3,"有效期"), - DAILY_USE_LIMIT(4,"单日使用上限"); + DAILY_USE_LIMIT(4,"单日使用上限"), + + LIVE_DURATION(5,"直播时长(小时)"); @EnumValue @JsonValue diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserPageProductByMatchmakerVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserPageProductByMatchmakerVo.java index 3f3a3cb..10975df 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserPageProductByMatchmakerVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserPageProductByMatchmakerVo.java @@ -45,4 +45,7 @@ public class UserPageProductByMatchmakerVo { @ApiModelProperty("有效期天") private String validityPeriodDays; + @ApiModelProperty("直播时长（小时）") + private String liveDurationHours; + } diff --git a/dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml index 2081b51..ee11a3c 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml @@ -159,11 +159,14 @@ dp.detail_desc, dps.unit_original_price, dps.unit_selling_price, - dpst2.`value` as validityPeriodDays + dpst3.`value` as validityPeriodDays, + dpst5.`value` as liveDurationHours from da_product as dp LEFT JOIN da_product_spec as dps on dps.is_delete=0 and dps.product_id=dp.id - LEFT JOIN da_product_spec_term as dpst2 on dpst2.is_delete=0 and dpst2.product_spec_id =dps.id and - dpst2.`name`=3 + LEFT JOIN da_product_spec_term as dpst3 on dpst3.is_delete=0 and dpst3.product_spec_id =dps.id and + dpst3.`name`=3 + LEFT JOIN da_product_spec_term as dpst5 on dpst5.is_delete=0 and dpst5.product_spec_id =dps.id and + dpst5.`name`=5 where dp.is_delete=0 and dp.`status`=1 and dp.product_type=3 AND dp.sub_category = #{queryParam.subCategory}