xiaoyong931011
2023-02-13 0ef2ea54b85d11f537a761e2028a40ec1ec1df1b
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -71,6 +71,7 @@
        if(CollUtil.isNotEmpty(adminMallOrderInfoVos.getRecords())){
            for(AdminMallOrderInfoVo adminMallOrderInfoVo : adminMallOrderInfoVos.getRecords()){
                Long orderId = adminMallOrderInfoVo.getId();
                adminMallOrderInfoVo.setGoodsAmount(adminMallOrderInfoVo.getAmount().subtract(adminMallOrderInfoVo.getCarriage()));
                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderId);
                if(CollUtil.isNotEmpty(mallOrderItemList)){
                    StringBuffer stringBuffer = new StringBuffer();
@@ -120,7 +121,7 @@
        mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
                OrderStatusEnum.WAIT_FINISH.getValue(),
                OrderDeliveryStateEnum.DELIVERY_ING.getValue());
                OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
        return new FebsResponse().success();
    }
@@ -459,7 +460,10 @@
        mallExpressInfo.setExpressCode(deliverGoodsDto.getExpressCode());
        mallExpressInfoMapper.insert(mallExpressInfo);
        mallOrderInfo.setStatus(3);
        mallOrderInfoMapper.updateById(mallOrderInfo);
        mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
                OrderStatusEnum.WAIT_FINISH.getValue(),
                OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
//        mallOrderInfo.setStatus(3);
//        mallOrderInfoMapper.updateById(mallOrderInfo);
    }
}