From 5385e73a687c531e7223b91a616918bc4b39be08 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 7 Aug 2024 13:46:57 +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

---
 .../modules/bl/order/entity/UserPackageOrdersMapping.java  | 4 ++++
 .../bl/order/service/impl/UserPackageOrderServiceImpl.java | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

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 b895029..d58302d 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
@@ -165,5 +165,9 @@ public class UserPackageOrdersMapping implements Serializable {
     @TableField(exist = false)
     private String prive;
 
+
+    @TableField(exist = false)
+    private BigDecimal packagePrice;
+
     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 86fa1b3..3ad160d 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
@@ -156,6 +156,9 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
                 ordersPackage.setServiceCount(massagePackageDetail.getServiceCount());
                 ordersPackage.setIntervalDaysStr(massagePackageDetail.getIntervalDaysStr());
                 ordersPackage.setPrice(massagePackageDetail.getPackagePrice());
+            }else if(ordersPackage.getType() == 114){
+                MassagePackageDetail massagePackageDetail = massagePackageDetailDao.findCkLcDetailCount(ordersPackage.getPackageId());
+                ordersPackage.setPackagePrice(massagePackageDetail.getPackagePrice());
             }
         }
         orders.setOrdersPackageList(ordersPackageList);
@@ -523,8 +526,8 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
                         userPackage.setCreateTime(simpleDateFormat.format(new Date()));
                         userPackage.setTitle(massagePackage.getTitle());
                         userPackage.setType(massagePackage.getType());
-                        userPackage.setOldPrice(detail.getOldPrice().multiply(xmsl).toString());
-                        userPackage.setPrice(detail.getPrice().multiply(xmsl).toString());
+                        userPackage.setOldPrice(detail.getOldPrice().multiply(xmsl));
+                        userPackage.setPrice(detail.getPrice().multiply(xmsl));
                         userPackage.setPackageImg(massagePackage.getPackageImg());
                         userPackage.setContent(massagePackage.getContent());
                         userPackage.setContentImg(massagePackage.getContentImg());