add export for deliver

Helius

2022-05-18 7992cd7adb57f8f2cb4b4fa295afb8894c24d0bf

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

@@ -17,12 +17,14 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional
public class AdminMallOrderService extends ServiceImpl<MallOrderInfoMapper, MallOrderInfo> implements IAdminMallOrderService {

    private final MallOrderInfoMapper mallOrderInfoMapper;
@@ -41,7 +43,15 @@

    private final IApiMallMemberWalletService iApiMallMemberWalletService;

    private final MallMemberPaymentMapper mallMemberPaymentMapper;

    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;

    @Override
    public IPage<MallOrderInfo> findOrderListInPage(MallOrderInfo mallOrderInfo, QueryRequest request) {
        Page<MallOrderInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.baseMapper.selectInPage(mallOrderInfo, page);
    }

    @Override
    public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
@@ -131,8 +141,24 @@
        if(status != 1){
            return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
        }
        mallOrderRefund.setStatus(2);
        mallOrderRefund.setStatus(5);
        mallOrderRefundMapper.updateById(mallOrderRefund);

        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(mallOrderRefund.getOrderId());
        mallOrderInfo.setStatus(6);
        mallOrderInfoMapper.updateById(mallOrderInfo);

        if(!"微信支付".equals(mallOrderInfo.getPayMethod()) && !"支付宝支付".equals(mallOrderInfo.getPayMethod())){
            //用户钱包增加对应的余额
            iApiMallMemberWalletService.addBalance(mallOrderInfo.getAmount(),mallOrderInfo.getMemberId());
            //新增一条资金流水
            MallMoneyFlow mallMoneyFlow = new MallMoneyFlow();
            mallMoneyFlow.setMemberId(mallOrderRefund.getMemberId());
            mallMoneyFlow.setOrderNo(mallOrderInfo.getOrderNo());
            mallMoneyFlow.setType(4);
            mallMoneyFlow.setAmount(mallOrderInfo.getAmount());
            mallMoneyFlowMapper.insert(mallMoneyFlow);
        }

        MallOrderRefundOperation mallOrderRefundOperation = new MallOrderRefundOperation();
        mallOrderRefundOperation.setRefundId(mallOrderRefund.getId());
@@ -177,7 +203,7 @@
        }
        Integer status = mallOrderRefund.getStatus();
        if(status != 4){
            return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
            return new FebsResponse().fail().message("申请记录不是已提交物流信息状态，请刷新页面");
        }
        mallOrderRefund.setStatus(5);
        mallOrderRefundMapper.updateById(mallOrderRefund);
@@ -265,7 +291,7 @@
            return new FebsResponse().fail().message("系统繁忙，请刷新重试");
        }
        Integer status = mallOrderRefund.getStatus();
        if(status != 4){
        if(status != 1){
            return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
        }
        mallOrderRefund.setStatus(2);
@@ -313,5 +339,48 @@
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse cancelOrder(Long id) {
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallOrderInfo)){
            return new FebsResponse().fail().message("系统繁忙，请刷新重试");
        }
        Integer status = mallOrderInfo.getStatus();
        if(status != 2){
            return new FebsResponse().fail().message("订单不是代发货状态");
        }
        mallOrderInfo.setStatus(7);
        mallOrderInfoMapper.updateById(mallOrderInfo);
        return new FebsResponse().success();
    }

    @Override
    public AdminMallMemberPaymentVo getMallMemberRefundPayInfoByFlowId(long id) {
        AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
        MallOrderRefund mallOrderRefund = mallOrderRefundMapper.selectById(id);
        AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallOrderRefund.getMemberId());
        if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
            adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
        }
        return adminMallMemberPaymentVo;
    }

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

        MallExpressInfo mallExpressInfo = new MallExpressInfo();
        mallExpressInfo.setMemberId(mallOrderInfo.getMemberId());
        mallExpressInfo.setOrderId(mallOrderInfo.getId());
        mallExpressInfo.setExpressNo(deliverGoodsDto.getExpressNo());
        mallExpressInfo.setExpressCom(deliverGoodsDto.getExpressCom());
        mallExpressInfo.setExpressCode(deliverGoodsDto.getExpressCode());
        mallExpressInfoMapper.insert(mallExpressInfo);

        mallOrderInfo.setStatus(3);
        mallOrderInfoMapper.updateById(mallOrderInfo);
    }
}