diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index 947e389..af90689 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -1951,15 +1951,28 @@ public class WxServiceImpl implements WxService { //获取订单-服务包映射关系列表 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); + UserPackageDetail detail = userPackageDetailList.get(0); + + BigDecimal xmsl = new BigDecimal(quantity+""); //拆分插入用户服务包 UserPackage userPackage = new UserPackage(); userPackage.setUserId(orders.getUserId()); @@ -1969,8 +1982,8 @@ public class WxServiceImpl implements WxService { userPackage.setCreateTime(sdf.format(new Date())); userPackage.setTitle(massagePackage.getTitle()); userPackage.setType(massagePackage.getType()); - userPackage.setOldPrice(massagePackage.getOldPrice()); - userPackage.setPrice(massagePackage.getPrice()); + userPackage.setOldPrice(detail.getOldPrice().multiply(xmsl)); + userPackage.setPrice(detail.getPrice().multiply(xmsl)); userPackage.setPackageImg(massagePackage.getPackageImg()); userPackage.setContent(massagePackage.getContent()); userPackage.setContentImg(massagePackage.getContentImg()); @@ -1980,18 +1993,13 @@ public class WxServiceImpl implements WxService { userPackage.setLevel(massagePackage.getLevel()); userPackageService.insert(userPackage); Long mainId = userPackage.getId(); - //拆分插入用户服务器项目详情 - UserPackageDetail userPackageDetail = new UserPackageDetail(); - userPackageDetail.setMainId(ordersPackage.getPackageId()); - List userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail); if(userPackageDetailList.size()>0){ for(int j=0;j userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail); + if(userPackageDetailList.size()>0){ + for(int j=0;j