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 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 userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail); - if(userPackageDetailList.size()>0){ - for(int j=0;j 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 = userPackageDetailService.findMassagePackageDetails(userPackageDetail); + if(userPackageDetailList.size()>0){ + for(int j=0;j