licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单变更问题修改

Browse Source
This commit is contained in:
z 2025-01-15 09:28:49 +08:00
parent 21b00913ed
commit 83a96ad0bd
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
View File

@ -194,16 +194,16 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
LambdaQueryWrapper<OrderYsDO> eq = new LambdaQueryWrapper<OrderYsDO>().eq(OrderYsDO::getCode, updateReqVO.getCode()); LambdaQueryWrapper<OrderYsDO> eq = new LambdaQueryWrapper<OrderYsDO>().eq(OrderYsDO::getCode, updateReqVO.getCode());
OrderYsDO orderYsDO = orderYsMapper.selectOne(eq); OrderYsDO orderYsDO = orderYsMapper.selectOne(eq);
if (ObjectUtil.isEmpty(orderYsDO)){
if (updateReqVO.getHasPrice().equals(1)) { if (updateReqVO.getHasPrice().equals(1)) {
if (ObjectUtil.isEmpty(orderYsDO)) {
orderYsDO = new OrderYsDO(); orderYsDO = new OrderYsDO();
orderYsDO.setCode(updateReqVO.getCode()); orderYsDO.setCode(updateReqVO.getCode());
orderYsDO.setProjectName(updateReqVO.getProjectName()); orderYsDO.setProjectName(updateReqVO.getProjectName());
orderYsDO.setCgTime(LocalDateTime.now()); orderYsDO.setCgTime(LocalDateTime.now());
orderYsDO.setCgKhname(customerService.getCustomer(updateReqVO.getCustomerId()).getName()); orderYsDO.setCgKhname(customerService.getCustomer(updateReqVO.getCustomerId()).getName());
if(updateReqVO.getPrice()==null){ if (updateReqVO.getPrice() == null) {
orderYsDO.setCgYs(new BigDecimal(0)); orderYsDO.setCgYs(new BigDecimal(0));
}else { } else {
orderYsDO.setCgYs(updateReqVO.getPrice()); orderYsDO.setCgYs(updateReqVO.getPrice());
LocalDateTime[] paymentTimes = { LocalDateTime[] paymentTimes = {
updateReqVO.getSixFuKuanTime(), updateReqVO.getSixFuKuanTime(),
@ -220,9 +220,8 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
} }
} }
} }
}
orderYsMapper.insert(orderYsDO); orderYsMapper.insert(orderYsDO);
}else { } else {
orderYsDO.setCgYs(updateReqVO.getPrice()); orderYsDO.setCgYs(updateReqVO.getPrice());
LocalDateTime[] paymentTimes = { LocalDateTime[] paymentTimes = {
updateReqVO.getSixFuKuanTime(), updateReqVO.getSixFuKuanTime(),
@ -240,8 +239,11 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
} }
orderYsMapper.updateById(orderYsDO); orderYsMapper.updateById(orderYsDO);
} }
ProjectOrderDO updateObj = BeanUtils.toBean(updateReqVO, ProjectOrderDO.class); }else{
projectOrderMapper.updateById(updateObj); if (ObjectUtil.isNotEmpty(orderYsDO)) {
orderYsMapper.deleteById(orderYsDO.getId());
}
}
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ -516,6 +518,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
}else{ }else{
if ("ALTER".equals(operateReqVO.getActive())){ if ("ALTER".equals(operateReqVO.getActive())){
updateProjectOrderPrice(operateReqVO); updateProjectOrderPrice(operateReqVO);
updateProjectOrder(operateReqVO);
}else { }else {
updateProjectOrder(operateReqVO); updateProjectOrder(operateReqVO);
} }