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

KKSU

2025-03-18 664184af3e070dee665ee736caffa0297804975f

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

@@ -3,11 +3,16 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
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.AdminMailGoodsDetailVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryVo;
import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
import cc.mrbird.febs.mall.vo.AdminOrderDetailVo;
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -22,8 +27,26 @@
public class ViewMallOrderController extends BaseController {

    private final IAdminMallOrderService adminMallOrderService;
    private final MallInvoiceMapper mallInvoiceMapper;

    private final MallOrderRefundMapper mallOrderRefundMapper;

    private final MallExpressInfoMapper mallExpressInfoMapper;

    public static long idFromMember;

    public static long idFromRefund;
    private final RedisUtils redisUtils;

    /**
     * 订单列表
     * @return
     */
    @GetMapping("orderRefundList")
    @RequiresPermissions("orderRefundList:view")
    public String orderRefundList() {
        return FebsUtil.view("modules/order/orderRefundList");
    }

    /**
     * 订单列表
@@ -36,6 +59,16 @@
    }

    /**
     * 评论列表
     * @return
     */
    @GetMapping("commentList")
    @RequiresPermissions("commentList:view")
    public String commentList() {
        return FebsUtil.view("modules/order/commentList");
    }

    /**
     * 订单-发货
     * @param id
     * @param model
@@ -45,6 +78,15 @@
    @RequiresPermissions("deliverGoods:update")
    public String deliverGoods(@PathVariable long id, Model model) {
        AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id);
        data.setExpressCom("百世快递");
        MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
        if(ObjectUtil.isNotEmpty(mallExpressInfo)){
            data.setExpressNo(mallExpressInfo.getExpressNo());
            data.setExpressCom(mallExpressInfo.getExpressCom());
        }else{
            data.setExpressCom("百世快递");
//            data.setExpressNo("JT");
        }
        model.addAttribute("deliverInfo", data);
        return FebsUtil.view("modules/order/deliverGoods");
    }
@@ -64,4 +106,185 @@
        return FebsUtil.view("modules/order/orderDetail");
    }

    /**
     * 订单退款
     * @return
     */
    @GetMapping("refundList")
    @RequiresPermissions("refundList:view")
    public String refundList() {
        return FebsUtil.view("modules/order/refundList");
    }

    /**
     * 退款详情
      * @param id
     * @param model
     * @return
     */
    @GetMapping("refunding/{id}")
    @RequiresPermissions("refunding:view")
    public String seeReceiveInfo(@PathVariable long id, Model model) {
        idFromRefund = id;
        return FebsUtil.view("modules/order/refunding");
    }

    /**
     * 退款地址列表
     * @return
     */
    @GetMapping("refundAddress")
    @RequiresPermissions("refundAddress:view")
    public String refundAddress() {
        return FebsUtil.view("modules/order/refundAddress");
    }


    /**
     * 退款地址-新增
     * @return
     */
    @GetMapping("addAddress")
    @RequiresPermissions("addAddress:add")
    public String addAddress() {
        return FebsUtil.view("modules/order/addAddress");
    }

    /**
     * 退款地址-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("updateAddress/{id}")
    @RequiresPermissions("updateAddress:update")
    public String updateAddress(@PathVariable long id, Model model) {
        AdminMallOrderRefundAddressVo data = adminMallOrderService.getMallOrderRefundAddressInfoById(id);
        model.addAttribute("addressInfo", data);
        return FebsUtil.view("modules/order/updateAddress");
    }

    /**
     * 订单退款-同意并选择地址
     * @param id
     * @param model
     * @return
     */
    @GetMapping("withAddress/{id}")
    @RequiresPermissions("withAddress:update")
    public String withAddress(@PathVariable long id, Model model) {
        AdminMallOrderRefundVo data = adminMallOrderService.getMallOrderRefundInfoById(id);
        model.addAttribute("withAddress", data);
        return FebsUtil.view("modules/order/withAddress");
    }

    /**
     * 商家支付方式-列表
     * @return
     */
    @GetMapping("payMethodList")
    @RequiresPermissions("payMethodList:view")
    public String payMethodList() {
        return FebsUtil.view("modules/order/payMethodList");
    }



    /**
     * 商家支付方式-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("payMethodEdit/{id}")
    @RequiresPermissions("payMethodEdit:update")
    public String payMethodEdit(@PathVariable long id, Model model) {
        AdminMallPayMethodEditVo data = adminMallOrderService.getMallPayMethodEditInfoById(id);
        model.addAttribute("payMethodEdit", data);
        return FebsUtil.view("modules/order/payMethodEdit");
    }

    /**
     * 退款记录-订单详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("refundOrderDetail/{id}")
    @RequiresPermissions("refundOrderDetail:view")
    public String refundOrderDetail(@PathVariable long id, Model model) {
        MallOrderRefund mallOrderRefund = mallOrderRefundMapper.selectById(id);
        Long orderId = mallOrderRefund.getOrderId();
        AdminOrderDetailVo data = adminMallOrderService.getMallOrderDetailById(orderId);
        model.addAttribute("refundOrderDetail", data);
        return FebsUtil.view("modules/order/refundOrderDetail");
    }

    /**
     * 退款记录-收款方式
     * @param id
     * @param model
     * @return
     */
    @GetMapping("refundPayInfo/{id}")
    @RequiresPermissions("refundPayInfo:update")
    public String refundPayInfo(@PathVariable long id, Model model) {
        AdminMallMemberPaymentVo data = adminMallOrderService.getMallMemberRefundPayInfoByFlowId(id);
        model.addAttribute("refundPayInfo", data);
        return FebsUtil.view("modules/order/refundPayInfo");
    }

    /**
     * 订单列表-统计商品份数
     * @return
     */
    public static String orderIdsStr;
    @GetMapping("/goodsStatistics/{statistics}")
    @RequiresPermissions("goodsStatistics:update")
    public String goodsStatistics(@PathVariable String statistics, Model model) {

        String existToken = redisUtils.getString("ADMIN_GOODS_CNT");
        if (StrUtil.isNotBlank(existToken)) {
            Object o = redisUtils.get(existToken);
            if (ObjectUtil.isNotEmpty(o)) {
                redisUtils.del(existToken);
            }
        }
        redisUtils.set("ADMIN_GOODS_CNT", statistics, -1);
        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");
    }

}