From 74e696429e74318f187c6f9aab72bf726dd0c87f Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 7 Aug 2024 11:13:33 +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

---
 .../impl/UserPackageOrderServiceImpl.java     | 146 ++++++++++++------
 1 file changed, 103 insertions(+), 43 deletions(-)

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 1bee55c..6bf70f4 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
@@ -487,56 +487,116 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
             orders.setPayTime(simpleDateFormat.format(new Date()));
             baseMapper.updateStatus(orders);
 
+
+
             //获取订单-服务包映射关系列表
             List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(ordersId);
-            for (UserPackageOrdersMapping ordersPackage : mappingList) {
-                int quantity = ordersPackage.getNum();
-                MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
-                //修改服务包销量
-                int sales = massagePackage.getSales();
-                sales = sales+quantity;
-                massagePackage.setSales(sales);
-                massagePackageService.updateSales(massagePackage);
-                for(int i=0;i<quantity;i++){
-                    //拆分插入用户服务包
-                    UserPackage userPackage = new UserPackage();
-                    userPackage.setUserId(orders.getUserId());
-                    userPackage.setPackageId(massagePackage.getId());
-                    userPackage.setOrdersId(ordersId);
-                    userPackage.setOrdersNo(orders.getOrdersNo());
-                    userPackage.setCreateTime(simpleDateFormat.format(new Date()));
-                    userPackage.setTitle(massagePackage.getTitle());
-                    userPackage.setType(massagePackage.getType());
-                    userPackage.setOldPrice(massagePackage.getOldPrice());
-                    userPackage.setPrice(massagePackage.getPrice());
-                    userPackage.setPackageImg(massagePackage.getPackageImg());
-                    userPackage.setContent(massagePackage.getContent());
-                    userPackage.setContentImg(massagePackage.getContentImg());
-                    userPackage.setLabels(massagePackage.getLabels());
-                    userPackage.setCity(massagePackage.getCity());
-                    userPackage.setClassifyId(massagePackage.getClassifyId());
-                    userPackage.setLevel(massagePackage.getLevel());
-                    userPackageService.insert(userPackage);
-                    Long mainId = userPackage.getId();
-                    //拆分插入用户服务器项目详情
-                    UserPackageDetail userPackageDetail = new UserPackageDetail();
-                    userPackageDetail.setMainId(ordersPackage.getPackageId());
-                    List<UserPackageDetail> userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail);
-                    if(userPackageDetailList.size()>0){
-                        for(int j=0;j<userPackageDetailList.size();j++){
-                            UserPackageDetail upd = userPackageDetailList.get(j);
-                            upd.setMainId(mainId);
-                            upd.setCreateTime(simpleDateFormat.format(new Date()));
-                            upd.setLevel(massagePackage.getLevel());
-                            int serviceCount = upd.getServiceCount();
-                            for(int k=0;k<serviceCount;k++){
-                                userPackageDetailService.insert(upd);
-                                updateMassageSale(upd.getMassageTypeId());
+
+            //先判断是否是企业预约项目
+            UserPackageOrdersMapping ta = mappingList.get(0);
+            MassagePackage pacT1 = massagePackageService.getById(ta.getPackageId());
+            if(pacT1.getType()==114) {//企业预约
+
+                for (UserPackageOrdersMapping ordersPackage : mappingList) {
+                    int quantity = ordersPackage.getNum();
+                    MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
+                    //修改服务包销量
+                    int sales = massagePackage.getSales();
+                    sales = sales+quantity;
+                    massagePackage.setSales(sales);
+                    massagePackageService.updateSales(massagePackage);
+                        //拆分插入用户服务包
+                        UserPackage userPackage = new UserPackage();
+                        userPackage.setUserId(orders.getUserId());
+                        userPackage.setPackageId(massagePackage.getId());
+                        userPackage.setOrdersId(ordersId);
+                        userPackage.setOrdersNo(orders.getOrdersNo());
+                        userPackage.setCreateTime(simpleDateFormat.format(new Date()));
+                        userPackage.setTitle(massagePackage.getTitle());
+                        userPackage.setType(massagePackage.getType());
+                        userPackage.setOldPrice(massagePackage.getOldPrice());
+                        userPackage.setPrice(massagePackage.getPrice());
+                        userPackage.setPackageImg(massagePackage.getPackageImg());
+                        userPackage.setContent(massagePackage.getContent());
+                        userPackage.setContentImg(massagePackage.getContentImg());
+                        userPackage.setLabels(massagePackage.getLabels());
+                        userPackage.setCity(massagePackage.getCity());
+                        userPackage.setClassifyId(massagePackage.getClassifyId());
+                        userPackage.setLevel(massagePackage.getLevel());
+                        userPackageService.insert(userPackage);
+                        Long mainId = userPackage.getId();
+                        //拆分插入用户服务器项目详情
+                        UserPackageDetail userPackageDetail = new UserPackageDetail();
+                        userPackageDetail.setMainId(ordersPackage.getPackageId());
+                        List<UserPackageDetail> userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail);
+                        if(userPackageDetailList.size()>0){
+                            for(int j=0;j<userPackageDetailList.size();j++){
+                                UserPackageDetail upd = userPackageDetailList.get(j);
+                                upd.setMainId(mainId);
+                                upd.setCreateTime(simpleDateFormat.format(new Date()));
+                                upd.setLevel(massagePackage.getLevel());
+                                for(int k=0;k<quantity;k++){
+                                    userPackageDetailService.insert(upd);
+                                    updateMassageSale(upd.getMassageTypeId());
+                                }
+                            }
+                        }
+                }
+            }else{
+
+                for (UserPackageOrdersMapping ordersPackage : mappingList) {
+                    int quantity = ordersPackage.getNum();
+                    MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
+                    //修改服务包销量
+                    int sales = massagePackage.getSales();
+                    sales = sales+quantity;
+                    massagePackage.setSales(sales);
+                    massagePackageService.updateSales(massagePackage);
+                    for(int i=0;i<quantity;i++){
+                        //拆分插入用户服务包
+                        UserPackage userPackage = new UserPackage();
+                        userPackage.setUserId(orders.getUserId());
+                        userPackage.setPackageId(massagePackage.getId());
+                        userPackage.setOrdersId(ordersId);
+                        userPackage.setOrdersNo(orders.getOrdersNo());
+                        userPackage.setCreateTime(simpleDateFormat.format(new Date()));
+                        userPackage.setTitle(massagePackage.getTitle());
+                        userPackage.setType(massagePackage.getType());
+                        userPackage.setOldPrice(massagePackage.getOldPrice());
+                        userPackage.setPrice(massagePackage.getPrice());
+                        userPackage.setPackageImg(massagePackage.getPackageImg());
+                        userPackage.setContent(massagePackage.getContent());
+                        userPackage.setContentImg(massagePackage.getContentImg());
+                        userPackage.setLabels(massagePackage.getLabels());
+                        userPackage.setCity(massagePackage.getCity());
+                        userPackage.setClassifyId(massagePackage.getClassifyId());
+                        userPackage.setLevel(massagePackage.getLevel());
+                        userPackageService.insert(userPackage);
+                        Long mainId = userPackage.getId();
+                        //拆分插入用户服务器项目详情
+                        UserPackageDetail userPackageDetail = new UserPackageDetail();
+                        userPackageDetail.setMainId(ordersPackage.getPackageId());
+                        List<UserPackageDetail> userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail);
+                        if(userPackageDetailList.size()>0){
+                            for(int j=0;j<userPackageDetailList.size();j++){
+                                UserPackageDetail upd = userPackageDetailList.get(j);
+                                upd.setMainId(mainId);
+                                upd.setCreateTime(simpleDateFormat.format(new Date()));
+                                upd.setLevel(massagePackage.getLevel());
+                                int serviceCount = upd.getServiceCount();
+                                for(int k=0;k<serviceCount;k++){
+                                    userPackageDetailService.insert(upd);
+                                    updateMassageSale(upd.getMassageTypeId());
+                                }
                             }
                         }
                     }
                 }
             }
+
+
+
+
         } catch (Exception e) {
             e.printStackTrace();
             log.error("钱包支付服务包订单异常：" + e.getMessage(), e);