From c35548ead2bb3d07609bc8238d4c2bfb010902a4 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 7 Aug 2024 11:52:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqx/modules/bl/order/entity/UserPackageOrdersMapping.java  | 3 +++
 .../bl/order/service/impl/UserPackageOrderServiceImpl.java     | 1 +
 .../resources/mapper/bl/massage/MassagePackageDetailDao.xml    | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageOrdersMapping.java b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageOrdersMapping.java
index 9efc787..b895029 100644
--- a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageOrdersMapping.java
+++ b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageOrdersMapping.java
@@ -162,5 +162,8 @@ public class UserPackageOrdersMapping implements Serializable {
     @TableField(exist = false)
     private String intervalDaysStr;
 
+    @TableField(exist = false)
+    private String prive;
+
     public UserPackageOrdersMapping() {}
 }
diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
index 8680ccd..86fa1b3 100644
--- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
@@ -155,6 +155,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
                 MassagePackageDetail massagePackageDetail = massagePackageDetailDao.findCkLcDetailCount(ordersPackage.getPackageId());
                 ordersPackage.setServiceCount(massagePackageDetail.getServiceCount());
                 ordersPackage.setIntervalDaysStr(massagePackageDetail.getIntervalDaysStr());
+                ordersPackage.setPrice(massagePackageDetail.getPackagePrice());
             }
         }
         orders.setOrdersPackageList(ordersPackageList);
diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml
index f80658d..0004f7e 100644
--- a/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml
+++ b/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml
@@ -221,7 +221,7 @@
     <select id="findCkLcDetailCount" resultType="com.sqx.modules.bl.massage.entity.MassagePackageDetail">
         select
             sum(service_count) as serviceCount,
-            concat(round(sum(service_count)*avg(interval_days)),'天一疗程，每隔',round(avg(interval_days)),'天一次，共',round(sum(service_count)),'次') as interval_days_str
+            concat(round(sum(service_count)*avg(interval_days)),'天一疗程，每隔',round(avg(interval_days)),'天一次，共',round(sum(service_count)),'次') as interval_days_str,package_price
         from bl_massage_package_detail a
         where a.main_id = #{mainId}
     </select>