#feat 订单自提点查询

yanghui

2022-11-28 81869518b49a94ffe8c7973c1c9f9c5829eba5c6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,6 +32,7 @@
import java.util.*;
import java.util.stream.Collectors;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
@@ -384,11 +386,23 @@
     * @return 订单详情
     */
    @Override
    public R orderDetail(Long orderId) {

    public R orderDetail(Long orderId,String phone) {
        ComShopFlowerOrderPageVO orderVO = new ComShopFlowerOrderPageVO();
        // 查询订单信息
        ComShopFlowerOrderDO shopOrderDO = this.baseMapper.selectById(orderId);
        ComShopFlowerOrderDO shopOrderDO = null;
        if (StrUtil.isEmpty(phone)){
            // 查询订单信息
            shopOrderDO = this.baseMapper.selectById(orderId);
        }else {
            //查询自提点信息
            ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, phone));
            if (isNull(convenientElevatingPointDO)){
                return R.fail("自提点不存在");
            }
            Long pointDOId = convenientElevatingPointDO.getId();
            shopOrderDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopFlowerOrderDO>().eq(ComShopFlowerOrderDO::getId, orderId).eq(ComShopFlowerOrderDO::getPointId, pointDOId));
        }


        if (shopOrderDO == null) {
            return R.fail("未查询到订单");
        }