玫瑰

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

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;
+
 }

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
         <if test="queryParam.subCategory != null">
             AND dp.sub_category = #{queryParam.subCategory}