fix(votesActivity): 修复活动状态显示逻辑

Administrator

2025-04-24 9f115c546c4ce91990fc79175c02f75907646cc8

 src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java

@@ -6,9 +6,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.dto.AdminHappyActivityCategoryDto;
import cc.mrbird.febs.mall.dto.activity.AdminActivityOptionAddDto;
import cc.mrbird.febs.mall.dto.activity.AdminCategoryAddDto;
import cc.mrbird.febs.mall.dto.activity.AdminCategoryUpdateDto;
import cc.mrbird.febs.mall.dto.activity.*;
import cc.mrbird.febs.mall.entity.HappyActivity;
import cc.mrbird.febs.mall.entity.HappyActivityOption;
import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
@@ -142,12 +140,21 @@
    }

    /**
     * 获取全部活动
     * 获取全部投票活动
     * @return
     */
    @GetMapping(value = "/allActivities")
    public FebsResponse allActivities() {
        return new FebsResponse().success().data(adminHappyActivityService.allActivities());
    }

    /**
     * 获取全部众筹活动
     * @return
     */
    @GetMapping(value = "/allOrderActivities")
    public FebsResponse allOrderActivities() {
        return new FebsResponse().success().data(adminHappyActivityService.allOrderActivities());
    }

    /**
@@ -205,4 +212,35 @@
        return new FebsResponse().success().data(data);
    }

    /**
     * 订单
     * @return
     */
    @GetMapping("activityOrderList")
    public FebsResponse activityOrderList(AdminHappyActivityOrderDto dto, QueryRequest request) {

        Map<String, Object> data = getDataTable(adminHappyActivityService.activityOrderList(dto, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 订单-手动核销
     */
    @PostMapping("checkOrder")
    @ControllerEndpoint(operation = "订单-手动核销", exceptionMessage = "操作失败")
    public FebsResponse checkOrder(@RequestBody AdminHappyActivityCheckOrderDto dto) {

        return adminHappyActivityService.checkOrder(dto);
    }

    /**
     * 订单-删除
     */
    @GetMapping("activityOrderDel/{id}")
    @ControllerEndpoint(operation = "订单-删除", exceptionMessage = "操作失败")
    public FebsResponse activityOrderDel(@NotNull(message = "{required}") @PathVariable Long id) {

        return adminHappyActivityService.activityOrderDel(id);
    }

}