refactor(mall): 确认收货功能

KKSU

2025-01-20 4eb7bd043cc1fe6bf0cdf44f8c045698c0e9e21b

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java

@@ -25,6 +25,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@Slf4j
@@ -114,20 +115,20 @@
        if(2 != deliveryType){
            return new FebsResponse().fail().message("订单的配送方式不是快递");
        }
        String expressNo = deliverGoodsDto.getExpressNo();
        if(StrUtil.isEmpty(expressNo)){
            return new FebsResponse().fail().message("请输入物流单号");
        }
        String expressCom = deliverGoodsDto.getExpressCom();
        if(StrUtil.isEmpty(expressCom)){
            return new FebsResponse().fail().message("请输入物流公司");
        }
        MallExpressInfo mallExpressInfo = new MallExpressInfo();
        mallExpressInfo.setMemberId(mallOrderInfo.getMemberId());
        mallExpressInfo.setOrderId(mallOrderInfo.getId());
        mallExpressInfo.setExpressNo(expressNo);
        mallExpressInfo.setExpressCom(expressCom);
        mallExpressInfoMapper.insert(mallExpressInfo);
//        String expressNo = deliverGoodsDto.getExpressNo();
//        if(StrUtil.isEmpty(expressNo)){
//            return new FebsResponse().fail().message("请输入物流单号");
//        }
//        String expressCom = deliverGoodsDto.getExpressCom();
//        if(StrUtil.isEmpty(expressCom)){
//            return new FebsResponse().fail().message("请输入物流公司");
//        }
//        MallExpressInfo mallExpressInfo = new MallExpressInfo();
//        mallExpressInfo.setMemberId(mallOrderInfo.getMemberId());
//        mallExpressInfo.setOrderId(mallOrderInfo.getId());
//        mallExpressInfo.setExpressNo(expressNo);
//        mallExpressInfo.setExpressCom(expressCom);
//        mallExpressInfoMapper.insert(mallExpressInfo);

        mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
                OrderStatusEnum.WAIT_FINISH.getValue(),
@@ -469,22 +470,10 @@
        if(2 != deliveryType){
            return new FebsResponse().fail().message("订单的配送方式不是快递");
        }
        String expressNo = deliverGoodsDto.getExpressNo();
        if(StrUtil.isEmpty(expressNo)){
            return new FebsResponse().fail().message("请输入物流单号");
        }
        String expressCom = deliverGoodsDto.getExpressCom();
        if(StrUtil.isEmpty(expressCom)){
            return new FebsResponse().fail().message("请输入物流公司");
        }
        MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(mallOrderInfo.getId());

        if(ObjectUtil.isEmpty(mallExpressInfo)){
            return new FebsResponse().fail().message("请先发货");
        }
        mallExpressInfo.setExpressNo(expressNo);
        mallExpressInfo.setExpressCom(expressCom);
        mallExpressInfoMapper.updateById(mallExpressInfo);
        mallOrderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
        mallOrderInfo.setReceivingTime(new Date());
        mallOrderInfoMapper.updateById(mallOrderInfo);

        return new FebsResponse().success();
    }