From e19535d71e4d14fc7d4845fe72d23d4be1309114 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 26 Oct 2024 09:55:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6=E6=89=93=E5=8C=85=E8=B5=A0?= =?UTF-8?q?=E9=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java | 3 ++- .../cashier/mybatis/mapper/TbOrderDetailMapper.java | 11 +++++++++++ .../cashier/mybatis/service/MpOrderDetailService.java | 9 +++++++++ .../service/impl/MpOrderDetailServiceImpl.java | 8 ++++++++ .../service/impl/order/TbOrderInfoServiceImpl.java | 7 ++++++- .../service/impl/shopimpl/TbShopTableServiceImpl.java | 8 ++++++-- 6 files changed, 42 insertions(+), 4 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java index 5b596b59..e1e0a765 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java @@ -16,6 +16,7 @@ package cn.ysk.cashier.dto.order; import cn.ysk.cashier.pojo.order.TbCashierCart; +import cn.ysk.cashier.pojo.order.TbFullOrderDetail; import cn.ysk.cashier.pojo.order.TbOrderDetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -159,7 +160,7 @@ public class TbOrderInfoDto implements Serializable { private String remark; - private List detailList; + private List detailList; private String payRemark; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbOrderDetailMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbOrderDetailMapper.java index 7158bce5..415eb6ce 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbOrderDetailMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbOrderDetailMapper.java @@ -1,9 +1,13 @@ package cn.ysk.cashier.mybatis.mapper; +import cn.ysk.cashier.pojo.order.TbFullOrderDetail; import cn.ysk.cashier.pojo.order.TbOrderDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; +import java.util.List; + public interface TbOrderDetailMapper extends BaseMapper { /** @@ -16,4 +20,11 @@ public interface TbOrderDetailMapper extends BaseMapper { @Update("update tb_order_detail set status=#{status}, price_amount=(num+#{changeNum})*price,num=num+#{changeNum} " + "where id=#{id}") int updateNumAmountStatus(Integer id, String status, int changeNum); + + /** + * 查询包含打包费和是否赠送的订单详情信息 + * @param orderId 订单id + */ + @Select("select a.*, b.is_gift, b.is_pack from tb_order_detail as a left join tb_cashier_cart as b on a.cart_id=b.id where a.order_id=#{orderId}") + List selectFullInfoByOrderId(Integer orderId); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpOrderDetailService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpOrderDetailService.java index 23d352fa..8d766da5 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpOrderDetailService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpOrderDetailService.java @@ -2,6 +2,7 @@ package cn.ysk.cashier.mybatis.service; import cn.ysk.cashier.dto.shoptable.ReturnOrderDTO; import cn.ysk.cashier.enums.OrderStatusEnums; +import cn.ysk.cashier.pojo.order.TbFullOrderDetail; import cn.ysk.cashier.pojo.order.TbOrderDetail; import com.baomidou.mybatisplus.extension.service.IService; @@ -33,5 +34,13 @@ public interface MpOrderDetailService extends IService { * @return 是否成功 */ boolean updateUseTypeByCartIds(ArrayList cartIds, String useType); + + /** + * 根据订单id查询订单详情 + * @param orderId 订单id + * @return 详情信息 + */ + List selectByOrderId(Integer orderId); + } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpOrderDetailServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpOrderDetailServiceImpl.java index 9be766b1..d6d9b89c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpOrderDetailServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpOrderDetailServiceImpl.java @@ -5,11 +5,13 @@ import cn.ysk.cashier.enums.OrderStatusEnums; import cn.ysk.cashier.mybatis.mapper.TbOrderDetailMapper; import cn.ysk.cashier.mybatis.service.MpOrderDetailService; import cn.ysk.cashier.pojo.order.TbOrderDetail; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -38,5 +40,11 @@ public class MpOrderDetailServiceImpl extends ServiceImpl selectByOrderId(Integer orderId) { + return list(new LambdaQueryWrapper() + .eq(TbOrderDetail::getOrderId, orderId)); + } } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java index 54726f8e..d532fcdc 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java @@ -16,10 +16,13 @@ import cn.ysk.cashier.mapper.product.TbProductSkuMapper; 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.TbOrderDetailMapper; import cn.ysk.cashier.mybatis.mapper.TbShopUserFlowMapper; +import cn.ysk.cashier.mybatis.service.MpOrderDetailService; import cn.ysk.cashier.mybatis.service.TbActivateInRecordService; import cn.ysk.cashier.mybatis.service.TbActivateOutRecordService; import cn.ysk.cashier.mybatis.service.TbOrderPaymentService; +import cn.ysk.cashier.mybatis.service.impl.MpOrderDetailServiceImpl; import cn.ysk.cashier.pojo.TbShopPayType; import cn.ysk.cashier.pojo.order.TbCashierCart; import cn.ysk.cashier.pojo.order.TbFullOrderDetail; @@ -105,6 +108,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { private final TbCashierCartMapper tbCashierCartMapper; private final PayService payService; + private final MpOrderDetailService mpOrderDetailService; + private final TbOrderDetailMapper tbOrderDetailMapper; @Value("${thirdPay.url}") private String url; @@ -291,7 +296,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { dto.setPayType("退单"); } } - List details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId()); + List details = tbOrderDetailMapper.selectFullInfoByOrderId(tbOrderInfo.getId()); dto.setIsRefund(0); dto.setRefundAmount(BigDecimal.ZERO); dto.setRefundRemark(tbOrderInfo.getRefundRemark()); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 487396f0..f079ee52 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -778,7 +778,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { @Override public Map getCart(String tableId, Integer page, Integer size, Integer shopId, String masterId, String useType) { - ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(shopId, OrderUseTypeEnum.TAKEOUT.getValue().equals(useType) ? null : tableId); + ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(shopId, OrderUseTypeEnum.TAKEOUT.getValue().equals(useType) ? null : tableId, useType); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .in(TbCashierCart::getStatus, "create", "return") .eq(TbCashierCart::getShopId, shopId) @@ -787,7 +787,11 @@ public class TbShopTableServiceImpl implements TbShopTableService { .and(q -> q.eq(TbCashierCart::getMasterId, masterId).or().isNull(TbCashierCart::getMasterId)); if (!shopEatTypeInfoDTO.isTakeout()) { - queryWrapper.eq(TbCashierCart::getTableId, tableId); + if (StrUtil.isBlank(tableId)) { + queryWrapper.isNull(TbCashierCart::getTableId); + }else { + queryWrapper.eq(TbCashierCart::getTableId, tableId); + } } else { queryWrapper.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, "")) .in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue());