refactor(mall): 优化活动状态显示和处理

KKSU

2025-01-09 f8f52081879eb09033c3cf66fd40314a46c92604

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

@@ -56,6 +56,7 @@
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final IMallMoneyFlowService mallMoneyFlowService;
    private final MallRefundMapper mallRefundMapper;
    private final MallMemberMapper mallMemberMapper;


    @Override
@@ -79,7 +80,13 @@
                        stringBuffer.append(mallOrderItem.getGoodsName())
                                .append("-")
                                .append(mallOrderItem.getSkuName())
                                .append("*").append(mallOrderItem.getCnt()).append(";");
                                .append("*").append(mallOrderItem.getCnt()).append("；");
                        if(ObjectUtil.isNotEmpty(mallOrderItem.getMemberInviteId())){
                            MallMember mallMember = mallMemberMapper.selectInfoByInviteId(mallOrderItem.getMemberInviteId());
                            if(ObjectUtil.isNotEmpty(mallMember)){
                                adminMallOrderInfoVo.setRefererName(mallMember.getName());
                            }
                        }
                    }
                    adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
                }
@@ -449,6 +456,40 @@
    }

    @Override
    public FebsResponse deliverGoodsUpdate(DeliverGoodsDto deliverGoodsDto) {
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(deliverGoodsDto.getId());
        if(ObjectUtil.isEmpty(mallOrderInfo)){
            return new FebsResponse().fail().message("订单不存在，刷新后重试");
        }
        Integer status = mallOrderInfo.getStatus();
        if(3 != status){
            return new FebsResponse().fail().message("订单不是待收货状态");
        }
        Integer deliveryType = mallOrderInfo.getDeliveryType();
        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);

        return new FebsResponse().success();
    }

    @Override
    public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
        if (mallOrderInfo == null) {