perf(mall): 移除会员利润计算中的异步执行

KKSU

2025-03-18 664184af3e070dee665ee736caffa0297804975f

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

@@ -2,19 +2,17 @@

import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
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.vo.*;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -29,6 +27,7 @@
public class ViewMallOrderController extends BaseController {

    private final IAdminMallOrderService adminMallOrderService;
    private final MallInvoiceMapper mallInvoiceMapper;

    private final MallOrderRefundMapper mallOrderRefundMapper;

@@ -79,13 +78,14 @@
    @RequiresPermissions("deliverGoods:update")
    public String deliverGoods(@PathVariable long id, Model model) {
        AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id);
        data.setExpressCom("极兔快递");
        data.setExpressCom("百世快递");
        MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
        if(ObjectUtil.isNotEmpty(mallExpressInfo)){
            data.setExpressNo(mallExpressInfo.getExpressNo());
            data.setExpressCom(mallExpressInfo.getExpressCom());
        }else{
            data.setExpressCom("极兔快递");
            data.setExpressCom("百世快递");
//            data.setExpressNo("JT");
        }
        model.addAttribute("deliverInfo", data);
        return FebsUtil.view("modules/order/deliverGoods");
@@ -254,4 +254,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");
    }

}