bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单状态统一修改

This commit is contained in:
liang.chao 2024-12-01 11:49:59 +08:00
parent 5ec647ac8a
commit 65ad64a465
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -51,7 +51,7 @@ public class OrderController extends BaseController {
*/ */
@ApiOperation(value = "获取订单详情") @ApiOperation(value = "获取订单详情")
@GetMapping("/getOrderDetails") @GetMapping("/getOrderDetails")
public TableDataInfo getOrderDetails(OrderInfoDto orderInfoDto) { public TableDataInfo getOrderDetails(OrderInfoDto orderInfoDto) throws Exception {
startPage(); startPage();
return getDataTable(orderService.getOrderDetails(orderInfoDto)); return getDataTable(orderService.getOrderDetails(orderInfoDto));
} }

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java
View File

@ -13,7 +13,7 @@ public interface OrderService {
Integer submitOrderInfo(OrderInfoDto orderInfoDto); Integer submitOrderInfo(OrderInfoDto orderInfoDto);
List<OrderInfoDto> getOrderDetails(OrderInfoDto orderInfoDto); List<OrderInfoDto> getOrderDetails(OrderInfoDto orderInfoDto) throws Exception;
OrderInfoDto getOrderDetailsById(OrderDetailDto dto); OrderInfoDto getOrderDetailsById(OrderDetailDto dto);
} }

18
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -64,24 +64,24 @@ public class OrderServiceImpl implements OrderService {
} }
@Override @Override
public List<OrderInfoDto> getOrderDetails(OrderInfoDto orderInfoDto) { public List<OrderInfoDto> getOrderDetails(OrderInfoDto orderInfoDto) throws Exception {
List<OrderInfoDto> orderInfoDtos = orderMapper.getOrderDetails(orderInfoDto); List<OrderInfoDto> orderInfoDtos = orderMapper.getOrderDetails(orderInfoDto);
for (OrderInfoDto dto : orderInfoDtos) { for (OrderInfoDto dto : orderInfoDtos) {
List<OrderDetailDto> list = new ArrayList(); List<OrderDetailDto> list = new ArrayList();
String ids = dto.getIds(); String ids = dto.getIds();
for (String id : ids.split(",")) { for (String id : ids.split(",")) {
OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id); OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id);
// 待出库
if ("2".equals(orderDetailDto.getOrderStatus())) {
dto.setOrderStatus("2");
}
// 待收货
if ("3".equals(orderDetailDto.getOrderStatus())) {
dto.setCzOrderStatus("3");
}
list.add(orderDetailDto); list.add(orderDetailDto);
} }
dto.setDetailsList(list); dto.setDetailsList(list);
boolean orderStatus = list.stream()
.map(OrderDetailDto::getOrderStatus)
.allMatch(name -> name.equals(list.get(0).getOrderStatus()));
if (orderStatus) {
dto.setOrderStatus(list.get(0).getOrderStatus());
} else {
throw new Exception("订单状态不一致，请检查订单状态");
}
} }
return orderInfoDtos; return orderInfoDtos;
} }