refactor(mall): 重构活动订单核销接口并添加取消订单功能

Administrator

6 days ago e12b33379eccfeead532f677a99c7f9e41e34a0d

 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java

@@ -8,8 +8,10 @@
import cc.mrbird.febs.mall.entity.MallExpressInfo;
import cc.mrbird.febs.mall.entity.MallOrderRefund;
import cc.mrbird.febs.mall.mapper.MallExpressInfoMapper;
import cc.mrbird.febs.mall.mapper.MallInvoiceMapper;
import cc.mrbird.febs.mall.mapper.MallOrderRefundMapper;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.service.MallInvoiceService;
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -29,6 +31,7 @@
public class ViewMallOrderController extends BaseController {

    private final IAdminMallOrderService adminMallOrderService;
    private final MallInvoiceMapper mallInvoiceMapper;

    private final MallOrderRefundMapper mallOrderRefundMapper;

@@ -86,6 +89,7 @@
            data.setExpressCom(mallExpressInfo.getExpressCom());
        }else{
            data.setExpressCom("极兔快递");
            data.setExpressNo("JT");
        }
        model.addAttribute("deliverInfo", data);
        return FebsUtil.view("modules/order/deliverGoods");
@@ -254,4 +258,37 @@
        return FebsUtil.view("modules/order/goodsStatistics");
    }


    /**
     * 发票列表
     * @return
     */
    @GetMapping("invoiceList")
    @RequiresPermissions("invoiceList:view")
    public String invoiceList() {
        return FebsUtil.view("modules/order/invoiceList");
    }

    /**
     * 发票列表-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("invoiceDetail/{id}")
    @RequiresPermissions("invoiceDetail:view")
    public String invoiceDetail(@PathVariable long id, Model model) {
        String existToken = redisUtils.getString("ADMIN_INVOICE_ID");
        if (StrUtil.isNotBlank(existToken)) {
            Object o = redisUtils.get(existToken);
            if (ObjectUtil.isNotEmpty(o)) {
                redisUtils.del(existToken);
            }
        }
        redisUtils.set("ADMIN_INVOICE_ID", id, -1);
        AdminInvoiceDetailVo data = mallInvoiceMapper.getAdminInvoiceDetailVoById(id);
        model.addAttribute("invoiceDetail", data);
        return FebsUtil.view("modules/order/invoiceDetail");
    }

}