diff --git a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java index 5be285f..994218e 100644 --- a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java +++ b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java @@ -164,6 +164,18 @@ public class UserPackageDetail implements Serializable { @TableField(exist = false) private Integer sales; + /** + * 疗程描述 + */ + @TableField(exist = false) + private String intervalDaysStr; + + /** + * 上次预约时间 + */ + @TableField(exist = false) + private String maxTime; + @TableField(exist = false) private Integer page; diff --git a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml index f157e48..3a372f1 100644 --- a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml +++ b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml @@ -36,13 +36,13 @@ a.massage_type_id, a.title, a.massage_img, - a.package_price, - a.price, - (case a.status when 1 then 1 else 0 end) as usedQuantity, - (case a.status when 0 then 1 else 0 end) as unUsedQuantity + round(avg(a.package_price),2) as package_price, + round(avg(a.price),2) as price, + sum(case a.status when 1 then 1 else 0 end) as usedQuantity, + sum(case a.status when 0 then 1 else 0 end) as unUsedQuantity from bl_user_package_detail a where a.main_id = #{mainId} - group by a.massage_type_id,a.title,a.massage_img,a.package_price,a.price + group by a.massage_type_id,a.title,a.massage_img order by a.massage_type_id @@ -51,14 +51,16 @@ a.massage_type_id, a.title, a.massage_img, - a.package_price, - a.price, - (case a.status when 1 then 1 else 0 end) as usedQuantity, - (case a.status when 0 then 1 else 0 end) as unUsedQuantity, - interval_days + round(avg(a.package_price),2) as package_price, + round(avg(a.price),2) as price, + sum(case a.status when 1 then 1 else 0 end) as usedQuantity, + sum(case a.status when 0 then 1 else 0 end) as unUsedQuantity, + concat(round(count(massage_type_id)*avg(interval_days)),'天一疗程,每隔',round(avg(interval_days)),'天一次,共',round(count(massage_type_id)),'次') as interval_days_str, + (select max(end_times) from orders o where a.massage_type_id = a.massage_type_id and b.user_id = o.user_id and b.id = o.user_package_id) as max_time from bl_user_package_detail a + inner join bl_user_package b on a.main_id = b.id where a.main_id = #{mainId} - group by a.massage_type_id,a.title,a.massage_img,a.package_price,a.price,interval_days + group by a.massage_type_id,a.title,a.massage_img order by a.massage_type_id