20220822

xiaoyong931011

2022-08-31 1a66508ad3d73dcc456162c553b03f2208570b51

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

@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -53,6 +54,7 @@

    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final IMallMoneyFlowService mallMoneyFlowService;
    private final MallRefundMapper mallRefundMapper;


    @Override
@@ -103,6 +105,7 @@
        mallExpressInfoMapper.insert(mallExpressInfo);

        mallOrderInfo.setStatus(3);
        mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_ING.getValue());
        mallOrderInfoMapper.updateById(mallOrderInfo);
        return new FebsResponse().success();
    }
@@ -398,6 +401,28 @@
    }

    @Override
    public void updateOrderStateAndDeliveryState(Long id, int value, int value1) {
        mallOrderInfoMapper.updateOrderStateAndDeliveryState(id,value,value1);
    }

    @Override
    public IPage<MallRefundEntity> getOrderRefundListInPage(MallRefundEntity mallRefundEntity, QueryRequest request) {
        Page<MallRefundEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<MallRefundEntity> mallRefundEntityIPage = mallRefundMapper.getOrderRefundListInPage(page, mallRefundEntity);
        List<MallRefundEntity> records = mallRefundEntityIPage.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(MallRefundEntity mallRefundEntityPic : records){
                String refundPic = mallRefundEntityPic.getRefundPic();
                if(StrUtil.isNotEmpty(refundPic)){
                    String[] split = StrUtil.split(refundPic, ",");
                    mallRefundEntityPic.setRefundPicList(split);
                }
            }
        }
        return mallRefundEntityIPage;
    }

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