czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 订单列表返回餐位费信息

Browse Source
This commit is contained in:
SongZhang
2024-10-26 13:51:07 +08:00
parent 763014f65a
commit ce94bd7e4e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@@ -172,7 +172,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
for (TbOrderInfo tbOrderInfo : page.getContent()) { for (TbOrderInfo tbOrderInfo : page.getContent()) {
TbOrderInfoVo orderInfoVo = new TbOrderInfoVo(); TbOrderInfoVo orderInfoVo = new TbOrderInfoVo();
BigDecimal refundAmount = BigDecimal.ZERO; BigDecimal refundAmount = BigDecimal.ZERO;
List<TbOrderDetail> details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId()); List<TbFullOrderDetail> details = tbOrderDetailMapper.selectFullInfoByOrderId(tbOrderInfo.getId());
if (!tbOrderInfo.getOrderType().equals("return")) { if (!tbOrderInfo.getOrderType().equals("return")) {
List<TbOrderInfo> tbOrderInfos = tbOrderInfoRepository.selTbOrdersBysource(tbOrderInfo.getId(), tbOrderInfo.getShopId()); List<TbOrderInfo> tbOrderInfos = tbOrderInfoRepository.selTbOrdersBysource(tbOrderInfo.getId(), tbOrderInfo.getShopId());
Map<Integer, Integer> map; Map<Integer, Integer> map;
@@ -197,8 +197,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
} }
TbOrderDetail seatInfo = null; TbOrderDetail seatInfo = null;
ArrayList<TbOrderDetail> detailList = new ArrayList<>(); ArrayList<TbFullOrderDetail> detailList = new ArrayList<>();
for (TbOrderDetail detail : details) { for (TbFullOrderDetail detail : details) {
if (TableConstant.CART_SEAT_ID.equals(detail.getProductId().toString())) { if (TableConstant.CART_SEAT_ID.equals(detail.getProductId().toString())) {
seatInfo = detail; seatInfo = detail;
}else { }else {

2
eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java
View File

@@ -114,7 +114,7 @@ public class TbOrderInfoVo {
private String remark; private String remark;
private List<TbOrderDetail> detailList; private List<? extends TbOrderDetail> detailList;
private TbOrderDetail seatInfo; private TbOrderDetail seatInfo;
} }