From 167e894b9d8545f2e7112600ef4965403a668d02 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 7 Aug 2024 14:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BC=81=E4=B8=9A=E9=A2=84=E7=BA=A6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/controller/app/AliPayController.java  | 153 ++++++++++++------
 1 file changed, 107 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
index 370a9ba..c5cf344 100644
--- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
+++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
@@ -2494,56 +2494,117 @@ public class AliPayController {
 
                         //获取订单-服务包映射关系列表
                         List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
-                        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(orders.getOrdersId());
-                                userPackage.setOrdersNo(orders.getOrdersNo());
-                                userPackage.setCreateTime(sdf.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(sdf.format(new Date()));
-                                        upd.setLevel(massagePackage.getLevel());
-                                        int serviceCount = upd.getServiceCount();
-                                        for(int k=0;k<serviceCount;k++){
-                                            userPackageDetailService.insert(upd);
-                                            MassageType massageType = massageTypeService.getById(upd.getMassageTypeId());
-                                            massageType.setSales(massageType.getSales()+1);
-                                            massageTypeService.updateById(massageType);
+
+
+                            //先判断是否是企业预约项目
+                            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);
+
+                                    //拆分插入用户服务器项目详情
+                                    UserPackageDetail userPackageDetail = new UserPackageDetail();
+                                    userPackageDetail.setMainId(ordersPackage.getPackageId());
+                                    List<UserPackageDetail> userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail);
+                                    UserPackageDetail detail = userPackageDetailList.get(0);
+
+                                    BigDecimal xmsl = new BigDecimal(quantity+"");
+                                    //拆分插入用户服务包
+                                    UserPackage userPackage = new UserPackage();
+                                    userPackage.setUserId(orders.getUserId());
+                                    userPackage.setPackageId(massagePackage.getId());
+                                    userPackage.setOrdersId(orders.getOrdersId());
+                                    userPackage.setOrdersNo(orders.getOrdersNo());
+                                    userPackage.setCreateTime(sdf.format(new Date()));
+                                    userPackage.setTitle(massagePackage.getTitle());
+                                    userPackage.setType(massagePackage.getType());
+                                    userPackage.setOldPrice(detail.getOldPrice().multiply(xmsl));
+                                    userPackage.setPrice(detail.getPrice().multiply(xmsl));
+                                    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();
+                                    if(userPackageDetailList.size()>0){
+                                        for(int j=0;j<userPackageDetailList.size();j++){
+                                            UserPackageDetail upd = userPackageDetailList.get(j);
+                                            upd.setMainId(mainId);
+                                            upd.setCreateTime(sdf.format(new Date()));
+                                            upd.setLevel(massagePackage.getLevel());
+                                            for(int k=0;k<quantity;k++){
+                                                userPackageDetailService.insert(upd);
+                                                MassageType massageType = massageTypeService.getById(upd.getMassageTypeId());
+                                                massageType.setSales(massageType.getSales()+1);
+                                                massageTypeService.updateById(massageType);
+                                            }
+                                        }
+                                    }
+                                }
+                            }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(orders.getOrdersId());
+                                        userPackage.setOrdersNo(orders.getOrdersNo());
+                                        userPackage.setCreateTime(sdf.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(sdf.format(new Date()));
+                                                upd.setLevel(massagePackage.getLevel());
+                                                int serviceCount = upd.getServiceCount();
+                                                for(int k=0;k<serviceCount;k++){
+                                                    userPackageDetailService.insert(upd);
+                                                    MassageType massageType = massageTypeService.getById(upd.getMassageTypeId());
+                                                    massageType.setSales(massageType.getSales()+1);
+                                                    massageTypeService.updateById(massageType);
+                                                }
+                                            }
                                         }
                                     }
                                 }
                             }
-                        }
+
                     }else if(payDetails.getType()==8) {
                         UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo);
                         UserMoneyDetails userMoneyDetails = new UserMoneyDetails();