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

订单详情返回餐位费信息

Browse Source
This commit is contained in:
SongZhang
2024-10-10 14:46:53 +08:00
parent fac61ff581
commit 3533a1c90e
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eladmin-system/src/main/java/cn/ysk/cashier/cons/TableConstant.java Normal file
View File

@@ -0,0 +1,6 @@
package cn.ysk.cashier.cons;
public interface TableConstant {
String CART_SEAT_ID = "-999";
}

5
eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java
View File

@@ -15,6 +15,7 @@
*/ */
package cn.ysk.cashier.dto.order; package cn.ysk.cashier.dto.order;
import cn.ysk.cashier.pojo.order.TbCashierCart;
import cn.ysk.cashier.pojo.order.TbOrderDetail; import cn.ysk.cashier.pojo.order.TbOrderDetail;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -23,6 +24,7 @@ import javax.persistence.Column;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Optional;
/** /**
* @website https://eladmin.vip * @website https://eladmin.vip
@@ -171,4 +173,7 @@ public class TbOrderInfoDto implements Serializable {
private Integer seatCount; private Integer seatCount;
private BigDecimal seatAmount; private BigDecimal seatAmount;
private String useType; private String useType;
private TbCashierCart seatInfo;
} }

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

@@ -2,6 +2,7 @@ package cn.ysk.cashier.service.impl.order;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.ysk.cashier.cons.TableConstant;
import cn.ysk.cashier.cons.rabbit.RabbitConstants; import cn.ysk.cashier.cons.rabbit.RabbitConstants;
import cn.ysk.cashier.dto.order.TbOrderInfoDto; import cn.ysk.cashier.dto.order.TbOrderInfoDto;
import cn.ysk.cashier.dto.order.TbOrderInfoQueryCriteria; import cn.ysk.cashier.dto.order.TbOrderInfoQueryCriteria;
@@ -11,12 +12,14 @@ import cn.ysk.cashier.mapper.order.TbOrderInfoMapper;
import cn.ysk.cashier.mapper.product.TbProductMapper; import cn.ysk.cashier.mapper.product.TbProductMapper;
import cn.ysk.cashier.mapper.product.TbProductSkuMapper; import cn.ysk.cashier.mapper.product.TbProductSkuMapper;
import cn.ysk.cashier.mybatis.entity.*; import cn.ysk.cashier.mybatis.entity.*;
import cn.ysk.cashier.mybatis.mapper.TbCashierCartMapper;
import cn.ysk.cashier.mybatis.mapper.TbMShopUserMapper; import cn.ysk.cashier.mybatis.mapper.TbMShopUserMapper;
import cn.ysk.cashier.mybatis.mapper.TbShopUserFlowMapper; import cn.ysk.cashier.mybatis.mapper.TbShopUserFlowMapper;
import cn.ysk.cashier.mybatis.service.TbActivateInRecordService; import cn.ysk.cashier.mybatis.service.TbActivateInRecordService;
import cn.ysk.cashier.mybatis.service.TbActivateOutRecordService; import cn.ysk.cashier.mybatis.service.TbActivateOutRecordService;
import cn.ysk.cashier.mybatis.service.TbOrderPaymentService; import cn.ysk.cashier.mybatis.service.TbOrderPaymentService;
import cn.ysk.cashier.pojo.TbShopPayType; import cn.ysk.cashier.pojo.TbShopPayType;
import cn.ysk.cashier.pojo.order.TbCashierCart;
import cn.ysk.cashier.pojo.order.TbFullOrderDetail; import cn.ysk.cashier.pojo.order.TbFullOrderDetail;
import cn.ysk.cashier.pojo.order.TbOrderDetail; import cn.ysk.cashier.pojo.order.TbOrderDetail;
import cn.ysk.cashier.pojo.order.TbOrderInfo; import cn.ysk.cashier.pojo.order.TbOrderInfo;
@@ -95,6 +98,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
private final TbMShopUserMapper tbMShopUserMapper; private final TbMShopUserMapper tbMShopUserMapper;
private final TbShopUserFlowMapper tbShopUserFlowMapper; private final TbShopUserFlowMapper tbShopUserFlowMapper;
private final RabbitMsgUtils rabbitMsgUtils; private final RabbitMsgUtils rabbitMsgUtils;
private final TbCashierCartMapper tbCashierCartMapper;
@Value("${thirdPay.url}") @Value("${thirdPay.url}")
private String url; private String url;
@@ -285,6 +289,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
dto.setRefundAmount(tbOrderInfos.stream().map(TbOrderInfo::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); dto.setRefundAmount(tbOrderInfos.stream().map(TbOrderInfo::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
} }
dto.setDetailList(details); dto.setDetailList(details);
TbCashierCart cashierCart = tbCashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>().eq(TbCashierCart::getOrderId, id).eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID));
dto.setSeatInfo(cashierCart);
return dto; return dto;
} }