yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目详情待补单、修改单技师项目收益金额加上原单金额

This commit is contained in:
曹磊 2024-07-10 11:56:07 +08:00
parent 6adcbd883a
commit dff7ef683b
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -1276,10 +1276,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders.setOldMassagePrice(oldOrders.getMassagePrice()); orders.setOldMassagePrice(oldOrders.getMassagePrice());
orders.setOldMassageNum(oldOrders.getMassageNum()); orders.setOldMassageNum(oldOrders.getMassageNum());
orders.setOldMassageDuration(oldOrders.getDuration()); orders.setOldMassageDuration(oldOrders.getDuration());
orders.setOldArtificerMoney(oldOrders.getArtificerMoney());
orders.setOldProjectBenefits(oldOrders.getProjectBenefits());
baseMapper.insert(orders);
ordersMassageService.removeByOrdersId(orders.getOrdersId()); ordersMassageService.removeByOrdersId(orders.getOrdersId());
List<OrdersMassage> ordersMassageList = orders.getOrdersMassageList(); List<OrdersMassage> ordersMassageList = orders.getOrdersMassageList();
@ -1377,6 +1374,12 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
ordersOld.setPingMoney(pingMoney); ordersOld.setPingMoney(pingMoney);
baseMapper.updateById(ordersOld);//原单暂变成挂单状态 baseMapper.updateById(ordersOld);//原单暂变成挂单状态
orders.setOldArtificerMoney(oldOrders.getArtificerMoney());
orders.setOldProjectBenefits(oldOrders.getProjectBenefits());
baseMapper.insert(orders);
return Result.success().put("data", orders); return Result.success().put("data", orders);
} }
//进行中项目升级 //进行中项目升级
@ -2841,7 +2844,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} }
@Transactional @Transactional
private Result cancelPackageOrders(Long userId, Orders orders, BigDecimal trafficDeduction, BigDecimal trafficRate){ public Result cancelPackageOrders(Long userId, Orders orders, BigDecimal trafficDeduction, BigDecimal trafficRate){
//释放 //释放
UserPackageDetail userPackageDetail = new UserPackageDetail(); UserPackageDetail userPackageDetail = new UserPackageDetail();
userPackageDetail.setId(orders.getUserPackageDetailId()); userPackageDetail.setId(orders.getUserPackageDetailId());
@ -4863,6 +4866,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
pingMoney = pingMoney.subtract(oneUserMoney); pingMoney = pingMoney.subtract(oneUserMoney);
orders.setPingMoney(pingMoney); orders.setPingMoney(pingMoney);
if(orders.getIsSupplement() != null){
if(!orders.getIsSupplement().equals(2)){
Orders oldOrders = baseMapper.selectById(orders.getOrdersId());
projectBenefits = projectBenefits.add(oldOrders.getProjectBenefits());
orders.setProjectBenefits(projectBenefits);
}
}
baseMapper.updateById(orders); baseMapper.updateById(orders);
if (orders.getParentId() != null && orders.getParentId() != 0) { if (orders.getParentId() != null && orders.getParentId() != 0) {
Orders orders1 = baseMapper.selectById(orders.getParentId()); Orders orders1 = baseMapper.selectById(orders.getParentId());
@ -5247,6 +5258,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
pingMoney = pingMoney.subtract(oneUserMoney); pingMoney = pingMoney.subtract(oneUserMoney);
orders.setPingMoney(pingMoney); orders.setPingMoney(pingMoney);
if(orders.getIsSupplement() != null){
if(!orders.getIsSupplement().equals(2)){
Orders oldOrders = baseMapper.selectById(orders.getOrdersId());
projectBenefits = projectBenefits.add(oldOrders.getProjectBenefits());
orders.setProjectBenefits(projectBenefits);
}
}
baseMapper.updateById(orders); baseMapper.updateById(orders);
if (orders.getParentId() != null && orders.getParentId() != 0) { if (orders.getParentId() != null && orders.getParentId() != 0) {
Orders orders1 = baseMapper.selectById(orders.getParentId()); Orders orders1 = baseMapper.selectById(orders.getParentId());