20221221

xiaoyong931011

2022-12-24 bcfbc0977218522e78230a836b8681f8b2239d13

20221221

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

@@ -454,18 +454,18 @@

        OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);

        Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
        if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue() && 2 != deliverType) {
            MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
            orderDetailVo.setExpressNo(expressInfo.getExpressNo());
            orderDetailVo.setExpressCom(expressInfo.getExpressCom());
        }
//        Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
//        if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue() && 2 != deliverType) {
//            MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
//            orderDetailVo.setExpressNo(expressInfo.getExpressNo());
//            orderDetailVo.setExpressCom(expressInfo.getExpressCom());
//        }

        if (orderInfo.getStatus() == OrderStatusEnum.REFUNDING.getValue() || orderInfo.getStatus() == OrderStatusEnum.REFUNDED.getValue()) {
            MallOrderRefund orderRefund = mallOrderRefundMapper.selectOrderRefundByOrderId(orderInfo.getId());
            OrderRefundVo orderRefundVo = MallOrderRefundConversion.INSTANCE.entityToVo(orderRefund);
            orderDetailVo.setOrderRefund(orderRefundVo);
        }
//        if (orderInfo.getStatus() == OrderStatusEnum.REFUNDING.getValue() || orderInfo.getStatus() == OrderStatusEnum.REFUNDED.getValue()) {
//            MallOrderRefund orderRefund = mallOrderRefundMapper.selectOrderRefundByOrderId(orderInfo.getId());
//            OrderRefundVo orderRefundVo = MallOrderRefundConversion.INSTANCE.entityToVo(orderRefund);
//            orderDetailVo.setOrderRefund(orderRefundVo);
//        }

        if (OrderStatusEnum.WAIT_PAY.getValue() == orderInfo.getStatus()) {
            Date endTime = DateUtil.offsetMinute(orderInfo.getOrderTime(), 15);
@@ -473,20 +473,20 @@
            long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
            orderDetailVo.setRemainTime(remainTime);
        }
        if(2 == deliverType){
            MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
            if(ObjectUtil.isNotEmpty(mallShopApply)){
                ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
                apiShopApplyVo.setName(mallShopApply.getName());
                apiShopApplyVo.setPhone(mallShopApply.getPhone());
                apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
                apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
                apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
                apiShopApplyVo.setShopName(mallShopApply.getShopName());
                apiShopApplyVo.setAddress(mallShopApply.getAddress());
                orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
            }
        }
//        if(2 == deliverType){
//            MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
//            if(ObjectUtil.isNotEmpty(mallShopApply)){
//                ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
//                apiShopApplyVo.setName(mallShopApply.getName());
//                apiShopApplyVo.setPhone(mallShopApply.getPhone());
//                apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
//                apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
//                apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
//                apiShopApplyVo.setShopName(mallShopApply.getShopName());
//                apiShopApplyVo.setAddress(mallShopApply.getAddress());
//                orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
//            }
//        }
        return orderDetailVo;
    }


 src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java

@@ -30,6 +30,9 @@
    @ApiModelProperty(value = "支付方式")
    private String payMethod;

    @ApiModelProperty(value = "物流编号")
    private String payTradeNo;

    @ApiModelProperty(value = "支付方式类型")
    private Integer payMethodType;