清除app端不需要的admin接口

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/duser/DuserController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.duser;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.duser.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
-import cn.newfeifan.mall.module.distri.service.duser.DuserService;
-
-@Tag(name = "管理后台 - 推荐用户")
-@RestController
-@RequestMapping("/distri/duser")
-@Validated
-public class DuserController {
-
-    @Resource
-    private DuserService duserService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建推荐用户")
-    @PreAuthorize("@ss.hasPermission('distri:duser:create')")
-    public CommonResult<Long> createDuser(@Valid @RequestBody DuserSaveReqVO createReqVO) {
-        return success(duserService.createDuser(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新推荐用户")
-    @PreAuthorize("@ss.hasPermission('distri:duser:update')")
-    public CommonResult<Boolean> updateDuser(@Valid @RequestBody DuserSaveReqVO updateReqVO) {
-        duserService.updateDuser(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除推荐用户")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:duser:delete')")
-    public CommonResult<Boolean> deleteDuser(@RequestParam("id") Long id) {
-        duserService.deleteDuser(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得推荐用户")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:duser:query')")
-    public CommonResult<DuserRespVO> getDuser(@RequestParam("id") Long id) {
-        DuserDO duser = duserService.getDuser(id);
-        return success(BeanUtils.toBean(duser, DuserRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得推荐用户分页")
-    @PreAuthorize("@ss.hasPermission('distri:duser:query')")
-    public CommonResult<PageResult<DuserRespVO>> getDuserPage(@Valid DuserPageReqVO pageReqVO) {
-        PageResult<DuserDO> pageResult = duserService.getDuserPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DuserRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出推荐用户 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:duser:export')")
-    @OperateLog(type = EXPORT)
-    public void exportDuserExcel(@Valid DuserPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<DuserDO> list = duserService.getDuserPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "推荐用户.xls", "数据", DuserRespVO.class,
-                        BeanUtils.toBean(list, DuserRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/integral/IntegralController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.integral;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
-import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
-
-@Tag(name = "管理后台 - 推荐用户积分")
-@RestController
-@RequestMapping("/distri/integral")
-@Validated
-public class IntegralController {
-
-    @Resource
-    private IntegralService integralService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建推荐用户积分")
-    @PreAuthorize("@ss.hasPermission('distri:integral:create')")
-    public CommonResult<Long> createIntegral(@Valid @RequestBody IntegralSaveReqVO createReqVO) {
-        return success(integralService.createIntegral(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新推荐用户积分")
-    @PreAuthorize("@ss.hasPermission('distri:integral:update')")
-    public CommonResult<Boolean> updateIntegral(@Valid @RequestBody IntegralSaveReqVO updateReqVO) {
-        integralService.updateIntegral(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除推荐用户积分")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:integral:delete')")
-    public CommonResult<Boolean> deleteIntegral(@RequestParam("id") Long id) {
-        integralService.deleteIntegral(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得推荐用户积分")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:integral:query')")
-    public CommonResult<IntegralRespVO> getIntegral(@RequestParam("id") Long id) {
-        IntegralDO integral = integralService.getIntegral(id);
-        return success(BeanUtils.toBean(integral, IntegralRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得推荐用户积分分页")
-    @PreAuthorize("@ss.hasPermission('distri:integral:query')")
-    public CommonResult<PageResult<IntegralRespVO>> getIntegralPage(@Valid IntegralPageReqVO pageReqVO) {
-        PageResult<IntegralDO> pageResult = integralService.getIntegralPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, IntegralRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出推荐用户积分 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:integral:export')")
-    @OperateLog(type = EXPORT)
-    public void exportIntegralExcel(@Valid IntegralPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<IntegralDO> list = integralService.getIntegralPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "推荐用户积分.xls", "数据", IntegralRespVO.class,
-                        BeanUtils.toBean(list, IntegralRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ordercalc/OrderCalcController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.ordercalc;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.ordercalc.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
-import cn.newfeifan.mall.module.distri.service.ordercalc.OrderCalcService;
-
-@Tag(name = "管理后台 - 订单产生数据计算")
-@RestController
-@RequestMapping("/distri/order-calc")
-@Validated
-public class OrderCalcController {
-
-    @Resource
-    private OrderCalcService orderCalcService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建订单产生数据计算")
-    @PreAuthorize("@ss.hasPermission('distri:order-calc:create')")
-    public CommonResult<Long> createOrderCalc(@Valid @RequestBody OrderCalcSaveReqVO createReqVO) {
-        return success(orderCalcService.createOrderCalc(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新订单产生数据计算")
-    @PreAuthorize("@ss.hasPermission('distri:order-calc:update')")
-    public CommonResult<Boolean> updateOrderCalc(@Valid @RequestBody OrderCalcSaveReqVO updateReqVO) {
-        orderCalcService.updateOrderCalc(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除订单产生数据计算")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:order-calc:delete')")
-    public CommonResult<Boolean> deleteOrderCalc(@RequestParam("id") Long id) {
-        orderCalcService.deleteOrderCalc(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得订单产生数据计算")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:order-calc:query')")
-    public CommonResult<OrderCalcRespVO> getOrderCalc(@RequestParam("id") Long id) {
-        OrderCalcDO orderCalc = orderCalcService.getOrderCalc(id);
-        return success(BeanUtils.toBean(orderCalc, OrderCalcRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得订单产生数据计算分页")
-    @PreAuthorize("@ss.hasPermission('distri:order-calc:query')")
-    public CommonResult<PageResult<OrderCalcRespVO>> getOrderCalcPage(@Valid OrderCalcPageReqVO pageReqVO) {
-        PageResult<OrderCalcDO> pageResult = orderCalcService.getOrderCalcPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, OrderCalcRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出订单产生数据计算 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:order-calc:export')")
-    @OperateLog(type = EXPORT)
-    public void exportOrderCalcExcel(@Valid OrderCalcPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<OrderCalcDO> list = orderCalcService.getOrderCalcPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "订单产生数据计算.xls", "数据", OrderCalcRespVO.class,
-                        BeanUtils.toBean(list, OrderCalcRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/OrderPercentageController.java

@@ -1,93 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.orderpercentage;
-
-import cn.newfeifan.mall.module.distri.controller.admin.orderpercentage.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.dal.dataobject.orderpercentage.OrderPercentageDO;
-import cn.newfeifan.mall.module.distri.service.orderpercentage.OrderPercentageService;
-
-@Tag(name = "管理后台 - 积分相关计算浮动百分比设置")
-@RestController
-@RequestMapping("/distri/order-percentage")
-@Validated
-public class OrderPercentageController {
-
-    @Resource
-    private OrderPercentageService orderPercentageService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建积分相关计算浮动百分比设置")
-    @PreAuthorize("@ss.hasPermission('distri:order-percentage:create')")
-    public CommonResult<Long> createOrderPercentage(@Valid @RequestBody OrderPercentageDoubleSaveReqVO createReqVO) {
-        return success(orderPercentageService.createOrderPercentage(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新积分相关计算浮动百分比设置")
-    @PreAuthorize("@ss.hasPermission('distri:order-percentage:update')")
-    public CommonResult<Boolean> updateOrderPercentage(@Valid @RequestBody OrderPercentageDoubleSaveReqVO updateReqVO) {
-        orderPercentageService.updateOrderPercentage(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除积分相关计算浮动百分比设置")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:order-percentage:delete')")
-    public CommonResult<Boolean> deleteOrderPercentage(@RequestParam("id") Long id) {
-        orderPercentageService.deleteOrderPercentage(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得积分相关计算浮动百分比设置")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:order-percentage:query')")
-    public CommonResult<OrderPercentageRespVO> getOrderPercentage(@RequestParam("id") Long id) {
-        OrderPercentageDO orderPercentage = orderPercentageService.getOrderPercentage(id);
-        return success(BeanUtils.toBean(orderPercentage, OrderPercentageRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得积分相关计算浮动百分比设置分页")
-    public CommonResult<PageResult<OrderPercentageRespVO>> getOrderPercentagePage(@Valid OrderPercentagePageReqVO pageReqVO) {
-        PageResult<OrderPercentageDO> pageResult = orderPercentageService.getOrderPercentagePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, OrderPercentageRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出积分相关计算浮动百分比设置 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:order-percentage:export')")
-    @OperateLog(type = EXPORT)
-    public void exportOrderPercentageExcel(@Valid OrderPercentagePageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<OrderPercentageDO> list = orderPercentageService.getOrderPercentagePage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "积分相关计算浮动百分比设置.xls", "数据", OrderPercentageRespVO.class,
-                        BeanUtils.toBean(list, OrderPercentageRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionbrothers/PartitionBrothersController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.partitionbrothers;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.partitionbrothers.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.partitionbrothers.PartitionBrothersDO;
-import cn.newfeifan.mall.module.distri.service.partitionbrothers.PartitionBrothersService;
-
-@Tag(name = "管理后台 - 兄弟分区")
-@RestController
-@RequestMapping("/distri/partition-brothers")
-@Validated
-public class PartitionBrothersController {
-
-    @Resource
-    private PartitionBrothersService partitionBrothersService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建兄弟分区")
-    @PreAuthorize("@ss.hasPermission('distri:partition-brothers:create')")
-    public CommonResult<Long> createPartitionBrothers(@Valid @RequestBody PartitionBrothersSaveReqVO createReqVO) {
-        return success(partitionBrothersService.createPartitionBrothers(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新兄弟分区")
-    @PreAuthorize("@ss.hasPermission('distri:partition-brothers:update')")
-    public CommonResult<Boolean> updatePartitionBrothers(@Valid @RequestBody PartitionBrothersSaveReqVO updateReqVO) {
-        partitionBrothersService.updatePartitionBrothers(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除兄弟分区")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:partition-brothers:delete')")
-    public CommonResult<Boolean> deletePartitionBrothers(@RequestParam("id") Long id) {
-        partitionBrothersService.deletePartitionBrothers(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得兄弟分区")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:partition-brothers:query')")
-    public CommonResult<PartitionBrothersRespVO> getPartitionBrothers(@RequestParam("id") Long id) {
-        PartitionBrothersDO partitionBrothers = partitionBrothersService.getPartitionBrothers(id);
-        return success(BeanUtils.toBean(partitionBrothers, PartitionBrothersRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得兄弟分区分页")
-    @PreAuthorize("@ss.hasPermission('distri:partition-brothers:query')")
-    public CommonResult<PageResult<PartitionBrothersRespVO>> getPartitionBrothersPage(@Valid PartitionBrothersPageReqVO pageReqVO) {
-        PageResult<PartitionBrothersDO> pageResult = partitionBrothersService.getPartitionBrothersPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PartitionBrothersRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出兄弟分区 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:partition-brothers:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPartitionBrothersExcel(@Valid PartitionBrothersPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PartitionBrothersDO> list = partitionBrothersService.getPartitionBrothersPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "兄弟分区.xls", "数据", PartitionBrothersRespVO.class,
-                        BeanUtils.toBean(list, PartitionBrothersRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitioncrash/PartitionCrashController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.partitioncrash;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.partitioncrash.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.partitioncrash.PartitionCrashDO;
-import cn.newfeifan.mall.module.distri.service.partitioncrash.PartitionCrashService;
-
-@Tag(name = "管理后台 - 分区碰撞")
-@RestController
-@RequestMapping("/distri/partition-crash")
-@Validated
-public class PartitionCrashController {
-
-    @Resource
-    private PartitionCrashService partitionCrashService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建分区碰撞")
-    @PreAuthorize("@ss.hasPermission('distri:partition-crash:create')")
-    public CommonResult<Long> createPartitionCrash(@Valid @RequestBody PartitionCrashSaveReqVO createReqVO) {
-        return success(partitionCrashService.createPartitionCrash(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新分区碰撞")
-    @PreAuthorize("@ss.hasPermission('distri:partition-crash:update')")
-    public CommonResult<Boolean> updatePartitionCrash(@Valid @RequestBody PartitionCrashSaveReqVO updateReqVO) {
-        partitionCrashService.updatePartitionCrash(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除分区碰撞")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:partition-crash:delete')")
-    public CommonResult<Boolean> deletePartitionCrash(@RequestParam("id") Long id) {
-        partitionCrashService.deletePartitionCrash(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得分区碰撞")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:partition-crash:query')")
-    public CommonResult<PartitionCrashRespVO> getPartitionCrash(@RequestParam("id") Long id) {
-        PartitionCrashDO partitionCrash = partitionCrashService.getPartitionCrash(id);
-        return success(BeanUtils.toBean(partitionCrash, PartitionCrashRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得分区碰撞分页")
-    @PreAuthorize("@ss.hasPermission('distri:partition-crash:query')")
-    public CommonResult<PageResult<PartitionCrashRespVO>> getPartitionCrashPage(@Valid PartitionCrashPageReqVO pageReqVO) {
-        PageResult<PartitionCrashDO> pageResult = partitionCrashService.getPartitionCrashPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PartitionCrashRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出分区碰撞 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:partition-crash:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPartitionCrashExcel(@Valid PartitionCrashPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PartitionCrashDO> list = partitionCrashService.getPartitionCrashPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "分区碰撞.xls", "数据", PartitionCrashRespVO.class,
-                        BeanUtils.toBean(list, PartitionCrashRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionson/PartitionSonController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.partitionson;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.partitionson.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.partitionson.PartitionSonDO;
-import cn.newfeifan.mall.module.distri.service.partitionson.PartitionSonService;
-
-@Tag(name = "管理后台 - 后代分区")
-@RestController
-@RequestMapping("/distri/partition-son")
-@Validated
-public class PartitionSonController {
-
-    @Resource
-    private PartitionSonService partitionSonService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建后代分区")
-    @PreAuthorize("@ss.hasPermission('distri:partition-son:create')")
-    public CommonResult<Long> createPartitionSon(@Valid @RequestBody PartitionSonSaveReqVO createReqVO) {
-        return success(partitionSonService.createPartitionSon(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新后代分区")
-    @PreAuthorize("@ss.hasPermission('distri:partition-son:update')")
-    public CommonResult<Boolean> updatePartitionSon(@Valid @RequestBody PartitionSonSaveReqVO updateReqVO) {
-        partitionSonService.updatePartitionSon(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除后代分区")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:partition-son:delete')")
-    public CommonResult<Boolean> deletePartitionSon(@RequestParam("id") Long id) {
-        partitionSonService.deletePartitionSon(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得后代分区")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:partition-son:query')")
-    public CommonResult<PartitionSonRespVO> getPartitionSon(@RequestParam("id") Long id) {
-        PartitionSonDO partitionSon = partitionSonService.getPartitionSon(id);
-        return success(BeanUtils.toBean(partitionSon, PartitionSonRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得后代分区分页")
-    @PreAuthorize("@ss.hasPermission('distri:partition-son:query')")
-    public CommonResult<PageResult<PartitionSonRespVO>> getPartitionSonPage(@Valid PartitionSonPageReqVO pageReqVO) {
-        PageResult<PartitionSonDO> pageResult = partitionSonService.getPartitionSonPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PartitionSonRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出后代分区 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:partition-son:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPartitionSonExcel(@Valid PartitionSonPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PartitionSonDO> list = partitionSonService.getPartitionSonPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "后代分区.xls", "数据", PartitionSonRespVO.class,
-                        BeanUtils.toBean(list, PartitionSonRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ptprofit/PtProfitController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.ptprofit;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.ptprofit.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofit.PtProfitDO;
-import cn.newfeifan.mall.module.distri.service.ptprofit.PtProfitService;
-
-@Tag(name = "管理后台 - 平台利润")
-@RestController
-@RequestMapping("/distri/pt-profit")
-@Validated
-public class PtProfitController {
-
-    @Resource
-    private PtProfitService ptProfitService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建平台利润")
-    @PreAuthorize("@ss.hasPermission('distri:pt-profit:create')")
-    public CommonResult<Long> createPtProfit(@Valid @RequestBody PtProfitSaveReqVO createReqVO) {
-        return success(ptProfitService.createPtProfit(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新平台利润")
-    @PreAuthorize("@ss.hasPermission('distri:pt-profit:update')")
-    public CommonResult<Boolean> updatePtProfit(@Valid @RequestBody PtProfitSaveReqVO updateReqVO) {
-        ptProfitService.updatePtProfit(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除平台利润")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:pt-profit:delete')")
-    public CommonResult<Boolean> deletePtProfit(@RequestParam("id") Long id) {
-        ptProfitService.deletePtProfit(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得平台利润")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:pt-profit:query')")
-    public CommonResult<PtProfitRespVO> getPtProfit(@RequestParam("id") Long id) {
-        PtProfitDO ptProfit = ptProfitService.getPtProfit(id);
-        return success(BeanUtils.toBean(ptProfit, PtProfitRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得平台利润分页")
-    @PreAuthorize("@ss.hasPermission('distri:pt-profit:query')")
-    public CommonResult<PageResult<PtProfitRespVO>> getPtProfitPage(@Valid PtProfitPageReqVO pageReqVO) {
-        PageResult<PtProfitDO> pageResult = ptProfitService.getPtProfitPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PtProfitRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出平台利润 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:pt-profit:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPtProfitExcel(@Valid PtProfitPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PtProfitDO> list = ptProfitService.getPtProfitPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "平台利润.xls", "数据", PtProfitRespVO.class,
-                        BeanUtils.toBean(list, PtProfitRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/socialstatus/SocialStatusController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.socialstatus;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.socialstatus.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatus.SocialStatusDO;
-import cn.newfeifan.mall.module.distri.service.socialstatus.SocialStatusService;
-
-@Tag(name = "管理后台 - 分销用户身价")
-@RestController
-@RequestMapping("/distri/social-status")
-@Validated
-public class SocialStatusController {
-
-    @Resource
-    private SocialStatusService socialStatusService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建分销用户身价")
-    @PreAuthorize("@ss.hasPermission('distri:social-status:create')")
-    public CommonResult<Long> createSocialStatus(@Valid @RequestBody SocialStatusSaveReqVO createReqVO) {
-        return success(socialStatusService.createSocialStatus(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新分销用户身价")
-    @PreAuthorize("@ss.hasPermission('distri:social-status:update')")
-    public CommonResult<Boolean> updateSocialStatus(@Valid @RequestBody SocialStatusSaveReqVO updateReqVO) {
-        socialStatusService.updateSocialStatus(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除分销用户身价")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:social-status:delete')")
-    public CommonResult<Boolean> deleteSocialStatus(@RequestParam("id") Long id) {
-        socialStatusService.deleteSocialStatus(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得分销用户身价")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:social-status:query')")
-    public CommonResult<SocialStatusRespVO> getSocialStatus(@RequestParam("id") Long id) {
-        SocialStatusDO socialStatus = socialStatusService.getSocialStatus(id);
-        return success(BeanUtils.toBean(socialStatus, SocialStatusRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得分销用户身价分页")
-    @PreAuthorize("@ss.hasPermission('distri:social-status:query')")
-    public CommonResult<PageResult<SocialStatusRespVO>> getSocialStatusPage(@Valid SocialStatusPageReqVO pageReqVO) {
-        PageResult<SocialStatusDO> pageResult = socialStatusService.getSocialStatusPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, SocialStatusRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出分销用户身价 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:social-status:export')")
-    @OperateLog(type = EXPORT)
-    public void exportSocialStatusExcel(@Valid SocialStatusPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<SocialStatusDO> list = socialStatusService.getSocialStatusPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "分销用户身价.xls", "数据", SocialStatusRespVO.class,
-                        BeanUtils.toBean(list, SocialStatusRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/socialstatuschangecategory/SocialStatusChangeCategoryController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangecategory;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangecategory.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangecategory.SocialStatusChangeCategoryDO;
-import cn.newfeifan.mall.module.distri.service.socialstatuschangecategory.SocialStatusChangeCategoryService;
-
-@Tag(name = "管理后台 - 会员身价变化类别")
-@RestController
-@RequestMapping("/distri/social-status-change-category")
-@Validated
-public class SocialStatusChangeCategoryController {
-
-    @Resource
-    private SocialStatusChangeCategoryService socialStatusChangeCategoryService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建会员身价变化类别")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-category:create')")
-    public CommonResult<Long> createSocialStatusChangeCategory(@Valid @RequestBody SocialStatusChangeCategorySaveReqVO createReqVO) {
-        return success(socialStatusChangeCategoryService.createSocialStatusChangeCategory(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新会员身价变化类别")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-category:update')")
-    public CommonResult<Boolean> updateSocialStatusChangeCategory(@Valid @RequestBody SocialStatusChangeCategorySaveReqVO updateReqVO) {
-        socialStatusChangeCategoryService.updateSocialStatusChangeCategory(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除会员身价变化类别")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-category:delete')")
-    public CommonResult<Boolean> deleteSocialStatusChangeCategory(@RequestParam("id") Long id) {
-        socialStatusChangeCategoryService.deleteSocialStatusChangeCategory(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员身价变化类别")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-category:query')")
-    public CommonResult<SocialStatusChangeCategoryRespVO> getSocialStatusChangeCategory(@RequestParam("id") Long id) {
-        SocialStatusChangeCategoryDO socialStatusChangeCategory = socialStatusChangeCategoryService.getSocialStatusChangeCategory(id);
-        return success(BeanUtils.toBean(socialStatusChangeCategory, SocialStatusChangeCategoryRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员身价变化类别分页")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-category:query')")
-    public CommonResult<PageResult<SocialStatusChangeCategoryRespVO>> getSocialStatusChangeCategoryPage(@Valid SocialStatusChangeCategoryPageReqVO pageReqVO) {
-        PageResult<SocialStatusChangeCategoryDO> pageResult = socialStatusChangeCategoryService.getSocialStatusChangeCategoryPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, SocialStatusChangeCategoryRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出会员身价变化类别 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-category:export')")
-    @OperateLog(type = EXPORT)
-    public void exportSocialStatusChangeCategoryExcel(@Valid SocialStatusChangeCategoryPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<SocialStatusChangeCategoryDO> list = socialStatusChangeCategoryService.getSocialStatusChangeCategoryPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "会员身价变化类别.xls", "数据", SocialStatusChangeCategoryRespVO.class,
-                        BeanUtils.toBean(list, SocialStatusChangeCategoryRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/socialstatuschangelog/SocialStatusChangeLogController.java

@@ -1,94 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangelog.SocialStatusChangeLogDO;
-import cn.newfeifan.mall.module.distri.service.socialstatuschangelog.SocialStatusChangeLogService;
-
-@Tag(name = "管理后台 - 会员身价变化日志")
-@RestController
-@RequestMapping("/distri/social-status-change-log")
-@Validated
-public class SocialStatusChangeLogController {
-
-    @Resource
-    private SocialStatusChangeLogService socialStatusChangeLogService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建会员身价变化日志")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:create')")
-    public CommonResult<Long> createSocialStatusChangeLog(@Valid @RequestBody SocialStatusChangeLogSaveReqVO createReqVO) {
-        return success(socialStatusChangeLogService.createSocialStatusChangeLog(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新会员身价变化日志")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:update')")
-    public CommonResult<Boolean> updateSocialStatusChangeLog(@Valid @RequestBody SocialStatusChangeLogSaveReqVO updateReqVO) {
-        socialStatusChangeLogService.updateSocialStatusChangeLog(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除会员身价变化日志")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:delete')")
-    public CommonResult<Boolean> deleteSocialStatusChangeLog(@RequestParam("id") Long id) {
-        socialStatusChangeLogService.deleteSocialStatusChangeLog(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员身价变化日志")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:query')")
-    public CommonResult<SocialStatusChangeLogRespVO> getSocialStatusChangeLog(@RequestParam("id") Long id) {
-        SocialStatusChangeLogDO socialStatusChangeLog = socialStatusChangeLogService.getSocialStatusChangeLog(id);
-        return success(BeanUtils.toBean(socialStatusChangeLog, SocialStatusChangeLogRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员身价变化日志分页")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:query')")
-    public CommonResult<PageResult<SocialStatusChangeLogRespVO>> getSocialStatusChangeLogPage(@Valid SocialStatusChangeLogPageReqVO pageReqVO) {
-        PageResult<SocialStatusChangeLogDO> pageResult = socialStatusChangeLogService.getSocialStatusChangeLogPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, SocialStatusChangeLogRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出会员身价变化日志 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:export')")
-    @OperateLog(type = EXPORT)
-    public void exportSocialStatusChangeLogExcel(@Valid SocialStatusChangeLogPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<SocialStatusChangeLogDO> list = socialStatusChangeLogService.getSocialStatusChangeLogPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "会员身价变化日志.xls", "数据", SocialStatusChangeLogRespVO.class,
-                        BeanUtils.toBean(list, SocialStatusChangeLogRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/source/SourceController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.distri.controller.admin.source;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.distri.controller.admin.source.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.source.SourceDO;
-import cn.newfeifan.mall.module.distri.service.source.SourceService;
-
-@Tag(name = "管理后台 - 分销来源")
-@RestController
-@RequestMapping("/distri/source")
-@Validated
-public class SourceController {
-
-    @Resource
-    private SourceService sourceService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建分销来源")
-    @PreAuthorize("@ss.hasPermission('distri:source:create')")
-    public CommonResult<Long> createSource(@Valid @RequestBody SourceSaveReqVO createReqVO) {
-        return success(sourceService.createSource(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新分销来源")
-    @PreAuthorize("@ss.hasPermission('distri:source:update')")
-    public CommonResult<Boolean> updateSource(@Valid @RequestBody SourceSaveReqVO updateReqVO) {
-        sourceService.updateSource(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除分销来源")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:source:delete')")
-    public CommonResult<Boolean> deleteSource(@RequestParam("id") Long id) {
-        sourceService.deleteSource(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得分销来源")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('distri:source:query')")
-    public CommonResult<SourceRespVO> getSource(@RequestParam("id") Long id) {
-        SourceDO source = sourceService.getSource(id);
-        return success(BeanUtils.toBean(source, SourceRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得分销来源分页")
-    @PreAuthorize("@ss.hasPermission('distri:source:query')")
-    public CommonResult<PageResult<SourceRespVO>> getSourcePage(@Valid SourcePageReqVO pageReqVO) {
-        PageResult<SourceDO> pageResult = sourceService.getSourcePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, SourceRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出分销来源 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:source:export')")
-    @OperateLog(type = EXPORT)
-    public void exportSourceExcel(@Valid SourcePageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<SourceDO> list = sourceService.getSourcePage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "分销来源.xls", "数据", SourceRespVO.class,
-                        BeanUtils.toBean(list, SourceRespVO.class));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/usercollectbefore/UserCollectBeforeController.java

@@ -83,6 +83,7 @@ public class UserCollectBeforeController {
     @GetMapping("/export-excel")
     @Operation(summary = "导出用户曾经收藏过什么商品的 Excel")
     @OperateLog(type = EXPORT)
+    @PreAuthenticated
     public void exportUserCollectBeforeExcel(@Valid UserCollectBeforePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/codegen/CodegenController.java

@@ -1,151 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.codegen;
-
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ZipUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.common.util.servlet.ServletUtils;
-import cn.newfeifan.mall.module.infra.controller.admin.codegen.vo.CodegenCreateListReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO;
-import cn.newfeifan.mall.module.infra.convert.codegen.CodegenConvert;
-import cn.newfeifan.mall.module.infra.dal.dataobject.codegen.CodegenColumnDO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.codegen.CodegenTableDO;
-import cn.newfeifan.mall.module.infra.service.codegen.CodegenService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - 代码生成器")
-@RestController
-@RequestMapping("/infra/codegen")
-@Validated
-public class CodegenController {
-
-    @Resource
-    private CodegenService codegenService;
-
-    @GetMapping("/db/table/list")
-    @Operation(summary = "获得数据库自带的表定义列表", description = "会过滤掉已经导入 Codegen 的表")
-    @Parameters({
-            @Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1"),
-            @Parameter(name = "name", description = "表名，模糊匹配", example = "feifan"),
-            @Parameter(name = "comment", description = "描述，模糊匹配", example = "非繁")
-    })
-    @PreAuthorize("@ss.hasPermission('infra:codegen:query')")
-    public CommonResult<List<DatabaseTableRespVO>> getDatabaseTableList(
-            @RequestParam(value = "dataSourceConfigId") Long dataSourceConfigId,
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "comment", required = false) String comment) {
-        return success(codegenService.getDatabaseTableList(dataSourceConfigId, name, comment));
-    }
-
-    @GetMapping("/table/list")
-    @Operation(summary = "获得表定义列表")
-    @Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('infra:codegen:query')")
-    public CommonResult<List<CodegenTableRespVO>> getCodegenTableList(@RequestParam(value = "dataSourceConfigId") Long dataSourceConfigId) {
-        List<CodegenTableDO> list = codegenService.getCodegenTableList(dataSourceConfigId);
-        return success(BeanUtils.toBean(list, CodegenTableRespVO.class));
-    }
-
-    @GetMapping("/table/page")
-    @Operation(summary = "获得表定义分页")
-    @PreAuthorize("@ss.hasPermission('infra:codegen:query')")
-    public CommonResult<PageResult<CodegenTableRespVO>> getCodegenTablePage(@Valid CodegenTablePageReqVO pageReqVO) {
-        PageResult<CodegenTableDO> pageResult = codegenService.getCodegenTablePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, CodegenTableRespVO.class));
-    }
-
-    @GetMapping("/detail")
-    @Operation(summary = "获得表和字段的明细")
-    @Parameter(name = "tableId", description = "表编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:codegen:query')")
-    public CommonResult<CodegenDetailRespVO> getCodegenDetail(@RequestParam("tableId") Long tableId) {
-        CodegenTableDO table = codegenService.getCodegenTable(tableId);
-        List<CodegenColumnDO> columns = codegenService.getCodegenColumnListByTableId(tableId);
-        // 拼装返回
-        return success(CodegenConvert.INSTANCE.convert(table, columns));
-    }
-
-    @Operation(summary = "基于数据库的表结构，创建代码生成器的表和字段定义")
-    @PostMapping("/create-list")
-    @PreAuthorize("@ss.hasPermission('infra:codegen:create')")
-    public CommonResult<List<Long>> createCodegenList(@Valid @RequestBody CodegenCreateListReqVO reqVO) {
-        return success(codegenService.createCodegenList(getLoginUserId(), reqVO));
-    }
-
-    @Operation(summary = "更新数据库的表和字段定义")
-    @PutMapping("/update")
-    @PreAuthorize("@ss.hasPermission('infra:codegen:update')")
-    public CommonResult<Boolean> updateCodegen(@Valid @RequestBody CodegenUpdateReqVO updateReqVO) {
-        codegenService.updateCodegen(updateReqVO);
-        return success(true);
-    }
-
-    @Operation(summary = "基于数据库的表结构，同步数据库的表和字段定义")
-    @PutMapping("/sync-from-db")
-    @Parameter(name = "tableId", description = "表编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:codegen:update')")
-    public CommonResult<Boolean> syncCodegenFromDB(@RequestParam("tableId") Long tableId) {
-        codegenService.syncCodegenFromDB(tableId);
-        return success(true);
-    }
-
-    @Operation(summary = "删除数据库的表和字段定义")
-    @DeleteMapping("/delete")
-    @Parameter(name = "tableId", description = "表编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:codegen:delete')")
-    public CommonResult<Boolean> deleteCodegen(@RequestParam("tableId") Long tableId) {
-        codegenService.deleteCodegen(tableId);
-        return success(true);
-    }
-
-    @Operation(summary = "预览生成代码")
-    @GetMapping("/preview")
-    @Parameter(name = "tableId", description = "表编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:codegen:preview')")
-    public CommonResult<List<CodegenPreviewRespVO>> previewCodegen(@RequestParam("tableId") Long tableId) {
-        Map<String, String> codes = codegenService.generationCodes(tableId);
-        return success(CodegenConvert.INSTANCE.convert(codes));
-    }
-
-    @Operation(summary = "下载生成代码")
-    @GetMapping("/download")
-    @Parameter(name = "tableId", description = "表编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:codegen:download')")
-    public void downloadCodegen(@RequestParam("tableId") Long tableId,
-                                HttpServletResponse response) throws IOException {
-        // 生成代码
-        Map<String, String> codes = codegenService.generationCodes(tableId);
-        // 构建 zip 包
-        String[] paths = codes.keySet().toArray(new String[0]);
-        ByteArrayInputStream[] ins = codes.values().stream().map(IoUtil::toUtf8Stream).toArray(ByteArrayInputStream[]::new);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipUtil.zip(outputStream, paths, ins);
-        // 输出
-        ServletUtils.writeAttachment(response, "codegen.zip", outputStream.toByteArray());
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/config/ConfigController.java

@@ -1,106 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.config;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.infra.controller.admin.config.vo.*;
-import cn.newfeifan.mall.module.infra.convert.config.ConfigConvert;
-import cn.newfeifan.mall.module.infra.dal.dataobject.config.ConfigDO;
-import cn.newfeifan.mall.module.infra.enums.ErrorCodeConstants;
-import cn.newfeifan.mall.module.infra.service.config.ConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - 参数配置")
-@RestController
-@RequestMapping("/infra/config")
-@Validated
-public class ConfigController {
-
-    @Resource
-    private ConfigService configService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建参数配置")
-    @PreAuthorize("@ss.hasPermission('infra:config:create')")
-    public CommonResult<Long> createConfig(@Valid @RequestBody ConfigSaveReqVO createReqVO) {
-        return success(configService.createConfig(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "修改参数配置")
-    @PreAuthorize("@ss.hasPermission('infra:config:update')")
-    public CommonResult<Boolean> updateConfig(@Valid @RequestBody ConfigSaveReqVO updateReqVO) {
-        configService.updateConfig(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除参数配置")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:config:delete')")
-    public CommonResult<Boolean> deleteConfig(@RequestParam("id") Long id) {
-        configService.deleteConfig(id);
-        return success(true);
-    }
-
-    @GetMapping(value = "/get")
-    @Operation(summary = "获得参数配置")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:config:query')")
-    public CommonResult<ConfigRespVO> getConfig(@RequestParam("id") Long id) {
-        return success(ConfigConvert.INSTANCE.convert(configService.getConfig(id)));
-    }
-
-    @GetMapping(value = "/get-value-by-key")
-    @Operation(summary = "根据参数键名查询参数值", description = "不可见的配置，不允许返回给前端")
-    @Parameter(name = "key", description = "参数键", required = true, example = "yunai.biz.username")
-    public CommonResult<String> getConfigKey(@RequestParam("key") String key) {
-        ConfigDO config = configService.getConfigByKey(key);
-        if (config == null) {
-            return success(null);
-        }
-        if (!config.getVisible()) {
-            throw exception(ErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_VISIBLE);
-        }
-        return success(config.getValue());
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获取参数配置分页")
-    @PreAuthorize("@ss.hasPermission('infra:config:query')")
-    public CommonResult<PageResult<ConfigRespVO>> getConfigPage(@Valid ConfigPageReqVO pageReqVO) {
-        PageResult<ConfigDO> page = configService.getConfigPage(pageReqVO);
-        return success(ConfigConvert.INSTANCE.convertPage(page));
-    }
-
-    @GetMapping("/export")
-    @Operation(summary = "导出参数配置")
-    @PreAuthorize("@ss.hasPermission('infra:config:export')")
-    @OperateLog(type = EXPORT)
-    public void exportConfig(@Valid ConfigPageReqVO exportReqVO,
-                             HttpServletResponse response) throws IOException {
-        exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<ConfigDO> list = configService.getConfigPage(exportReqVO).getList();
-        // 输出
-        ExcelUtils.write(response, "参数配置.xls", "数据", ConfigRespVO.class,
-                ConfigConvert.INSTANCE.convertList(list));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/db/DataSourceConfigController.java

@@ -1,72 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.db;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.infra.controller.admin.db.vo.DataSourceConfigRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.db.vo.DataSourceConfigSaveReqVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.db.DataSourceConfigDO;
-import cn.newfeifan.mall.module.infra.service.db.DataSourceConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 数据源配置")
-@RestController
-@RequestMapping("/infra/data-source-config")
-@Validated
-public class DataSourceConfigController {
-
-    @Resource
-    private DataSourceConfigService dataSourceConfigService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建数据源配置")
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:create')")
-    public CommonResult<Long> createDataSourceConfig(@Valid @RequestBody DataSourceConfigSaveReqVO createReqVO) {
-        return success(dataSourceConfigService.createDataSourceConfig(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新数据源配置")
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:update')")
-    public CommonResult<Boolean> updateDataSourceConfig(@Valid @RequestBody DataSourceConfigSaveReqVO updateReqVO) {
-        dataSourceConfigService.updateDataSourceConfig(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除数据源配置")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:delete')")
-    public CommonResult<Boolean> deleteDataSourceConfig(@RequestParam("id") Long id) {
-        dataSourceConfigService.deleteDataSourceConfig(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得数据源配置")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:query')")
-    public CommonResult<DataSourceConfigRespVO> getDataSourceConfig(@RequestParam("id") Long id) {
-        DataSourceConfigDO config = dataSourceConfigService.getDataSourceConfig(id);
-        return success(BeanUtils.toBean(config, DataSourceConfigRespVO.class));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得数据源配置列表")
-    @PreAuthorize("@ss.hasPermission('infra:data-source-config:query')")
-    public CommonResult<List<DataSourceConfigRespVO>> getDataSourceConfigList() {
-        List<DataSourceConfigDO> list = dataSourceConfigService.getDataSourceConfigList();
-        return success(BeanUtils.toBean(list, DataSourceConfigRespVO.class));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/db/DatabaseDocController.java

@@ -1,154 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.db;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.newfeifan.mall.framework.common.util.servlet.ServletUtils;
-import cn.smallbun.screw.core.Configuration;
-import cn.smallbun.screw.core.engine.EngineConfig;
-import cn.smallbun.screw.core.engine.EngineFileType;
-import cn.smallbun.screw.core.engine.EngineTemplateType;
-import cn.smallbun.screw.core.execute.DocumentationExecute;
-import cn.smallbun.screw.core.process.ProcessConfig;
-import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
-import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
-@Tag(name = "管理后台 - 数据库文档")
-@RestController
-@RequestMapping("/infra/db-doc")
-public class DatabaseDocController {
-
-    @Resource
-    private DynamicDataSourceProperties dynamicDataSourceProperties;
-
-    private static final String FILE_OUTPUT_DIR = System.getProperty("java.io.tmpdir") + File.separator
-            + "db-doc";
-    private static final String DOC_FILE_NAME = "数据库文档";
-    private static final String DOC_VERSION = "1.0.0";
-    private static final String DOC_DESCRIPTION = "文档描述";
-
-    @GetMapping("/export-html")
-    @Operation(summary = "导出 html 格式的数据文档")
-    @Parameter(name = "deleteFile", description = "是否删除在服务器本地生成的数据库文档", example = "true")
-    public void exportHtml(@RequestParam(defaultValue = "true") Boolean deleteFile,
-                           HttpServletResponse response) throws IOException {
-        doExportFile(EngineFileType.HTML, deleteFile, response);
-    }
-
-    @GetMapping("/export-word")
-    @Operation(summary = "导出 word 格式的数据文档")
-    @Parameter(name = "deleteFile", description = "是否删除在服务器本地生成的数据库文档", example = "true")
-    public void exportWord(@RequestParam(defaultValue = "true") Boolean deleteFile,
-                           HttpServletResponse response) throws IOException {
-        doExportFile(EngineFileType.WORD, deleteFile, response);
-    }
-
-    @GetMapping("/export-markdown")
-    @Operation(summary = "导出 markdown 格式的数据文档")
-    @Parameter(name = "deleteFile", description = "是否删除在服务器本地生成的数据库文档", example = "true")
-    public void exportMarkdown(@RequestParam(defaultValue = "true") Boolean deleteFile,
-                               HttpServletResponse response) throws IOException {
-        doExportFile(EngineFileType.MD, deleteFile, response);
-    }
-
-    private void doExportFile(EngineFileType fileOutputType, Boolean deleteFile,
-                              HttpServletResponse response) throws IOException {
-        String docFileName = DOC_FILE_NAME + "_" + IdUtil.fastSimpleUUID();
-        String filePath = doExportFile(fileOutputType, docFileName);
-        String downloadFileName = DOC_FILE_NAME + fileOutputType.getFileSuffix(); //下载后的文件名
-        try {
-            // 读取，返回
-            ServletUtils.writeAttachment(response, downloadFileName, FileUtil.readBytes(filePath));
-        } finally {
-            handleDeleteFile(deleteFile, filePath);
-        }
-    }
-
-    /**
-     * 输出文件，返回文件路径
-     *
-     * @param fileOutputType 文件类型
-     * @param fileName       文件名, 无需 ".docx" 等文件后缀
-     * @return 生成的文件所在路径
-     */
-    private String doExportFile(EngineFileType fileOutputType, String fileName) {
-        try (HikariDataSource dataSource = buildDataSource()) {
-            // 创建 screw 的配置
-            Configuration config = Configuration.builder()
-                    .version(DOC_VERSION)  // 版本
-                    .description(DOC_DESCRIPTION) // 描述
-                    .dataSource(dataSource) // 数据源
-                    .engineConfig(buildEngineConfig(fileOutputType, fileName)) // 引擎配置
-                    .produceConfig(buildProcessConfig()) // 处理配置
-                    .build();
-
-            // 执行 screw，生成数据库文档
-            new DocumentationExecute(config).execute();
-
-            return FILE_OUTPUT_DIR + File.separator + fileName + fileOutputType.getFileSuffix();
-        }
-    }
-
-    private void handleDeleteFile(Boolean deleteFile, String filePath) {
-        if (!deleteFile) {
-            return;
-        }
-        FileUtil.del(filePath);
-    }
-
-    /**
-     * 创建数据源
-     */
-    // TODO 非繁人：screw 暂时不支持 druid，尴尬
-    private HikariDataSource buildDataSource() {
-        // 获得 DataSource 数据源，目前只支持首个
-        String primary = dynamicDataSourceProperties.getPrimary();
-        DataSourceProperty dataSourceProperty = dynamicDataSourceProperties.getDatasource().get(primary);
-        // 创建 HikariConfig 配置类
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(dataSourceProperty.getUrl());
-        hikariConfig.setUsername(dataSourceProperty.getUsername());
-        hikariConfig.setPassword(dataSourceProperty.getPassword());
-        hikariConfig.addDataSourceProperty("useInformationSchema", "true"); // 设置可以获取 tables remarks 信息
-        // 创建数据源
-        return new HikariDataSource(hikariConfig);
-    }
-
-    /**
-     * 创建 screw 的引擎配置
-     */
-    private static EngineConfig buildEngineConfig(EngineFileType fileOutputType, String docFileName) {
-        return EngineConfig.builder()
-                .fileOutputDir(FILE_OUTPUT_DIR) // 生成文件路径
-                .openOutputDir(false) // 打开目录
-                .fileType(fileOutputType) // 文件类型
-                .produceType(EngineTemplateType.velocity) // 文件类型
-                .fileName(docFileName) // 自定义文件名称
-                .build();
-    }
-
-    /**
-     * 创建 screw 的处理配置，一般可忽略
-     * 指定生成逻辑、当存在指定表、指定表前缀、指定表后缀时，将生成指定表，其余表不生成、并跳过忽略表配置
-     */
-    private static ProcessConfig buildProcessConfig() {
-        return ProcessConfig.builder()
-                .ignoreTablePrefix(Arrays.asList("QRTZ_", "ACT_", "FLW_")) // 忽略表前缀
-                .build();
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/demo/demo01/Demo01ContactController.java

@@ -1,93 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.demo.demo01;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.infra.controller.admin.demo.demo01.vo.Demo01ContactPageReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.demo.demo01.vo.Demo01ContactRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.demo.demo01.vo.Demo01ContactSaveReqVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.demo.demo01.Demo01ContactDO;
-import cn.newfeifan.mall.module.infra.service.demo.demo01.Demo01ContactService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - 示例联系人")
-@RestController
-@RequestMapping("/infra/demo01-contact")
-@Validated
-public class Demo01ContactController {
-
-    @Resource
-    private Demo01ContactService demo01ContactService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建示例联系人")
-    @PreAuthorize("@ss.hasPermission('infra:demo01-contact:create')")
-    public CommonResult<Long> createDemo01Contact(@Valid @RequestBody Demo01ContactSaveReqVO createReqVO) {
-        return success(demo01ContactService.createDemo01Contact(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新示例联系人")
-    @PreAuthorize("@ss.hasPermission('infra:demo01-contact:update')")
-    public CommonResult<Boolean> updateDemo01Contact(@Valid @RequestBody Demo01ContactSaveReqVO updateReqVO) {
-        demo01ContactService.updateDemo01Contact(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除示例联系人")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('infra:demo01-contact:delete')")
-    public CommonResult<Boolean> deleteDemo01Contact(@RequestParam("id") Long id) {
-        demo01ContactService.deleteDemo01Contact(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得示例联系人")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:demo01-contact:query')")
-    public CommonResult<Demo01ContactRespVO> getDemo01Contact(@RequestParam("id") Long id) {
-        Demo01ContactDO demo01Contact = demo01ContactService.getDemo01Contact(id);
-        return success(BeanUtils.toBean(demo01Contact, Demo01ContactRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得示例联系人分页")
-    @PreAuthorize("@ss.hasPermission('infra:demo01-contact:query')")
-    public CommonResult<PageResult<Demo01ContactRespVO>> getDemo01ContactPage(@Valid Demo01ContactPageReqVO pageReqVO) {
-        PageResult<Demo01ContactDO> pageResult = demo01ContactService.getDemo01ContactPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, Demo01ContactRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出示例联系人 Excel")
-    @PreAuthorize("@ss.hasPermission('infra:demo01-contact:export')")
-    @OperateLog(type = EXPORT)
-    public void exportDemo01ContactExcel(@Valid Demo01ContactPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<Demo01ContactDO> list = demo01ContactService.getDemo01ContactPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "示例联系人.xls", "数据", Demo01ContactRespVO.class,
-                        BeanUtils.toBean(list, Demo01ContactRespVO.class));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java

@@ -1,90 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.demo.demo02;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.infra.controller.admin.demo.demo02.vo.Demo02CategoryListReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.demo.demo02.vo.Demo02CategoryRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.demo.demo02.vo.Demo02CategorySaveReqVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.demo.demo02.Demo02CategoryDO;
-import cn.newfeifan.mall.module.infra.service.demo.demo02.Demo02CategoryService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - 示例分类")
-@RestController
-@RequestMapping("/infra/demo02-category")
-@Validated
-public class Demo02CategoryController {
-
-    @Resource
-    private Demo02CategoryService demo02CategoryService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建示例分类")
-    @PreAuthorize("@ss.hasPermission('infra:demo02-category:create')")
-    public CommonResult<Long> createDemo02Category(@Valid @RequestBody Demo02CategorySaveReqVO createReqVO) {
-        return success(demo02CategoryService.createDemo02Category(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新示例分类")
-    @PreAuthorize("@ss.hasPermission('infra:demo02-category:update')")
-    public CommonResult<Boolean> updateDemo02Category(@Valid @RequestBody Demo02CategorySaveReqVO updateReqVO) {
-        demo02CategoryService.updateDemo02Category(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除示例分类")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('infra:demo02-category:delete')")
-    public CommonResult<Boolean> deleteDemo02Category(@RequestParam("id") Long id) {
-        demo02CategoryService.deleteDemo02Category(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得示例分类")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:demo02-category:query')")
-    public CommonResult<Demo02CategoryRespVO> getDemo02Category(@RequestParam("id") Long id) {
-        Demo02CategoryDO demo02Category = demo02CategoryService.getDemo02Category(id);
-        return success(BeanUtils.toBean(demo02Category, Demo02CategoryRespVO.class));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得示例分类列表")
-    @PreAuthorize("@ss.hasPermission('infra:demo02-category:query')")
-    public CommonResult<List<Demo02CategoryRespVO>> getDemo02CategoryList(@Valid Demo02CategoryListReqVO listReqVO) {
-        List<Demo02CategoryDO> list = demo02CategoryService.getDemo02CategoryList(listReqVO);
-        return success(BeanUtils.toBean(list, Demo02CategoryRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出示例分类 Excel")
-    @PreAuthorize("@ss.hasPermission('infra:demo02-category:export')")
-    @OperateLog(type = EXPORT)
-    public void exportDemo02CategoryExcel(@Valid Demo02CategoryListReqVO listReqVO,
-              HttpServletResponse response) throws IOException {
-        List<Demo02CategoryDO> list = demo02CategoryService.getDemo02CategoryList(listReqVO);
-        // 导出 Excel
-        ExcelUtils.write(response, "示例分类.xls", "数据", Demo02CategoryRespVO.class,
-                        BeanUtils.toBean(list, Demo02CategoryRespVO.class));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/demo/demo03/Demo03StudentController.java

@@ -1,197 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.demo.demo03;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.infra.controller.admin.demo.demo03.vo.Demo03StudentPageReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.demo.demo03.vo.Demo03StudentRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.demo.demo03.vo.Demo03StudentSaveReqVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.demo.demo03.Demo03StudentDO;
-import cn.newfeifan.mall.module.infra.service.demo.demo03.Demo03StudentService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - 学生")
-@RestController
-@RequestMapping("/infra/demo03-student")
-@Validated
-public class Demo03StudentController {
-
-    @Resource
-    private Demo03StudentService demo03StudentService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建学生")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:create')")
-    public CommonResult<Long> createDemo03Student(@Valid @RequestBody Demo03StudentSaveReqVO createReqVO) {
-        return success(demo03StudentService.createDemo03Student(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新学生")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:update')")
-    public CommonResult<Boolean> updateDemo03Student(@Valid @RequestBody Demo03StudentSaveReqVO updateReqVO) {
-        demo03StudentService.updateDemo03Student(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除学生")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')")
-    public CommonResult<Boolean> deleteDemo03Student(@RequestParam("id") Long id) {
-        demo03StudentService.deleteDemo03Student(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得学生")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')")
-    public CommonResult<Demo03StudentRespVO> getDemo03Student(@RequestParam("id") Long id) {
-        Demo03StudentDO demo03Student = demo03StudentService.getDemo03Student(id);
-        return success(BeanUtils.toBean(demo03Student, Demo03StudentRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得学生分页")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')")
-    public CommonResult<PageResult<Demo03StudentRespVO>> getDemo03StudentPage(@Valid Demo03StudentPageReqVO pageReqVO) {
-        PageResult<Demo03StudentDO> pageResult = demo03StudentService.getDemo03StudentPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, Demo03StudentRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出学生 Excel")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:export')")
-    @OperateLog(type = EXPORT)
-    public void exportDemo03StudentExcel(@Valid Demo03StudentPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<Demo03StudentDO> list = demo03StudentService.getDemo03StudentPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "学生.xls", "数据", Demo03StudentRespVO.class,
-                        BeanUtils.toBean(list, Demo03StudentRespVO.class));
-    }
-
-    // ==================== 子表（学生课程） ====================
-
-    @GetMapping("/demo03-course/page")
-    @Operation(summary = "获得学生课程分页")
-    @Parameter(name = "studentId", description = "学生编号")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')")
-    public CommonResult<PageResult<Demo03CourseDO>> getDemo03CoursePage(PageParam pageReqVO,
-                                                                        @RequestParam("studentId") Long studentId) {
-        return success(demo03StudentService.getDemo03CoursePage(pageReqVO, studentId));
-    }
-
-    @PostMapping("/demo03-course/create")
-    @Operation(summary = "创建学生课程")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:create')")
-    public CommonResult<Long> createDemo03Course(@Valid @RequestBody Demo03CourseDO demo03Course) {
-        return success(demo03StudentService.createDemo03Course(demo03Course));
-    }
-
-    @PutMapping("/demo03-course/update")
-    @Operation(summary = "更新学生课程")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:update')")
-    public CommonResult<Boolean> updateDemo03Course(@Valid @RequestBody Demo03CourseDO demo03Course) {
-        demo03StudentService.updateDemo03Course(demo03Course);
-        return success(true);
-    }
-
-    @DeleteMapping("/demo03-course/delete")
-    @Parameter(name = "id", description = "编号", required = true)
-    @Operation(summary = "删除学生课程")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')")
-    public CommonResult<Boolean> deleteDemo03Course(@RequestParam("id") Long id) {
-        demo03StudentService.deleteDemo03Course(id);
-        return success(true);
-    }
-
-    @GetMapping("/demo03-course/get")
-    @Operation(summary = "获得学生课程")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')")
-    public CommonResult<Demo03CourseDO> getDemo03Course(@RequestParam("id") Long id) {
-        return success(demo03StudentService.getDemo03Course(id));
-    }
-
-    @GetMapping("/demo03-course/list-by-student-id")
-    @Operation(summary = "获得学生课程列表")
-    @Parameter(name = "studentId", description = "学生编号")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')")
-    public CommonResult<List<Demo03CourseDO>> getDemo03CourseListByStudentId(@RequestParam("studentId") Long studentId) {
-        return success(demo03StudentService.getDemo03CourseListByStudentId(studentId));
-    }
-
-    // ==================== 子表（学生班级） ====================
-
-    @GetMapping("/demo03-grade/page")
-    @Operation(summary = "获得学生班级分页")
-    @Parameter(name = "studentId", description = "学生编号")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')")
-    public CommonResult<PageResult<Demo03GradeDO>> getDemo03GradePage(PageParam pageReqVO,
-                                                                      @RequestParam("studentId") Long studentId) {
-        return success(demo03StudentService.getDemo03GradePage(pageReqVO, studentId));
-    }
-
-    @PostMapping("/demo03-grade/create")
-    @Operation(summary = "创建学生班级")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:create')")
-    public CommonResult<Long> createDemo03Grade(@Valid @RequestBody Demo03GradeDO demo03Grade) {
-        return success(demo03StudentService.createDemo03Grade(demo03Grade));
-    }
-
-    @PutMapping("/demo03-grade/update")
-    @Operation(summary = "更新学生班级")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:update')")
-    public CommonResult<Boolean> updateDemo03Grade(@Valid @RequestBody Demo03GradeDO demo03Grade) {
-        demo03StudentService.updateDemo03Grade(demo03Grade);
-        return success(true);
-    }
-
-    @DeleteMapping("/demo03-grade/delete")
-    @Parameter(name = "id", description = "编号", required = true)
-    @Operation(summary = "删除学生班级")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')")
-    public CommonResult<Boolean> deleteDemo03Grade(@RequestParam("id") Long id) {
-        demo03StudentService.deleteDemo03Grade(id);
-        return success(true);
-    }
-
-    @GetMapping("/demo03-grade/get")
-    @Operation(summary = "获得学生班级")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')")
-    public CommonResult<Demo03GradeDO> getDemo03Grade(@RequestParam("id") Long id) {
-        return success(demo03StudentService.getDemo03Grade(id));
-    }
-
-    @GetMapping("/demo03-grade/get-by-student-id")
-    @Operation(summary = "获得学生班级")
-    @Parameter(name = "studentId", description = "学生编号")
-    @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')")
-    public CommonResult<Demo03GradeDO> getDemo03GradeByStudentId(@RequestParam("studentId") Long studentId) {
-        return success(demo03StudentService.getDemo03GradeByStudentId(studentId));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/file/FileConfigController.http

@@ -1,45 +0,0 @@
-### 请求 /infra/file-config/create 接口 => 成功
-POST {{baseUrl}}/infra/file-config/create
-Content-Type: application/json
-tenant-id: {{adminTenentId}}
-Authorization: Bearer {{token}}
-
-{
-  "name": "S3 - 七牛云",
-  "remark": "",
-  "storage": 20,
-  "config": {
-    "accessKey": "b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8",
-    "accessSecret": "kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP",
-    "bucket": "ruoyi-vue-pro",
-    "endpoint": "s3-cn-south-1.qiniucs.com",
-    "domain": "http://test.feifan.iocoder.cn",
-    "region": "oss-cn-beijing"
-  }
-}
-
-### 请求 /infra/file-config/update 接口 => 成功
-PUT {{baseUrl}}/infra/file-config/update
-Content-Type: application/json
-tenant-id: {{adminTenentId}}
-Authorization: Bearer {{token}}
-
-{
-  "id": 2,
-  "name": "S3 - 七牛云",
-  "remark": "",
-  "config": {
-    "accessKey": "b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8",
-    "accessSecret": "kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP",
-    "bucket": "ruoyi-vue-pro",
-    "endpoint": "s3-cn-south-1.qiniucs.com",
-    "domain": "http://test.feifan.iocoder.cn",
-    "region": "oss-cn-beijing"
-  }
-}
-
-### 请求 /infra/file-config/test 接口 => 成功
-GET {{baseUrl}}/infra/file-config/test?id=2
-Content-Type: application/json
-tenant-id: {{adminTenentId}}
-Authorization: Bearer {{token}}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/file/FileConfigController.java

@@ -1,88 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.file;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.file.vo.config.FileConfigRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.file.FileConfigDO;
-import cn.newfeifan.mall.module.infra.service.file.FileConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 文件配置")
-@RestController
-@RequestMapping("/infra/file-config")
-@Validated
-public class FileConfigController {
-
-    @Resource
-    private FileConfigService fileConfigService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建文件配置")
-    @PreAuthorize("@ss.hasPermission('infra:file-config:create')")
-    public CommonResult<Long> createFileConfig(@Valid @RequestBody FileConfigSaveReqVO createReqVO) {
-        return success(fileConfigService.createFileConfig(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新文件配置")
-    @PreAuthorize("@ss.hasPermission('infra:file-config:update')")
-    public CommonResult<Boolean> updateFileConfig(@Valid @RequestBody FileConfigSaveReqVO updateReqVO) {
-        fileConfigService.updateFileConfig(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-master")
-    @Operation(summary = "更新文件配置为 Master")
-    @PreAuthorize("@ss.hasPermission('infra:file-config:update')")
-    public CommonResult<Boolean> updateFileConfigMaster(@RequestParam("id") Long id) {
-        fileConfigService.updateFileConfigMaster(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除文件配置")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('infra:file-config:delete')")
-    public CommonResult<Boolean> deleteFileConfig(@RequestParam("id") Long id) {
-        fileConfigService.deleteFileConfig(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得文件配置")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:file-config:query')")
-    public CommonResult<FileConfigRespVO> getFileConfig(@RequestParam("id") Long id) {
-        FileConfigDO config = fileConfigService.getFileConfig(id);
-        return success(BeanUtils.toBean(config, FileConfigRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得文件配置分页")
-    @PreAuthorize("@ss.hasPermission('infra:file-config:query')")
-    public CommonResult<PageResult<FileConfigRespVO>> getFileConfigPage(@Valid FileConfigPageReqVO pageVO) {
-        PageResult<FileConfigDO> pageResult = fileConfigService.getFileConfigPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, FileConfigRespVO.class));
-    }
-
-    @GetMapping("/test")
-    @Operation(summary = "测试文件配置是否正确")
-    @PreAuthorize("@ss.hasPermission('infra:file-config:query')")
-    public CommonResult<String> testFileConfig(@RequestParam("id") Long id) throws Exception {
-        String url = fileConfigService.testFileConfig(id);
-        return success(url);
-    }
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/file/FileController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.file;
-
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.common.util.servlet.ServletUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.infra.controller.admin.file.vo.file.FilePageReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.file.vo.file.FileRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.file.vo.file.FileUploadReqVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.file.FileDO;
-import cn.newfeifan.mall.module.infra.service.file.FileService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 文件存储")
-@RestController
-@RequestMapping("/infra/file")
-@Validated
-@Slf4j
-public class FileController {
-
-    @Resource
-    private FileService fileService;
-
-    @PostMapping("/upload")
-    @Operation(summary = "上传文件")
-    @OperateLog(logArgs = false) // 上传文件，没有记录操作日志的必要
-    public CommonResult<String> uploadFile(FileUploadReqVO uploadReqVO) throws Exception {
-        MultipartFile file = uploadReqVO.getFile();
-        String path = uploadReqVO.getPath();
-        return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除文件")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('infra:file:delete')")
-    public CommonResult<Boolean> deleteFile(@RequestParam("id") Long id) throws Exception {
-        fileService.deleteFile(id);
-        return success(true);
-    }
-
-    @GetMapping("/{configId}/get/**")
-    @PermitAll
-    @Operation(summary = "下载文件")
-    @Parameter(name = "configId", description = "配置编号",  required = true)
-    public void getFileContent(HttpServletRequest request,
-                               HttpServletResponse response,
-                               @PathVariable("configId") Long configId) throws Exception {
-        // 获取请求的路径
-        String path = StrUtil.subAfter(request.getRequestURI(), "/get/", false);
-        if (StrUtil.isEmpty(path)) {
-            throw new IllegalArgumentException("结尾的 path 路径必须传递");
-        }
-        // 解码，解决中文路径的问题 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/807/
-        path = URLUtil.decode(path);
-
-        // 读取内容
-        byte[] content = fileService.getFileContent(configId, path);
-        if (content == null) {
-            log.warn("[getFileContent][configId({}) path({}) 文件不存在]", configId, path);
-            response.setStatus(HttpStatus.NOT_FOUND.value());
-            return;
-        }
-        ServletUtils.writeAttachment(response, path, content);
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得文件分页")
-    @PreAuthorize("@ss.hasPermission('infra:file:query')")
-    public CommonResult<PageResult<FileRespVO>> getFilePage(@Valid FilePageReqVO pageVO) {
-        PageResult<FileDO> pageResult = fileService.getFilePage(pageVO);
-        return success(BeanUtils.toBean(pageResult, FileRespVO.class));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/job/JobController.java

@@ -1,140 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.job;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.framework.quartz.core.util.CronUtils;
-import cn.newfeifan.mall.module.infra.controller.admin.job.vo.job.JobPageReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.job.vo.job.JobRespVO;
-import cn.newfeifan.mall.module.infra.controller.admin.job.vo.job.JobSaveReqVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.job.JobDO;
-import cn.newfeifan.mall.module.infra.service.job.JobService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.quartz.SchedulerException;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - 定时任务")
-@RestController
-@RequestMapping("/infra/job")
-@Validated
-public class JobController {
-
-    @Resource
-    private JobService jobService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建定时任务")
-    @PreAuthorize("@ss.hasPermission('infra:job:create')")
-    public CommonResult<Long> createJob(@Valid @RequestBody JobSaveReqVO createReqVO)
-            throws SchedulerException {
-        return success(jobService.createJob(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新定时任务")
-    @PreAuthorize("@ss.hasPermission('infra:job:update')")
-    public CommonResult<Boolean> updateJob(@Valid @RequestBody JobSaveReqVO updateReqVO)
-            throws SchedulerException {
-        jobService.updateJob(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-status")
-    @Operation(summary = "更新定时任务的状态")
-    @Parameters({
-            @Parameter(name = "id", description = "编号", required = true, example = "1024"),
-            @Parameter(name = "status", description = "状态", required = true, example = "1"),
-    })
-    @PreAuthorize("@ss.hasPermission('infra:job:update')")
-    public CommonResult<Boolean> updateJobStatus(@RequestParam(value = "id") Long id, @RequestParam("status") Integer status)
-            throws SchedulerException {
-        jobService.updateJobStatus(id, status);
-        return success(true);
-    }
-
-	@DeleteMapping("/delete")
-    @Operation(summary = "删除定时任务")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-	@PreAuthorize("@ss.hasPermission('infra:job:delete')")
-    public CommonResult<Boolean> deleteJob(@RequestParam("id") Long id)
-            throws SchedulerException {
-        jobService.deleteJob(id);
-        return success(true);
-    }
-
-    @PutMapping("/trigger")
-    @Operation(summary = "触发定时任务")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:job:trigger')")
-    public CommonResult<Boolean> triggerJob(@RequestParam("id") Long id) throws SchedulerException {
-        jobService.triggerJob(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得定时任务")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:job:query')")
-    public CommonResult<JobRespVO> getJob(@RequestParam("id") Long id) {
-        JobDO job = jobService.getJob(id);
-        return success(BeanUtils.toBean(job, JobRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得定时任务分页")
-    @PreAuthorize("@ss.hasPermission('infra:job:query')")
-    public CommonResult<PageResult<JobRespVO>> getJobPage(@Valid JobPageReqVO pageVO) {
-        PageResult<JobDO> pageResult = jobService.getJobPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, JobRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出定时任务 Excel")
-    @PreAuthorize("@ss.hasPermission('infra:job:export')")
-    @OperateLog(type = EXPORT)
-    public void exportJobExcel(@Valid JobPageReqVO exportReqVO,
-                               HttpServletResponse response) throws IOException {
-        exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<JobDO> list = jobService.getJobPage(exportReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "定时任务.xls", "数据", JobRespVO.class,
-                BeanUtils.toBean(list, JobRespVO.class));
-    }
-
-    @GetMapping("/get_next_times")
-    @Operation(summary = "获得定时任务的下 n 次执行时间")
-    @Parameters({
-            @Parameter(name = "id", description = "编号", required = true, example = "1024"),
-            @Parameter(name = "count", description = "数量", example = "5")
-    })
-    @PreAuthorize("@ss.hasPermission('infra:job:query')")
-    public CommonResult<List<LocalDateTime>> getJobNextTimes(
-            @RequestParam("id") Long id,
-            @RequestParam(value = "count", required = false, defaultValue = "5") Integer count) {
-        JobDO job = jobService.getJob(id);
-        if (job == null) {
-            return success(Collections.emptyList());
-        }
-        return success(CronUtils.getNextTimes(job.getCronExpression(), count));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/job/JobLogController.java

@@ -1,71 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.job;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.infra.controller.admin.job.vo.log.JobLogPageReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.job.vo.log.JobLogRespVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.job.JobLogDO;
-import cn.newfeifan.mall.module.infra.service.job.JobLogService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - 定时任务日志")
-@RestController
-@RequestMapping("/infra/job-log")
-@Validated
-public class JobLogController {
-
-    @Resource
-    private JobLogService jobLogService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得定时任务日志")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('infra:job:query')")
-    public CommonResult<JobLogRespVO> getJobLog(@RequestParam("id") Long id) {
-        JobLogDO jobLog = jobLogService.getJobLog(id);
-        return success(BeanUtils.toBean(jobLog, JobLogRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得定时任务日志分页")
-    @PreAuthorize("@ss.hasPermission('infra:job:query')")
-    public CommonResult<PageResult<JobLogRespVO>> getJobLogPage(@Valid JobLogPageReqVO pageVO) {
-        PageResult<JobLogDO> pageResult = jobLogService.getJobLogPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, JobLogRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出定时任务日志 Excel")
-    @PreAuthorize("@ss.hasPermission('infra:job:export')")
-    @OperateLog(type = EXPORT)
-    public void exportJobLogExcel(@Valid JobLogPageReqVO exportReqVO,
-                                  HttpServletResponse response) throws IOException {
-        exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<JobLogDO> list = jobLogService.getJobLogPage(exportReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "任务日志.xls", "数据", JobLogRespVO.class,
-                BeanUtils.toBean(list, JobLogRespVO.class));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/logger/ApiAccessLogController.java

@@ -1,60 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.logger;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.logger.ApiAccessLogDO;
-import cn.newfeifan.mall.module.infra.service.logger.ApiAccessLogService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - API 访问日志")
-@RestController
-@RequestMapping("/infra/api-access-log")
-@Validated
-public class ApiAccessLogController {
-
-    @Resource
-    private ApiAccessLogService apiAccessLogService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得API 访问日志分页")
-    @PreAuthorize("@ss.hasPermission('infra:api-access-log:query')")
-    public CommonResult<PageResult<ApiAccessLogRespVO>> getApiAccessLogPage(@Valid ApiAccessLogPageReqVO pageReqVO) {
-        PageResult<ApiAccessLogDO> pageResult = apiAccessLogService.getApiAccessLogPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, ApiAccessLogRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出API 访问日志 Excel")
-    @PreAuthorize("@ss.hasPermission('infra:api-access-log:export')")
-    @OperateLog(type = EXPORT)
-    public void exportApiAccessLogExcel(@Valid ApiAccessLogPageReqVO exportReqVO,
-                                        HttpServletResponse response) throws IOException {
-        exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<ApiAccessLogDO> list = apiAccessLogService.getApiAccessLogPage(exportReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "API 访问日志.xls", "数据", ApiAccessLogRespVO.class,
-                BeanUtils.toBean(list, ApiAccessLogRespVO.class));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/logger/ApiErrorLogController.java

@@ -1,74 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.logger;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO;
-import cn.newfeifan.mall.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO;
-import cn.newfeifan.mall.module.infra.dal.dataobject.logger.ApiErrorLogDO;
-import cn.newfeifan.mall.module.infra.service.logger.ApiErrorLogService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - API 错误日志")
-@RestController
-@RequestMapping("/infra/api-error-log")
-@Validated
-public class ApiErrorLogController {
-
-    @Resource
-    private ApiErrorLogService apiErrorLogService;
-
-    @PutMapping("/update-status")
-    @Operation(summary = "更新 API 错误日志的状态")
-    @Parameters({
-            @Parameter(name = "id", description = "编号", required = true, example = "1024"),
-            @Parameter(name = "processStatus", description = "处理状态", required = true, example = "1")
-    })
-    @PreAuthorize("@ss.hasPermission('infra:api-error-log:update-status')")
-    public CommonResult<Boolean> updateApiErrorLogProcess(@RequestParam("id") Long id,
-                                                          @RequestParam("processStatus") Integer processStatus) {
-        apiErrorLogService.updateApiErrorLogProcess(id, processStatus, getLoginUserId());
-        return success(true);
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得 API 错误日志分页")
-    @PreAuthorize("@ss.hasPermission('infra:api-error-log:query')")
-    public CommonResult<PageResult<ApiErrorLogRespVO>> getApiErrorLogPage(@Valid ApiErrorLogPageReqVO pageReqVO) {
-        PageResult<ApiErrorLogDO> pageResult = apiErrorLogService.getApiErrorLogPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, ApiErrorLogRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出 API 错误日志 Excel")
-    @PreAuthorize("@ss.hasPermission('infra:api-error-log:export')")
-    @OperateLog(type = EXPORT)
-    public void exportApiErrorLogExcel(@Valid ApiErrorLogPageReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<ApiErrorLogDO> list = apiErrorLogService.getApiErrorLogPage(exportReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "API 错误日志.xls", "数据", ApiErrorLogRespVO.class,
-                BeanUtils.toBean(list, ApiErrorLogRespVO.class));
-    }
-
-}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/redis/RedisController.http

@@ -1,4 +0,0 @@
-### 请求 /infra/redis/get-monitor-info 接口 => 成功
-GET {{baseUrl}}/infra/redis/get-monitor-info
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/redis/RedisController.java

@@ -1,43 +0,0 @@
-package cn.newfeifan.mall.module.infra.controller.admin.redis;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.infra.controller.admin.redis.vo.RedisMonitorRespVO;
-import cn.newfeifan.mall.module.infra.convert.redis.RedisConvert;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.data.redis.connection.RedisServerCommands;
-import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Properties;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - Redis 监控")
-@RestController
-@RequestMapping("/infra/redis")
-public class RedisController {
-
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-
-    @GetMapping("/get-monitor-info")
-    @Operation(summary = "获得 Redis 监控信息")
-    @PreAuthorize("@ss.hasPermission('infra:redis:get-monitor-info')")
-    public CommonResult<RedisMonitorRespVO> getRedisMonitorInfo() {
-        // 获得 Redis 统计信息
-        Properties info = stringRedisTemplate.execute((RedisCallback<Properties>) RedisServerCommands::info);
-        Long dbSize = stringRedisTemplate.execute(RedisServerCommands::dbSize);
-        Properties commandStats = stringRedisTemplate.execute((
-                RedisCallback<Properties>) connection -> connection.info("commandstats"));
-        assert commandStats != null; // 断言，避免警告
-        // 拼接结果返回
-        return success(RedisConvert.INSTANCE.build(info, dbSize, commandStats));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/brand/ProductBrandController.java

@@ -1,92 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.admin.brand;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.product.controller.admin.brand.vo.*;
-import cn.newfeifan.mall.module.product.convert.brand.ProductBrandConvert;
-import cn.newfeifan.mall.module.product.dal.dataobject.brand.ProductBrandDO;
-import cn.newfeifan.mall.module.product.service.brand.ProductBrandService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 商品品牌")
-@RestController
-@RequestMapping("/product/brand")
-@Validated
-public class ProductBrandController {
-
-    @Resource
-    private ProductBrandService brandService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建品牌")
-    @PreAuthorize("@ss.hasPermission('product:brand:create')")
-    public CommonResult<Long> createBrand(@Valid @RequestBody ProductBrandCreateReqVO createReqVO) {
-        return success(brandService.createBrand(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新品牌")
-    @PreAuthorize("@ss.hasPermission('product:brand:update')")
-    public CommonResult<Boolean> updateBrand(@Valid @RequestBody ProductBrandUpdateReqVO updateReqVO) {
-        brandService.updateBrand(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除品牌")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('product:brand:delete')")
-    public CommonResult<Boolean> deleteBrand(@RequestParam("id") Long id) {
-        brandService.deleteBrand(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得品牌")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('product:brand:query')")
-    public CommonResult<ProductBrandRespVO> getBrand(@RequestParam("id") Long id) {
-        ProductBrandDO brand = brandService.getBrand(id);
-        return success(ProductBrandConvert.INSTANCE.convert(brand));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取品牌精简信息列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<ProductBrandSimpleRespVO>> getSimpleBrandList() {
-        // 获取品牌列表，只要开启状态的
-        List<ProductBrandDO> list = brandService.getBrandListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        // 排序后，返回给前端
-        return success(ProductBrandConvert.INSTANCE.convertList1(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得品牌分页")
-    @PreAuthorize("@ss.hasPermission('product:brand:query')")
-    public CommonResult<PageResult<ProductBrandRespVO>> getBrandPage(@Valid ProductBrandPageReqVO pageVO) {
-        PageResult<ProductBrandDO> pageResult = brandService.getBrandPage(pageVO);
-        return success(ProductBrandConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得品牌列表")
-    @PreAuthorize("@ss.hasPermission('product:brand:query')")
-    public CommonResult<List<ProductBrandRespVO>> getBrandList(@Valid ProductBrandListReqVO listVO) {
-        List<ProductBrandDO> list = brandService.getBrandList(listVO);
-        list.sort(Comparator.comparing(ProductBrandDO::getSort));
-        return success(ProductBrandConvert.INSTANCE.convertList(list));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/category/ProductCategoryController.java

@@ -1,75 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.admin.category;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
-import cn.newfeifan.mall.module.product.controller.admin.category.vo.ProductCategoryRespVO;
-import cn.newfeifan.mall.module.product.controller.admin.category.vo.ProductCategorySaveReqVO;
-import cn.newfeifan.mall.module.product.dal.dataobject.category.ProductCategoryDO;
-import cn.newfeifan.mall.module.product.service.category.ProductCategoryService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 商品分类")
-@RestController
-@RequestMapping("/product/category")
-@Validated
-public class ProductCategoryController {
-
-    @Resource
-    private ProductCategoryService categoryService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建商品分类")
-    @PreAuthorize("@ss.hasPermission('product:category:create')")
-    public CommonResult<Long> createCategory(@Valid @RequestBody ProductCategorySaveReqVO createReqVO) {
-        return success(categoryService.createCategory(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新商品分类")
-    @PreAuthorize("@ss.hasPermission('product:category:update')")
-    public CommonResult<Boolean> updateCategory(@Valid @RequestBody ProductCategorySaveReqVO updateReqVO) {
-        categoryService.updateCategory(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除商品分类")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('product:category:delete')")
-    public CommonResult<Boolean> deleteCategory(@RequestParam("id") Long id) {
-        categoryService.deleteCategory(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得商品分类")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('product:category:query')")
-    public CommonResult<ProductCategoryRespVO> getCategory(@RequestParam("id") Long id) {
-        ProductCategoryDO category = categoryService.getCategory(id);
-        return success(BeanUtils.toBean(category, ProductCategoryRespVO.class));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得商品分类列表")
-    @PreAuthorize("@ss.hasPermission('product:category:query')")
-    public CommonResult<List<ProductCategoryRespVO>> getCategoryList(@Valid ProductCategoryListReqVO listReqVO) {
-        List<ProductCategoryDO> list = categoryService.getCategoryList(listReqVO);
-        list.sort(Comparator.comparing(ProductCategoryDO::getSort));
-        return success(BeanUtils.toBean(list, ProductCategoryRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/ProductCommentController.java

@@ -1,62 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.admin.comment;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.product.controller.admin.comment.vo.*;
-import cn.newfeifan.mall.module.product.dal.dataobject.comment.ProductCommentDO;
-import cn.newfeifan.mall.module.product.service.comment.ProductCommentService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - 商品评价")
-@RestController
-@RequestMapping("/product/comment")
-@Validated
-public class ProductCommentController {
-
-    @Resource
-    private ProductCommentService productCommentService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得商品评价分页")
-    @PreAuthorize("@ss.hasPermission('product:comment:query')")
-    public CommonResult<PageResult<ProductCommentRespVO>> getCommentPage(@Valid ProductCommentPageReqVO pageVO) {
-        PageResult<ProductCommentDO> pageResult = productCommentService.getCommentPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, ProductCommentRespVO.class));
-    }
-
-    @PutMapping("/update-visible")
-    @Operation(summary = "显示 / 隐藏评论")
-    @PreAuthorize("@ss.hasPermission('product:comment:update')")
-    public CommonResult<Boolean> updateCommentVisible(@Valid @RequestBody ProductCommentUpdateVisibleReqVO updateReqVO) {
-        productCommentService.updateCommentVisible(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/reply")
-    @Operation(summary = "商家回复")
-    @PreAuthorize("@ss.hasPermission('product:comment:update')")
-    public CommonResult<Boolean> commentReply(@Valid @RequestBody ProductCommentReplyReqVO replyVO) {
-        productCommentService.replyComment(replyVO, getLoginUserId());
-        return success(true);
-    }
-
-    @PostMapping("/create")
-    @Operation(summary = "添加自评")
-    @PreAuthorize("@ss.hasPermission('product:comment:update')")
-    public CommonResult<Boolean> createComment(@Valid @RequestBody ProductCommentCreateReqVO createReqVO) {
-        productCommentService.createComment(createReqVO);
-        return success(true);
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/favorite/ProductFavoriteController.java

@@ -1,53 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.admin.favorite;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.product.controller.admin.favorite.vo.ProductFavoritePageReqVO;
-import cn.newfeifan.mall.module.product.controller.admin.favorite.vo.ProductFavoriteRespVO;
-import cn.newfeifan.mall.module.product.convert.favorite.ProductFavoriteConvert;
-import cn.newfeifan.mall.module.product.dal.dataobject.favorite.ProductFavoriteDO;
-import cn.newfeifan.mall.module.product.dal.dataobject.spu.ProductSpuDO;
-import cn.newfeifan.mall.module.product.service.favorite.ProductFavoriteService;
-import cn.newfeifan.mall.module.product.service.spu.ProductSpuService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 商品收藏")
-@RestController
-@RequestMapping("/product/favorite")
-@Validated
-public class ProductFavoriteController {
-
-    @Resource
-    private ProductFavoriteService productFavoriteService;
-
-    @Resource
-    private ProductSpuService productSpuService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得商品收藏分页")
-    @PreAuthorize("@ss.hasPermission('product:favorite:query')")
-    public CommonResult<PageResult<ProductFavoriteRespVO>> getFavoritePage(@Valid ProductFavoritePageReqVO pageVO) {
-        PageResult<ProductFavoriteDO> pageResult = productFavoriteService.getFavoritePage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty());
-        }
-        // 拼接数据
-        List<ProductSpuDO> spuList = productSpuService.getSpuList(convertSet(pageResult.getList(), ProductFavoriteDO::getSpuId));
-        return success(ProductFavoriteConvert.INSTANCE.convertPage(pageResult, spuList));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/history/ProductBrowseHistoryController.java

@@ -1,40 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.admin.history;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.product.controller.admin.history.vo.ProductBrowseHistoryPageReqVO;
-import cn.newfeifan.mall.module.product.controller.admin.history.vo.ProductBrowseHistoryRespVO;
-import cn.newfeifan.mall.module.product.dal.dataobject.history.ProductBrowseHistoryDO;
-import cn.newfeifan.mall.module.product.service.history.ProductBrowseHistoryService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 商品浏览记录")
-@RestController
-@RequestMapping("/product/browse-history")
-@Validated
-public class ProductBrowseHistoryController {
-
-    @Resource
-    private ProductBrowseHistoryService browseHistoryService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得商品浏览记录分页")
-    @PreAuthorize("@ss.hasPermission('product:browse-history:query')")
-    public CommonResult<PageResult<ProductBrowseHistoryRespVO>> getBrowseHistoryPage(@Valid ProductBrowseHistoryPageReqVO pageReqVO) {
-        PageResult<ProductBrowseHistoryDO> pageResult = browseHistoryService.getBrowseHistoryPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, ProductBrowseHistoryRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/ProductPropertyController.java

@@ -1,73 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.admin.property;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.product.controller.admin.property.vo.property.ProductPropertyPageReqVO;
-import cn.newfeifan.mall.module.product.controller.admin.property.vo.property.ProductPropertyRespVO;
-import cn.newfeifan.mall.module.product.controller.admin.property.vo.property.ProductPropertySaveReqVO;
-import cn.newfeifan.mall.module.product.dal.dataobject.property.ProductPropertyDO;
-import cn.newfeifan.mall.module.product.service.property.ProductPropertyService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 商品属性项")
-@RestController
-@RequestMapping("/product/property")
-@Validated
-public class ProductPropertyController {
-
-    @Resource
-    private ProductPropertyService productPropertyService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建属性项")
-    @PreAuthorize("@ss.hasPermission('product:property:create')")
-    public CommonResult<Long> createProperty(@Valid @RequestBody ProductPropertySaveReqVO createReqVO) {
-        return success(productPropertyService.createProperty(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新属性项")
-    @PreAuthorize("@ss.hasPermission('product:property:update')")
-    public CommonResult<Boolean> updateProperty(@Valid @RequestBody ProductPropertySaveReqVO updateReqVO) {
-        productPropertyService.updateProperty(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除属性项")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('product:property:delete')")
-    public CommonResult<Boolean> deleteProperty(@RequestParam("id") Long id) {
-        productPropertyService.deleteProperty(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得属性项")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('product:property:query')")
-    public CommonResult<ProductPropertyRespVO> getProperty(@RequestParam("id") Long id) {
-        ProductPropertyDO property = productPropertyService.getProperty(id);
-        return success(BeanUtils.toBean(property, ProductPropertyRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得属性项分页")
-    @PreAuthorize("@ss.hasPermission('product:property:query')")
-    public CommonResult<PageResult<ProductPropertyRespVO>> getPropertyPage(@Valid ProductPropertyPageReqVO pageVO) {
-        PageResult<ProductPropertyDO> pageResult = productPropertyService.getPropertyPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, ProductPropertyRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/ProductPropertyValueController.java

@@ -1,73 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.admin.property;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.module.product.controller.admin.property.vo.value.ProductPropertyValuePageReqVO;
-import cn.newfeifan.mall.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
-import cn.newfeifan.mall.module.product.controller.admin.property.vo.value.ProductPropertyValueSaveReqVO;
-import cn.newfeifan.mall.module.product.dal.dataobject.property.ProductPropertyValueDO;
-import cn.newfeifan.mall.module.product.service.property.ProductPropertyValueService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 商品属性值")
-@RestController
-@RequestMapping("/product/property/value")
-@Validated
-public class ProductPropertyValueController {
-
-    @Resource
-    private ProductPropertyValueService productPropertyValueService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建属性值")
-    @PreAuthorize("@ss.hasPermission('product:property:create')")
-    public CommonResult<Long> createPropertyValue(@Valid @RequestBody ProductPropertyValueSaveReqVO createReqVO) {
-        return success(productPropertyValueService.createPropertyValue(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新属性值")
-    @PreAuthorize("@ss.hasPermission('product:property:update')")
-    public CommonResult<Boolean> updatePropertyValue(@Valid @RequestBody ProductPropertyValueSaveReqVO updateReqVO) {
-        productPropertyValueService.updatePropertyValue(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除属性值")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('product:property:delete')")
-    public CommonResult<Boolean> deletePropertyValue(@RequestParam("id") Long id) {
-        productPropertyValueService.deletePropertyValue(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得属性值")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('product:property:query')")
-    public CommonResult<ProductPropertyValueRespVO> getPropertyValue(@RequestParam("id") Long id) {
-        ProductPropertyValueDO value = productPropertyValueService.getPropertyValue(id);
-        return success(BeanUtils.toBean(value, ProductPropertyValueRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得属性值分页")
-    @PreAuthorize("@ss.hasPermission('product:property:query')")
-    public CommonResult<PageResult<ProductPropertyValueRespVO>> getPropertyValuePage(@Valid ProductPropertyValuePageReqVO pageVO) {
-        PageResult<ProductPropertyValueDO> pageResult = productPropertyValueService.getPropertyValuePage(pageVO);
-        return success(BeanUtils.toBean(pageResult, ProductPropertyValueRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/ProductSpuController.http

@@ -1,4 +0,0 @@
-### 获得商品 SPU 明细
-GET {{baseUrl}}/product/spu/get-detail?id=4
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/ProductSpuController.java

@@ -1,140 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.admin.spu;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.product.controller.admin.spu.vo.*;
-import cn.newfeifan.mall.module.product.convert.spu.ProductSpuConvert;
-import cn.newfeifan.mall.module.product.dal.dataobject.sku.ProductSkuDO;
-import cn.newfeifan.mall.module.product.dal.dataobject.spu.ProductSpuDO;
-import cn.newfeifan.mall.module.product.enums.spu.ProductSpuStatusEnum;
-import cn.newfeifan.mall.module.product.service.sku.ProductSkuService;
-import cn.newfeifan.mall.module.product.service.spu.ProductSpuService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - 商品 SPU")
-@RestController
-@RequestMapping("/product/spu")
-@Validated
-public class ProductSpuController {
-
-    @Resource
-    private ProductSpuService productSpuService;
-    @Resource
-    private ProductSkuService productSkuService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建商品 SPU")
-    @PreAuthorize("@ss.hasPermission('product:spu:create')")
-    public CommonResult<Long> createProductSpu(@Valid @RequestBody ProductSpuSaveReqVO createReqVO) {
-        return success(productSpuService.createSpu(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新商品 SPU")
-    @PreAuthorize("@ss.hasPermission('product:spu:update')")
-    public CommonResult<Boolean> updateSpu(@Valid @RequestBody ProductSpuSaveReqVO updateReqVO) {
-        productSpuService.updateSpu(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-status")
-    @Operation(summary = "更新商品 SPU Status")
-    @PreAuthorize("@ss.hasPermission('product:spu:update')")
-    public CommonResult<Boolean> updateStatus(@Valid @RequestBody ProductSpuUpdateStatusReqVO updateReqVO) {
-        productSpuService.updateSpuStatus(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除商品 SPU")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('product:spu:delete')")
-    public CommonResult<Boolean> deleteSpu(@RequestParam("id") Long id) {
-        productSpuService.deleteSpu(id);
-        return success(true);
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得商品 SPU 明细")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('product:spu:query')")
-    public CommonResult<ProductSpuRespVO> getSpuDetail(@RequestParam("id") Long id) {
-        // 获得商品 SPU
-        ProductSpuDO spu = productSpuService.getSpu(id);
-        if (spu == null) {
-            return success(null);
-        }
-        // 查询商品 SKU
-        List<ProductSkuDO> skus = productSkuService.getSkuListBySpuId(spu.getId());
-        return success(ProductSpuConvert.INSTANCE.convert(spu, skus));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获得商品 SPU 精简列表")
-    @PreAuthorize("@ss.hasPermission('product:spu:query')")
-    public CommonResult<List<ProductSpuSimpleRespVO>> getSpuSimpleList() {
-        List<ProductSpuDO> list = productSpuService.getSpuListByStatus(ProductSpuStatusEnum.ENABLE.getStatus());
-        // 降序排序后，返回给前端
-        list.sort(Comparator.comparing(ProductSpuDO::getSort).reversed());
-        return success(BeanUtils.toBean(list, ProductSpuSimpleRespVO.class));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得商品 SPU 详情列表")
-    @Parameter(name = "spuIds", description = "spu 编号列表", required = true, example = "[1,2,3]")
-    @PreAuthorize("@ss.hasPermission('product:spu:query')")
-    public CommonResult<List<ProductSpuRespVO>> getSpuList(@RequestParam("spuIds") Collection<Long> spuIds) {
-        return success(ProductSpuConvert.INSTANCE.convertForSpuDetailRespListVO(
-                productSpuService.getSpuList(spuIds), productSkuService.getSkuListBySpuId(spuIds)));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得商品 SPU 分页")
-    @PreAuthorize("@ss.hasPermission('product:spu:query')")
-    public CommonResult<PageResult<ProductSpuRespVO>> getSpuPage(@Valid ProductSpuPageReqVO pageVO) {
-        PageResult<ProductSpuDO> pageResult = productSpuService.getSpuPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, ProductSpuRespVO.class));
-    }
-
-    @GetMapping("/get-count")
-    @Operation(summary = "获得商品 SPU 分页 tab count")
-    @PreAuthorize("@ss.hasPermission('product:spu:query')")
-    public CommonResult<Map<Integer, Long>> getSpuCount() {
-        return success(productSpuService.getTabsCount());
-    }
-
-    @GetMapping("/export")
-    @Operation(summary = "导出商品")
-    @PreAuthorize("@ss.hasPermission('product:spu:export')")
-    @OperateLog(type = EXPORT)
-    public void exportSpuList(@Validated ProductSpuPageReqVO reqVO,
-                               HttpServletResponse response) throws IOException {
-        reqVO.setPageSize(PAGE_SIZE_NONE);
-        List<ProductSpuDO> list = productSpuService.getSpuPage(reqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "商品列表.xls", "数据", ProductSpuRespVO.class,
-                BeanUtils.toBean(list, ProductSpuRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/article/ArticleCategoryController.java

@@ -1,84 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.article;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.promotion.controller.admin.article.vo.category.*;
-import cn.newfeifan.mall.module.promotion.convert.article.ArticleCategoryConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.article.ArticleCategoryDO;
-import cn.newfeifan.mall.module.promotion.service.article.ArticleCategoryService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 文章分类")
-@RestController
-@RequestMapping("/promotion/article-category")
-@Validated
-public class ArticleCategoryController {
-
-    @Resource
-    private ArticleCategoryService articleCategoryService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建文章分类")
-    @PreAuthorize("@ss.hasPermission('promotion:article-category:create')")
-    public CommonResult<Long> createArticleCategory(@Valid @RequestBody ArticleCategoryCreateReqVO createReqVO) {
-        return success(articleCategoryService.createArticleCategory(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新文章分类")
-    @PreAuthorize("@ss.hasPermission('promotion:article-category:update')")
-    public CommonResult<Boolean> updateArticleCategory(@Valid @RequestBody ArticleCategoryUpdateReqVO updateReqVO) {
-        articleCategoryService.updateArticleCategory(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除文章分类")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:article-category:delete')")
-    public CommonResult<Boolean> deleteArticleCategory(@RequestParam("id") Long id) {
-        articleCategoryService.deleteArticleCategory(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得文章分类")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:article-category:query')")
-    public CommonResult<ArticleCategoryRespVO> getArticleCategory(@RequestParam("id") Long id) {
-        ArticleCategoryDO category = articleCategoryService.getArticleCategory(id);
-        return success(ArticleCategoryConvert.INSTANCE.convert(category));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取文章分类精简信息列表", description = "只包含被开启的文章分类，主要用于前端的下拉选项")
-    public CommonResult<List<ArticleCategorySimpleRespVO>> getSimpleDeptList() {
-        // 获得分类列表，只要开启状态的
-        List<ArticleCategoryDO> list = articleCategoryService.getArticleCategoryListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        // 降序排序后，返回给前端
-        list.sort(Comparator.comparing(ArticleCategoryDO::getSort).reversed());
-        return success(ArticleCategoryConvert.INSTANCE.convertList03(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得文章分类分页")
-    @PreAuthorize("@ss.hasPermission('promotion:article-category:query')")
-    public CommonResult<PageResult<ArticleCategoryRespVO>> getArticleCategoryPage(@Valid ArticleCategoryPageReqVO pageVO) {
-        PageResult<ArticleCategoryDO> pageResult = articleCategoryService.getArticleCategoryPage(pageVO);
-        return success(ArticleCategoryConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/article/ArticleController.java

@@ -1,74 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.article;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.promotion.controller.admin.article.vo.article.ArticleCreateReqVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.article.vo.article.ArticlePageReqVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.article.vo.article.ArticleRespVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.article.vo.article.ArticleUpdateReqVO;
-import cn.newfeifan.mall.module.promotion.convert.article.ArticleConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.article.ArticleDO;
-import cn.newfeifan.mall.module.promotion.service.article.ArticleService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 文章管理")
-@RestController
-@RequestMapping("/promotion/article")
-@Validated
-public class ArticleController {
-
-    @Resource
-    private ArticleService articleService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建文章管理")
-    @PreAuthorize("@ss.hasPermission('promotion:article:create')")
-    public CommonResult<Long> createArticle(@Valid @RequestBody ArticleCreateReqVO createReqVO) {
-        return success(articleService.createArticle(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新文章管理")
-    @PreAuthorize("@ss.hasPermission('promotion:article:update')")
-    public CommonResult<Boolean> updateArticle(@Valid @RequestBody ArticleUpdateReqVO updateReqVO) {
-        articleService.updateArticle(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除文章管理")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:article:delete')")
-    public CommonResult<Boolean> deleteArticle(@RequestParam("id") Long id) {
-        articleService.deleteArticle(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得文章管理")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:article:query')")
-    public CommonResult<ArticleRespVO> getArticle(@RequestParam("id") Long id) {
-        ArticleDO article = articleService.getArticle(id);
-        return success(ArticleConvert.INSTANCE.convert(article));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得文章管理分页")
-    @PreAuthorize("@ss.hasPermission('promotion:article:query')")
-    public CommonResult<PageResult<ArticleRespVO>> getArticlePage(@Valid ArticlePageReqVO pageVO) {
-        PageResult<ArticleDO> pageResult = articleService.getArticlePage(pageVO);
-        return success(ArticleConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/banner/BannerController.java

@@ -1,74 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.banner;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.promotion.controller.admin.banner.vo.BannerCreateReqVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.banner.vo.BannerPageReqVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.banner.vo.BannerRespVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.banner.vo.BannerUpdateReqVO;
-import cn.newfeifan.mall.module.promotion.convert.banner.BannerConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.banner.BannerDO;
-import cn.newfeifan.mall.module.promotion.service.banner.BannerService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - Banner 管理")
-@RestController
-@RequestMapping("/promotion/banner")
-@Validated
-public class BannerController {
-
-    @Resource
-    private BannerService bannerService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建 Banner")
-    @PreAuthorize("@ss.hasPermission('promotion:banner:create')")
-    public CommonResult<Long> createBanner(@Valid @RequestBody BannerCreateReqVO createReqVO) {
-        return success(bannerService.createBanner(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新 Banner")
-    @PreAuthorize("@ss.hasPermission('promotion:banner:update')")
-    public CommonResult<Boolean> updateBanner(@Valid @RequestBody BannerUpdateReqVO updateReqVO) {
-        bannerService.updateBanner(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除 Banner")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:banner:delete')")
-    public CommonResult<Boolean> deleteBanner(@RequestParam("id") Long id) {
-        bannerService.deleteBanner(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得 Banner")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:banner:query')")
-    public CommonResult<BannerRespVO> getBanner(@RequestParam("id") Long id) {
-        BannerDO banner = bannerService.getBanner(id);
-        return success(BannerConvert.INSTANCE.convert(banner));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得 Banner 分页")
-    @PreAuthorize("@ss.hasPermission('promotion:banner:query')")
-    public CommonResult<PageResult<BannerRespVO>> getBannerPage(@Valid BannerPageReqVO pageVO) {
-        PageResult<BannerDO> pageResult = bannerService.getBannerPage(pageVO);
-        return success(BannerConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/bargain/BargainActivityController.java

@@ -1,111 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.bargain;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.admin.bargain.vo.activity.*;
-import cn.newfeifan.mall.module.promotion.convert.bargain.BargainActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.bargain.BargainActivityDO;
-import cn.newfeifan.mall.module.promotion.enums.bargain.BargainRecordStatusEnum;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainActivityService;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainHelpService;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-
-@Tag(name = "管理后台 - 砍价活动")
-@RestController
-@RequestMapping("/promotion/bargain-activity")
-@Validated
-public class BargainActivityController {
-
-    @Resource
-    private BargainActivityService bargainActivityService;
-    @Resource
-    private BargainRecordService bargainRecordService;
-    @Resource
-    private BargainHelpService bargainHelpService;
-
-    @Resource
-    private ProductSpuApi spuApi;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建砍价活动")
-    @PreAuthorize("@ss.hasPermission('promotion:bargain-activity:create')")
-    public CommonResult<Long> createBargainActivity(@Valid @RequestBody BargainActivityCreateReqVO createReqVO) {
-        return success(bargainActivityService.createBargainActivity(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新砍价活动")
-    @PreAuthorize("@ss.hasPermission('promotion:bargain-activity:update')")
-    public CommonResult<Boolean> updateBargainActivity(@Valid @RequestBody BargainActivityUpdateReqVO updateReqVO) {
-        bargainActivityService.updateBargainActivity(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/close")
-    @Operation(summary = "关闭砍价活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:bargain-activity:close')")
-    public CommonResult<Boolean> closeSeckillActivity(@RequestParam("id") Long id) {
-        bargainActivityService.closeBargainActivityById(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除砍价活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:bargain-activity:delete')")
-    public CommonResult<Boolean> deleteBargainActivity(@RequestParam("id") Long id) {
-        bargainActivityService.deleteBargainActivity(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得砍价活动")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:bargain-activity:query')")
-    public CommonResult<BargainActivityRespVO> getBargainActivity(@RequestParam("id") Long id) {
-        return success(BargainActivityConvert.INSTANCE.convert(bargainActivityService.getBargainActivity(id)));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得砍价活动分页")
-    @PreAuthorize("@ss.hasPermission('promotion:bargain-activity:query')")
-    public CommonResult<PageResult<BargainActivityPageItemRespVO>> getBargainActivityPage(
-            @Valid BargainActivityPageReqVO pageVO) {
-        // 查询砍价活动
-        PageResult<BargainActivityDO> pageResult = bargainActivityService.getBargainActivityPage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接数据
-        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(pageResult.getList(), BargainActivityDO::getSpuId));
-        // 统计数据
-        Collection<Long> activityIds = convertList(pageResult.getList(), BargainActivityDO::getId);
-        Map<Long, Integer> recordUserCountMap = bargainRecordService.getBargainRecordUserCountMap(activityIds, null);
-        Map<Long, Integer> recordSuccessUserCountMap = bargainRecordService.getBargainRecordUserCountMap(activityIds,
-                BargainRecordStatusEnum.SUCCESS.getStatus());
-        Map<Long, Integer> helpUserCountMap = bargainHelpService.getBargainHelpUserCountMapByActivity(activityIds);
-        return success(BargainActivityConvert.INSTANCE.convertPage(pageResult, spuList,
-                recordUserCountMap, recordSuccessUserCountMap, helpUserCountMap));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/bargain/BargainHelpController.java

@@ -1,55 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.bargain;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.admin.bargain.vo.help.BargainHelpPageReqVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.bargain.vo.help.BargainHelpRespVO;
-import cn.newfeifan.mall.module.promotion.convert.bargain.BargainHelpConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.bargain.BargainHelpDO;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainHelpService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 砍价助力")
-@RestController
-@RequestMapping("/promotion/bargain-help")
-@Validated
-public class BargainHelpController {
-
-    @Resource
-    private BargainHelpService bargainHelpService;
-
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得砍价助力分页")
-    @PreAuthorize("@ss.hasPermission('promotion:bargain-help:query')")
-    public CommonResult<PageResult<BargainHelpRespVO>> getBargainHelpPage(@Valid BargainHelpPageReqVO pageVO) {
-        PageResult<BargainHelpDO> pageResult = bargainHelpService.getBargainHelpPage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接数据
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(
-                convertSet(pageResult.getList(), BargainHelpDO::getUserId));
-        return success(BargainHelpConvert.INSTANCE.convertPage(pageResult, userMap));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/bargain/BargainRecordController.java

@@ -1,67 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.bargain;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.admin.bargain.vo.recrod.BargainRecordPageItemRespVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.bargain.vo.recrod.BargainRecordPageReqVO;
-import cn.newfeifan.mall.module.promotion.convert.bargain.BargainRecordConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.bargain.BargainActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.bargain.BargainRecordDO;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainActivityService;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainHelpService;
-import cn.newfeifan.mall.module.promotion.service.bargain.BargainRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 砍价记录")
-@RestController
-@RequestMapping("/promotion/bargain-record")
-@Validated
-public class BargainRecordController {
-
-    @Resource
-    private BargainRecordService bargainRecordService;
-    @Resource
-    private BargainActivityService bargainActivityService;
-    @Resource
-    private BargainHelpService bargainHelpService;
-
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得砍价记录分页")
-    @PreAuthorize("@ss.hasPermission('promotion:bargain-record:query')")
-    public CommonResult<PageResult<BargainRecordPageItemRespVO>> getBargainRecordPage(@Valid BargainRecordPageReqVO pageVO) {
-        PageResult<BargainRecordDO> pageResult = bargainRecordService.getBargainRecordPage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接数据
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(
-                convertSet(pageResult.getList(), BargainRecordDO::getUserId));
-        List<BargainActivityDO> activityList = bargainActivityService.getBargainActivityList(
-                convertSet(pageResult.getList(), BargainRecordDO::getActivityId));
-        Map<Long, Integer> helpCountMap = bargainHelpService.getBargainHelpUserCountMapByRecord(
-                convertSet(pageResult.getList(), BargainRecordDO::getId));
-        return success(BargainRecordConvert.INSTANCE.convertPage(pageResult, helpCountMap, activityList, userMap));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/combination/CombinationActivityController.java

@@ -1,118 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.combination;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.admin.combination.vo.activity.*;
-import cn.newfeifan.mall.module.promotion.convert.combination.CombinationActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationProductDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationRecordDO;
-import cn.newfeifan.mall.module.promotion.enums.combination.CombinationRecordStatusEnum;
-import cn.newfeifan.mall.module.promotion.service.combination.CombinationActivityService;
-import cn.newfeifan.mall.module.promotion.service.combination.CombinationRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.hutool.core.collection.CollectionUtil.newArrayList;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 拼团活动")
-@RestController
-@RequestMapping("/promotion/combination-activity")
-@Validated
-public class CombinationActivityController {
-
-    @Resource
-    private CombinationActivityService combinationActivityService;
-    @Resource
-    private CombinationRecordService combinationRecordService;
-
-    @Resource
-    private ProductSpuApi productSpuApi;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建拼团活动")
-    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:create')")
-    public CommonResult<Long> createCombinationActivity(@Valid @RequestBody CombinationActivityCreateReqVO createReqVO) {
-        return success(combinationActivityService.createCombinationActivity(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新拼团活动")
-    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:update')")
-    public CommonResult<Boolean> updateCombinationActivity(@Valid @RequestBody CombinationActivityUpdateReqVO updateReqVO) {
-        combinationActivityService.updateCombinationActivity(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/close")
-    @Operation(summary = "关闭拼团活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:close')")
-    public CommonResult<Boolean> closeCombinationActivity(@RequestParam("id") Long id) {
-        combinationActivityService.closeCombinationActivityById(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除拼团活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:delete')")
-    public CommonResult<Boolean> deleteCombinationActivity(@RequestParam("id") Long id) {
-        combinationActivityService.deleteCombinationActivity(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得拼团活动")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:query')")
-    public CommonResult<CombinationActivityRespVO> getCombinationActivity(@RequestParam("id") Long id) {
-        CombinationActivityDO activity = combinationActivityService.getCombinationActivity(id);
-        List<CombinationProductDO> products = combinationActivityService.getCombinationProductListByActivityIds(newArrayList(id));
-        return success(CombinationActivityConvert.INSTANCE.convert(activity, products));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得拼团活动分页")
-    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:query')")
-    public CommonResult<PageResult<CombinationActivityPageItemRespVO>> getCombinationActivityPage(
-            @Valid CombinationActivityPageReqVO pageVO) {
-        // 查询拼团活动
-        PageResult<CombinationActivityDO> pageResult = combinationActivityService.getCombinationActivityPage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 统计数据
-        Set<Long> activityIds = convertSet(pageResult.getList(), CombinationActivityDO::getId);
-        Map<Long, Integer> groupCountMap = combinationRecordService.getCombinationRecordCountMapByActivity(
-                activityIds, null, CombinationRecordDO.HEAD_ID_GROUP);
-        Map<Long, Integer> groupSuccessCountMap = combinationRecordService.getCombinationRecordCountMapByActivity(
-                activityIds, CombinationRecordStatusEnum.SUCCESS.getStatus(), CombinationRecordDO.HEAD_ID_GROUP);
-        Map<Long, Integer> recordCountMap = combinationRecordService.getCombinationRecordCountMapByActivity(
-                activityIds, null, null);
-        // 拼接数据
-        List<CombinationProductDO> products = combinationActivityService.getCombinationProductListByActivityIds(
-                convertSet(pageResult.getList(), CombinationActivityDO::getId));
-        List<ProductSpuRespDTO> spus = productSpuApi.getSpuList(
-                convertSet(pageResult.getList(), CombinationActivityDO::getSpuId));
-        return success(CombinationActivityConvert.INSTANCE.convertPage(pageResult, products,
-                groupCountMap, groupSuccessCountMap, recordCountMap, spus));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/combination/CombinationRecordController.java

@@ -1,70 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.combination;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.promotion.controller.admin.combination.vo.recrod.CombinationRecordPageItemRespVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.combination.vo.recrod.CombinationRecordReqPageVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.combination.vo.recrod.CombinationRecordSummaryVO;
-import cn.newfeifan.mall.module.promotion.convert.combination.CombinationActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationProductDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.combination.CombinationRecordDO;
-import cn.newfeifan.mall.module.promotion.enums.combination.CombinationRecordStatusEnum;
-import cn.newfeifan.mall.module.promotion.service.combination.CombinationActivityService;
-import cn.newfeifan.mall.module.promotion.service.combination.CombinationRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 拼团记录")
-@RestController
-@RequestMapping("/promotion/combination-record")
-@Validated
-public class CombinationRecordController {
-
-    @Resource
-    private CombinationActivityService combinationActivityService;
-    @Resource
-    @Lazy
-    private CombinationRecordService combinationRecordService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得拼团记录分页")
-    @PreAuthorize("@ss.hasPermission('promotion:combination-record:query')")
-    public CommonResult<PageResult<CombinationRecordPageItemRespVO>> getCombinationRecordPage(
-            @Valid CombinationRecordReqPageVO pageVO) {
-        PageResult<CombinationRecordDO> recordPage = combinationRecordService.getCombinationRecordPage(pageVO);
-        // 拼接数据
-        List<CombinationActivityDO> activities = combinationActivityService.getCombinationActivityListByIds(
-                convertSet(recordPage.getList(), CombinationRecordDO::getActivityId));
-        List<CombinationProductDO> products = combinationActivityService.getCombinationProductListByActivityIds(
-                convertSet(recordPage.getList(), CombinationRecordDO::getActivityId));
-        return success(CombinationActivityConvert.INSTANCE.convert(recordPage, activities, products));
-    }
-
-    @GetMapping("/get-summary")
-    @Operation(summary = "获得拼团记录的概要信息", description = "用于拼团记录页面展示")
-    @PreAuthorize("@ss.hasPermission('promotion:combination-record:query')")
-    public CommonResult<CombinationRecordSummaryVO> getCombinationRecordSummary() {
-        CombinationRecordSummaryVO summaryVO = new CombinationRecordSummaryVO();
-        summaryVO.setUserCount(combinationRecordService.getCombinationUserCount()); // 获取拼团用户参与数量
-        summaryVO.setSuccessCount(combinationRecordService.getCombinationRecordCount( // 获取成团记录
-                CombinationRecordStatusEnum.SUCCESS.getStatus(), null, CombinationRecordDO.HEAD_ID_GROUP));
-        summaryVO.setVirtualGroupCount(combinationRecordService.getCombinationRecordCount(// 获取虚拟成团记录
-                null, Boolean.TRUE, CombinationRecordDO.HEAD_ID_GROUP));
-        return success(summaryVO);
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/coupon/CouponController.java

@@ -1,74 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.coupon;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.collection.MapUtils;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.admin.coupon.vo.coupon.CouponPageItemRespVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.coupon.vo.coupon.CouponPageReqVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.coupon.vo.coupon.CouponSendReqVO;
-import cn.newfeifan.mall.module.promotion.convert.coupon.CouponConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.coupon.CouponDO;
-import cn.newfeifan.mall.module.promotion.service.coupon.CouponService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 优惠劵")
-@RestController
-@RequestMapping("/promotion/coupon")
-@Validated
-public class CouponController {
-
-    @Resource
-    private CouponService couponService;
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "回收优惠劵")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:coupon:delete')")
-    public CommonResult<Boolean> deleteCoupon(@RequestParam("id") Long id) {
-        couponService.deleteCoupon(id);
-        return success(true);
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得优惠劵分页")
-    @PreAuthorize("@ss.hasPermission('promotion:coupon:query')")
-    public CommonResult<PageResult<CouponPageItemRespVO>> getCouponPage(@Valid CouponPageReqVO pageVO) {
-        PageResult<CouponDO> pageResult = couponService.getCouponPage(pageVO);
-        PageResult<CouponPageItemRespVO> pageResulVO = CouponConvert.INSTANCE.convertPage(pageResult);
-        if (CollUtil.isEmpty(pageResulVO.getList())) {
-            return success(pageResulVO);
-        }
-
-        // 读取用户信息，进行拼接
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(convertSet(pageResult.getList(), CouponDO::getUserId));
-        pageResulVO.getList().forEach(itemRespVO -> MapUtils.findAndThen(userMap, itemRespVO.getUserId(),
-                userRespDTO -> itemRespVO.setNickname(userRespDTO.getNickname())));
-        return success(pageResulVO);
-    }
-
-    @PostMapping("/send")
-    @Operation(summary = "发送优惠劵")
-    @PreAuthorize("@ss.hasPermission('promotion:coupon:send')")
-    public CommonResult<Boolean> sendCoupon(@Valid @RequestBody CouponSendReqVO reqVO) {
-        couponService.takeCouponByAdmin(reqVO.getTemplateId(), reqVO.getUserIds());
-        return success(true);
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/coupon/CouponTemplateController.java

@@ -1,91 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.coupon;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.promotion.controller.admin.coupon.vo.template.*;
-import cn.newfeifan.mall.module.promotion.convert.coupon.CouponTemplateConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.coupon.CouponTemplateDO;
-import cn.newfeifan.mall.module.promotion.service.coupon.CouponTemplateService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import java.util.Collection;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 优惠劵模板")
-@RestController
-@RequestMapping("/promotion/coupon-template")
-@Validated
-public class CouponTemplateController {
-
-    @Resource
-    private CouponTemplateService couponTemplateService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建优惠劵模板")
-    @PreAuthorize("@ss.hasPermission('promotion:coupon-template:create')")
-    public CommonResult<Long> createCouponTemplate(@Valid @RequestBody CouponTemplateCreateReqVO createReqVO) {
-        return success(couponTemplateService.createCouponTemplate(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新优惠劵模板")
-    @PreAuthorize("@ss.hasPermission('promotion:coupon-template:update')")
-    public CommonResult<Boolean> updateCouponTemplate(@Valid @RequestBody CouponTemplateUpdateReqVO updateReqVO) {
-        couponTemplateService.updateCouponTemplate(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-status")
-    @Operation(summary = "更新优惠劵模板状态")
-    @PreAuthorize("@ss.hasPermission('promotion:coupon-template:update')")
-    public CommonResult<Boolean> updateCouponTemplateStatus(@Valid @RequestBody CouponTemplateUpdateStatusReqVO reqVO) {
-        couponTemplateService.updateCouponTemplateStatus(reqVO.getId(), reqVO.getStatus());
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除优惠劵模板")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:coupon-template:delete')")
-    public CommonResult<Boolean> deleteCouponTemplate(@RequestParam("id") Long id) {
-        couponTemplateService.deleteCouponTemplate(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得优惠劵模板")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:coupon-template:query')")
-    public CommonResult<CouponTemplateRespVO> getCouponTemplate(@RequestParam("id") Long id) {
-        CouponTemplateDO couponTemplate = couponTemplateService.getCouponTemplate(id);
-        return success(CouponTemplateConvert.INSTANCE.convert(couponTemplate));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得优惠劵模板分页")
-    @PreAuthorize("@ss.hasPermission('promotion:coupon-template:query')")
-    public CommonResult<PageResult<CouponTemplateRespVO>> getCouponTemplatePage(@Valid CouponTemplatePageReqVO pageVO) {
-        PageResult<CouponTemplateDO> pageResult = couponTemplateService.getCouponTemplatePage(pageVO);
-        return success(CouponTemplateConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得优惠劵模板列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('promotion:coupon-template:query')")
-    public CommonResult<List<CouponTemplateRespVO>> getCouponTemplateList(@RequestParam("ids") Collection<Long> ids) {
-        List<CouponTemplateDO> list = couponTemplateService.getCouponTemplateList(ids);
-        return success(CouponTemplateConvert.INSTANCE.convertList(list));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/discount/DiscountActivityController.java

@@ -1,105 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.discount;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.admin.discount.vo.*;
-import cn.newfeifan.mall.module.promotion.convert.discount.DiscountActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.discount.DiscountActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.discount.DiscountProductDO;
-import cn.newfeifan.mall.module.promotion.service.discount.DiscountActivityService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 限时折扣活动")
-@RestController
-@RequestMapping("/promotion/discount-activity")
-@Validated
-public class DiscountActivityController {
-
-    @Resource
-    private DiscountActivityService discountActivityService;
-
-    @Resource
-    private ProductSpuApi productSpuApi;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建限时折扣活动")
-    @PreAuthorize("@ss.hasPermission('promotion:discount-activity:create')")
-    public CommonResult<Long> createDiscountActivity(@Valid @RequestBody DiscountActivityCreateReqVO createReqVO) {
-        return success(discountActivityService.createDiscountActivity(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新限时折扣活动")
-    @PreAuthorize("@ss.hasPermission('promotion:discount-activity:update')")
-    public CommonResult<Boolean> updateDiscountActivity(@Valid @RequestBody DiscountActivityUpdateReqVO updateReqVO) {
-        discountActivityService.updateDiscountActivity(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/close")
-    @Operation(summary = "关闭限时折扣活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:discount-activity:close')")
-    public CommonResult<Boolean> closeRewardActivity(@RequestParam("id") Long id) {
-        discountActivityService.closeDiscountActivity(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除限时折扣活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:discount-activity:delete')")
-    public CommonResult<Boolean> deleteDiscountActivity(@RequestParam("id") Long id) {
-        discountActivityService.deleteDiscountActivity(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得限时折扣活动")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:discount-activity:query')")
-    public CommonResult<DiscountActivityDetailRespVO> getDiscountActivity(@RequestParam("id") Long id) {
-        DiscountActivityDO discountActivity = discountActivityService.getDiscountActivity(id);
-        if (discountActivity == null) {
-            return success(null);
-        }
-        // 拼接结果
-        List<DiscountProductDO> discountProducts = discountActivityService.getDiscountProductsByActivityId(id);
-        return success(DiscountActivityConvert.INSTANCE.convert(discountActivity, discountProducts));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得限时折扣活动分页")
-    @PreAuthorize("@ss.hasPermission('promotion:discount-activity:query')")
-    public CommonResult<PageResult<DiscountActivityRespVO>> getDiscountActivityPage(@Valid DiscountActivityPageReqVO pageVO) {
-        PageResult<DiscountActivityDO> pageResult = discountActivityService.getDiscountActivityPage(pageVO);
-
-        if (CollUtil.isEmpty(pageResult.getList())) { // TODO @zhangshuai：方法里的空行，目的是让代码分块，可以更清晰；所以上面这个空格可以不要，而下面判断之后的，空格，其实加下比较好；类似的还有 spuList、以及后面的 convert
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-        // 拼接数据
-        List<DiscountProductDO> products = discountActivityService.getDiscountProductsByActivityId(
-                convertSet(pageResult.getList(), DiscountActivityDO::getId));
-
-        List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(
-                convertSet(products, DiscountProductDO::getSpuId));
-
-        return success(DiscountActivityConvert.INSTANCE.convertPage(pageResult, products, spuList));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/diy/DiyPageController.java

@@ -1,99 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.diy;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.promotion.controller.admin.diy.vo.page.*;
-import cn.newfeifan.mall.module.promotion.convert.diy.DiyPageConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.diy.DiyPageDO;
-import cn.newfeifan.mall.module.promotion.service.diy.DiyPageService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 装修页面")
-@RestController
-@RequestMapping("/promotion/diy-page")
-@Validated
-public class DiyPageController {
-
-    @Resource
-    private DiyPageService diyPageService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建装修页面")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-page:create')")
-    public CommonResult<Long> createDiyPage(@Valid @RequestBody DiyPageCreateReqVO createReqVO) {
-        return success(diyPageService.createDiyPage(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新装修页面")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-page:update')")
-    public CommonResult<Boolean> updateDiyPage(@Valid @RequestBody DiyPageUpdateReqVO updateReqVO) {
-        diyPageService.updateDiyPage(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除装修页面")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:diy-page:delete')")
-    public CommonResult<Boolean> deleteDiyPage(@RequestParam("id") Long id) {
-        diyPageService.deleteDiyPage(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得装修页面")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-page:query')")
-    public CommonResult<DiyPageRespVO> getDiyPage(@RequestParam("id") Long id) {
-        DiyPageDO diyPage = diyPageService.getDiyPage(id);
-        return success(DiyPageConvert.INSTANCE.convert(diyPage));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得装修页面列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-page:query')")
-    public CommonResult<List<DiyPageRespVO>> getDiyPageList(@RequestParam("ids") Collection<Long> ids) {
-        List<DiyPageDO> list = diyPageService.getDiyPageList(ids);
-        return success(DiyPageConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得装修页面分页")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-page:query')")
-    public CommonResult<PageResult<DiyPageRespVO>> getDiyPagePage(@Valid DiyPagePageReqVO pageVO) {
-        PageResult<DiyPageDO> pageResult = diyPageService.getDiyPagePage(pageVO);
-        return success(DiyPageConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/get-property")
-    @Operation(summary = "获得装修页面属性")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-page:query')")
-    public CommonResult<DiyPagePropertyRespVO> getDiyPageProperty(@RequestParam("id") Long id) {
-        DiyPageDO diyPage = diyPageService.getDiyPage(id);
-        return success(DiyPageConvert.INSTANCE.convertPropertyVo(diyPage));
-    }
-
-    @PutMapping("/update-property")
-    @Operation(summary = "更新装修页面属性")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-page:update')")
-    public CommonResult<Boolean> updateDiyPageProperty(@Valid @RequestBody DiyPagePropertyUpdateRequestVO updateReqVO) {
-        diyPageService.updateDiyPageProperty(updateReqVO);
-        return success(true);
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/diy/DiyTemplateController.java

@@ -1,105 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.diy;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.promotion.controller.admin.diy.vo.template.*;
-import cn.newfeifan.mall.module.promotion.convert.diy.DiyTemplateConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.diy.DiyPageDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.diy.DiyTemplateDO;
-import cn.newfeifan.mall.module.promotion.service.diy.DiyPageService;
-import cn.newfeifan.mall.module.promotion.service.diy.DiyTemplateService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 装修模板")
-@RestController
-@RequestMapping("/promotion/diy-template")
-@Validated
-public class DiyTemplateController {
-
-    @Resource
-    private DiyTemplateService diyTemplateService;
-    @Resource
-    private DiyPageService diyPageService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建装修模板")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-template:create')")
-    public CommonResult<Long> createDiyTemplate(@Valid @RequestBody DiyTemplateCreateReqVO createReqVO) {
-        return success(diyTemplateService.createDiyTemplate(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新装修模板")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-template:update')")
-    public CommonResult<Boolean> updateDiyTemplate(@Valid @RequestBody DiyTemplateUpdateReqVO updateReqVO) {
-        diyTemplateService.updateDiyTemplate(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/use")
-    @Operation(summary = "使用装修模板")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-template:use')")
-    public CommonResult<Boolean> useDiyTemplate(@RequestParam("id") Long id) {
-        diyTemplateService.useDiyTemplate(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除装修模板")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:diy-template:delete')")
-    public CommonResult<Boolean> deleteDiyTemplate(@RequestParam("id") Long id) {
-        diyTemplateService.deleteDiyTemplate(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得装修模板")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-template:query')")
-    public CommonResult<DiyTemplateRespVO> getDiyTemplate(@RequestParam("id") Long id) {
-        DiyTemplateDO diyTemplate = diyTemplateService.getDiyTemplate(id);
-        return success(DiyTemplateConvert.INSTANCE.convert(diyTemplate));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得装修模板分页")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-template:query')")
-    public CommonResult<PageResult<DiyTemplateRespVO>> getDiyTemplatePage(@Valid DiyTemplatePageReqVO pageVO) {
-        PageResult<DiyTemplateDO> pageResult = diyTemplateService.getDiyTemplatePage(pageVO);
-        return success(DiyTemplateConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    // TODO @疯狂：这个要不和 getDiyTemplate 合并，然后 DiyTemplateRespVO 里面直接把 DiyPagePropertyRespVO 也加上。减少 VO 好了，管理后台 get 多返回点数据，也问题不大的。目的，还是想尽可能降低大家的理解成本哈；
-    @GetMapping("/get-property")
-    @Operation(summary = "获得装修模板属性")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-template:query')")
-    public CommonResult<DiyTemplatePropertyRespVO> getDiyTemplateProperty(@RequestParam("id") Long id) {
-        DiyTemplateDO diyTemplate = diyTemplateService.getDiyTemplate(id);
-        List<DiyPageDO> pages = diyPageService.getDiyPageByTemplateId(id);
-        return success(DiyTemplateConvert.INSTANCE.convertPropertyVo(diyTemplate, pages));
-    }
-
-    // TODO @疯狂：这个接口，要不和 useDiyTemplate 合并成一个，然后 VO 改成我们新的 VO 规范。不改的字段，就不传递。
-    @PutMapping("/update-property")
-    @Operation(summary = "更新装修模板属性")
-    @PreAuthorize("@ss.hasPermission('promotion:diy-template:update')")
-    public CommonResult<Boolean> updateDiyTemplateProperty(@Valid @RequestBody DiyTemplatePropertyUpdateRequestVO updateReqVO) {
-        diyTemplateService.updateDiyTemplateProperty(updateReqVO);
-        return success(true);
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/reward/RewardActivityController.java

@@ -1,83 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.reward;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.reward.vo.RewardActivityRespVO;
-import cn.newfeifan.mall.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
-import cn.newfeifan.mall.module.promotion.convert.reward.RewardActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.reward.RewardActivityDO;
-import cn.newfeifan.mall.module.promotion.service.reward.RewardActivityService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 满减送活动")
-@RestController
-@RequestMapping("/promotion/reward-activity")
-@Validated
-public class RewardActivityController {
-
-    @Resource
-    private RewardActivityService rewardActivityService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建满减送活动")
-    @PreAuthorize("@ss.hasPermission('promotion:reward-activity:create')")
-    public CommonResult<Long> createRewardActivity(@Valid @RequestBody RewardActivityCreateReqVO createReqVO) {
-        return success(rewardActivityService.createRewardActivity(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新满减送活动")
-    @PreAuthorize("@ss.hasPermission('promotion:reward-activity:update')")
-    public CommonResult<Boolean> updateRewardActivity(@Valid @RequestBody RewardActivityUpdateReqVO updateReqVO) {
-        rewardActivityService.updateRewardActivity(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/close")
-    @Operation(summary = "关闭满减送活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:reward-activity:close')")
-    public CommonResult<Boolean> closeRewardActivity(@RequestParam("id") Long id) {
-        rewardActivityService.closeRewardActivity(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除满减送活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:reward-activity:delete')")
-    public CommonResult<Boolean> deleteRewardActivity(@RequestParam("id") Long id) {
-        rewardActivityService.deleteRewardActivity(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得满减送活动")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:reward-activity:query')")
-    public CommonResult<RewardActivityRespVO> getRewardActivity(@RequestParam("id") Long id) {
-        RewardActivityDO rewardActivity = rewardActivityService.getRewardActivity(id);
-        return success(RewardActivityConvert.INSTANCE.convert(rewardActivity));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得满减送活动分页")
-    @PreAuthorize("@ss.hasPermission('promotion:reward-activity:query')")
-    public CommonResult<PageResult<RewardActivityRespVO>> getRewardActivityPage(@Valid RewardActivityPageReqVO pageVO) {
-        PageResult<RewardActivityDO> pageResult = rewardActivityService.getRewardActivityPage(pageVO);
-        return success(RewardActivityConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/seckill/SeckillActivityController.java

@@ -1,99 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.seckill;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.promotion.controller.admin.seckill.vo.activity.*;
-import cn.newfeifan.mall.module.promotion.convert.seckill.seckillactivity.SeckillActivityConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.seckill.SeckillActivityDO;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.seckill.SeckillProductDO;
-import cn.newfeifan.mall.module.promotion.service.seckill.SeckillActivityService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 秒杀活动")
-@RestController
-@RequestMapping("/promotion/seckill-activity")
-@Validated
-public class SeckillActivityController {
-
-    @Resource
-    private SeckillActivityService seckillActivityService;
-    @Resource
-    private ProductSpuApi productSpuApi;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建秒杀活动")
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-activity:create')")
-    public CommonResult<Long> createSeckillActivity(@Valid @RequestBody SeckillActivityCreateReqVO createReqVO) {
-        return success(seckillActivityService.createSeckillActivity(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新秒杀活动")
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-activity:update')")
-    public CommonResult<Boolean> updateSeckillActivity(@Valid @RequestBody SeckillActivityUpdateReqVO updateReqVO) {
-        seckillActivityService.updateSeckillActivity(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/close")
-    @Operation(summary = "关闭秒杀活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-activity:close')")
-    public CommonResult<Boolean> closeSeckillActivity(@RequestParam("id") Long id) {
-        seckillActivityService.closeSeckillActivity(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除秒杀活动")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-activity:delete')")
-    public CommonResult<Boolean> deleteSeckillActivity(@RequestParam("id") Long id) {
-        seckillActivityService.deleteSeckillActivity(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得秒杀活动")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-activity:query')")
-    public CommonResult<SeckillActivityDetailRespVO> getSeckillActivity(@RequestParam("id") Long id) {
-        SeckillActivityDO activity = seckillActivityService.getSeckillActivity(id);
-        List<SeckillProductDO> products = seckillActivityService.getSeckillProductListByActivityId(id);
-        return success(SeckillActivityConvert.INSTANCE.convert(activity, products));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得秒杀活动分页")
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-activity:query')")
-    public CommonResult<PageResult<SeckillActivityRespVO>> getSeckillActivityPage(@Valid SeckillActivityPageReqVO pageVO) {
-        // 查询活动列表
-        PageResult<SeckillActivityDO> pageResult = seckillActivityService.getSeckillActivityPage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接数据
-        List<SeckillProductDO> products = seckillActivityService.getSeckillProductListByActivityId(
-                convertSet(pageResult.getList(), SeckillActivityDO::getId));
-        List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(
-                convertSet(pageResult.getList(), SeckillActivityDO::getSpuId));
-        return success(SeckillActivityConvert.INSTANCE.convertPage(pageResult, products, spuList));
-    }
-
-}

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/seckill/SeckillConfigController.java

@@ -1,97 +0,0 @@
-package cn.newfeifan.mall.module.promotion.controller.admin.seckill;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.promotion.controller.admin.seckill.vo.config.*;
-import cn.newfeifan.mall.module.promotion.convert.seckill.seckillconfig.SeckillConfigConvert;
-import cn.newfeifan.mall.module.promotion.dal.dataobject.seckill.SeckillConfigDO;
-import cn.newfeifan.mall.module.promotion.service.seckill.SeckillConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 秒杀时段")
-@RestController
-@RequestMapping("/promotion/seckill-config")
-@Validated
-public class SeckillConfigController {
-
-    @Resource
-    private SeckillConfigService seckillConfigService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建秒杀时段")
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-config:create')")
-    public CommonResult<Long> createSeckillConfig(@Valid @RequestBody SeckillConfigCreateReqVO createReqVO) {
-        return success(seckillConfigService.createSeckillConfig(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新秒杀时段")
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-config:update')")
-    public CommonResult<Boolean> updateSeckillConfig(@Valid @RequestBody SeckillConfigUpdateReqVO updateReqVO) {
-        seckillConfigService.updateSeckillConfig(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-status")
-    @Operation(summary = "修改时段配置状态")
-    @PreAuthorize("@ss.hasPermission('system:seckill-config:update')")
-    public CommonResult<Boolean> updateSeckillConfigStatus(@Valid @RequestBody SeckillConfigUpdateStatusReqVo reqVO) {
-        seckillConfigService.updateSeckillConfigStatus(reqVO.getId(), reqVO.getStatus());
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除秒杀时段")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-config:delete')")
-    public CommonResult<Boolean> deleteSeckillConfig(@RequestParam("id") Long id) {
-        seckillConfigService.deleteSeckillConfig(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得秒杀时段")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-config:query')")
-    public CommonResult<SeckillConfigRespVO> getSeckillConfig(@RequestParam("id") Long id) {
-        SeckillConfigDO seckillConfig = seckillConfigService.getSeckillConfig(id);
-        return success(SeckillConfigConvert.INSTANCE.convert(seckillConfig));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得所有秒杀时段列表")
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-config:query')")
-    public CommonResult<List<SeckillConfigRespVO>> getSeckillConfigList() {
-        List<SeckillConfigDO> list = seckillConfigService.getSeckillConfigList();
-        return success(SeckillConfigConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获得所有开启状态的秒杀时段精简列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<SeckillConfigSimpleRespVO>> getListAllSimple() {
-        List<SeckillConfigDO> list = seckillConfigService.getSeckillConfigListByStatus(
-                CommonStatusEnum.ENABLE.getStatus());
-        return success(SeckillConfigConvert.INSTANCE.convertList1(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得秒杀时间段分页")
-    @PreAuthorize("@ss.hasPermission('promotion:seckill-config:query')")
-    public CommonResult<PageResult<SeckillConfigRespVO>> getSeckillActivityPage(@Valid SeckillConfigPageReqVO pageVO) {
-        PageResult<SeckillConfigDO> pageResult = seckillConfigService.getSeckillConfigPage(pageVO);
-        return success(SeckillConfigConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-mall/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/sale/controller/admin/shop/ShopController.java

@@ -1,95 +0,0 @@
-package cn.newfeifan.mall.module.sale.controller.admin.shop;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.newfeifan.mall.module.sale.controller.admin.shop.vo.*;
-import cn.newfeifan.mall.module.sale.dal.dataobject.shop.ShopDO;
-import cn.newfeifan.mall.module.sale.service.shop.ShopService;
-
-@Tag(name = "管理后台 - 店铺")
-@RestController
-@RequestMapping("/sale/shop")
-@Validated
-public class ShopController {
-
-    @Resource
-    private ShopService shopService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建店铺")
-    @PreAuthorize("@ss.hasPermission('sale:shop:create')")
-    public CommonResult<Long> createShop(@Valid @RequestBody ShopSaveReqVO createReqVO) {
-        return success(shopService.createShop(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新店铺")
-    @PreAuthorize("@ss.hasPermission('sale:shop:update')")
-    public CommonResult<Boolean> updateShop(@Valid @RequestBody ShopSaveReqVO updateReqVO) {
-        shopService.updateShop(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除店铺")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('sale:shop:delete')")
-    public CommonResult<Boolean> deleteShop(@RequestParam("id") Long id) {
-        shopService.deleteShop(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得店铺")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('sale:shop:query')")
-    public CommonResult<ShopRespVO> getShop(@RequestParam("id") Long id) {
-        ShopDO shop = shopService.getShop(id);
-        return success(BeanUtils.toBean(shop, ShopRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得店铺分页")
-    @PreAuthorize("@ss.hasPermission('sale:shop:query')")
-    public CommonResult<PageResult<ShopRespVO>> getShopPage(@Valid ShopPageReqVO pageReqVO) {
-        PageResult<ShopDO> pageResult = shopService.getShopPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, ShopRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出店铺 Excel")
-    @PreAuthorize("@ss.hasPermission('sale:shop:export')")
-    @OperateLog(type = EXPORT)
-    public void exportShopExcel(@Valid ShopPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<ShopDO> list = shopService.getShopPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "店铺.xls", "数据", ShopRespVO.class,
-                        BeanUtils.toBean(list, ShopRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/controller/admin/member/MemberStatisticsController.java

@@ -1,121 +0,0 @@
-package cn.newfeifan.mall.module.statistics.controller.admin.member;
-
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.newfeifan.mall.framework.common.enums.UserTypeEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
-import cn.newfeifan.mall.module.statistics.controller.admin.member.vo.*;
-import cn.newfeifan.mall.module.statistics.convert.member.MemberStatisticsConvert;
-import cn.newfeifan.mall.module.statistics.service.infra.ApiAccessLogStatisticsService;
-import cn.newfeifan.mall.module.statistics.service.member.MemberStatisticsService;
-import cn.newfeifan.mall.module.statistics.service.trade.TradeOrderStatisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员统计")
-@RestController
-@RequestMapping("/statistics/member")
-@Validated
-@Slf4j
-public class MemberStatisticsController {
-
-    @Resource
-    private MemberStatisticsService memberStatisticsService;
-    @Resource
-    private TradeOrderStatisticsService tradeOrderStatisticsService;
-    @Resource
-    private ApiAccessLogStatisticsService apiAccessLogStatisticsService;
-
-    // TODO 非繁人：已经 review
-    @GetMapping("/summary")
-    @Operation(summary = "获得会员统计（实时统计）")
-    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
-    public CommonResult<MemberSummaryRespVO> getMemberSummary() {
-        return success(memberStatisticsService.getMemberSummary());
-    }
-
-    // TODO 非繁人：已经 review
-    @GetMapping("/analyse")
-    @Operation(summary = "获得会员分析数据")
-    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
-    public CommonResult<MemberAnalyseRespVO> getMemberAnalyse(MemberAnalyseReqVO reqVO) {
-        // 1. 查询数据
-        LocalDateTime beginTime = ArrayUtil.get(reqVO.getTimes(), 0);
-        LocalDateTime endTime = ArrayUtil.get(reqVO.getTimes(), 1);
-        // 1.1 查询分析对照数据
-        DataComparisonRespVO<MemberAnalyseDataRespVO> comparisonData = memberStatisticsService.getMemberAnalyseComparisonData(beginTime, endTime);
-        // TODO @疯狂：这个可能有点特殊，要按照 create_time 来查询；不然它的漏斗就不统一；因为是访问数量 > 今日下单人 > 今日支付人；是一个统一的维度；
-        // 1.2 查询成交用户数量
-        Integer payUserCount = tradeOrderStatisticsService.getPayUserCount(beginTime, endTime);
-        // 1.3 计算客单价
-        int atv = 0;
-        if (payUserCount != null && payUserCount > 0) {
-            // TODO @疯狂：类似上面的 payUserCount
-            Integer payPrice = tradeOrderStatisticsService.getOrderPayPrice(beginTime, endTime);
-            atv = NumberUtil.div(payPrice, payUserCount).intValue();
-        }
-        // 1.4 查询访客数量
-        Integer visitUserCount = apiAccessLogStatisticsService.getIpCount(UserTypeEnum.MEMBER.getValue(), beginTime, endTime);
-        // 1.5 下单用户数量
-        Integer orderUserCount = tradeOrderStatisticsService.getOrderUserCount(beginTime, endTime);
-
-        // 2. 拼接返回
-        return success(MemberStatisticsConvert.INSTANCE.convert(visitUserCount, orderUserCount, payUserCount, atv, comparisonData));
-    }
-
-    // TODO 非繁人：已经 review
-    @GetMapping("/area-statistics-list")
-    @Operation(summary = "按照省份，获得会员统计列表")
-    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
-    public CommonResult<List<MemberAreaStatisticsRespVO>> getMemberAreaStatisticsList() {
-        return success(memberStatisticsService.getMemberAreaStatisticsList());
-    }
-
-    // TODO 非繁人：已经 review
-    @GetMapping("/sex-statistics-list")
-    @Operation(summary = "按照性别，获得会员统计列表")
-    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
-    public CommonResult<List<MemberSexStatisticsRespVO>> getMemberSexStatisticsList() {
-        return success(memberStatisticsService.getMemberSexStatisticsList());
-    }
-
-    // TODO 非繁人：已经 review
-    @GetMapping("/terminal-statistics-list")
-    @Operation(summary = "按照终端，获得会员统计列表")
-    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
-    public CommonResult<List<MemberTerminalStatisticsRespVO>> getMemberTerminalStatisticsList() {
-        return success(memberStatisticsService.getMemberTerminalStatisticsList());
-    }
-
-    // TODO 非繁人：已经 review
-    // TODO @疯狂：要注意 date 的排序；
-    @GetMapping("/user-count-comparison")
-    @Operation(summary = "获得用户数量对照")
-    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
-    public CommonResult<DataComparisonRespVO<MemberCountRespVO>> getUserCountComparison() {
-        return success(memberStatisticsService.getUserCountComparison());
-    }
-
-    // TODO 非繁人：已经 review
-    @GetMapping("/register-count-list")
-    @Operation(summary = "获得会员注册数量列表")
-    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
-    public CommonResult<List<MemberRegisterCountRespVO>> getMemberRegisterCountList(MemberAnalyseReqVO reqVO) {
-        return success(memberStatisticsService.getMemberRegisterCountList(
-                ArrayUtil.get(reqVO.getTimes(), 0), ArrayUtil.get(reqVO.getTimes(), 1)));
-    }
-
-}

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/controller/admin/pay/PayStatisticsController.java

@@ -1,36 +0,0 @@
-package cn.newfeifan.mall.module.statistics.controller.admin.pay;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.statistics.controller.admin.pay.vo.PaySummaryRespVO;
-import cn.newfeifan.mall.module.statistics.convert.pay.PayStatisticsConvert;
-import cn.newfeifan.mall.module.statistics.service.pay.PayWalletStatisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 支付统计")
-@RestController
-@RequestMapping("/statistics/pay")
-@Validated
-@Slf4j
-public class PayStatisticsController {
-
-    @Resource
-    private PayWalletStatisticsService payWalletStatisticsService;
-
-    @GetMapping("/summary")
-    @Operation(summary = "获取充值金额")
-    public CommonResult<PaySummaryRespVO> getWalletRechargePrice() {
-        Integer rechargePrice = payWalletStatisticsService.getRechargePriceSummary();
-        return success(PayStatisticsConvert.INSTANCE.convert(rechargePrice));
-    }
-
-}

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/controller/admin/product/ProductStatisticsController.java

@@ -1,86 +0,0 @@
-package cn.newfeifan.mall.module.statistics.controller.admin.product;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.SortablePageParam;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.module.product.api.spu.ProductSpuApi;
-import cn.newfeifan.mall.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.newfeifan.mall.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
-import cn.newfeifan.mall.module.statistics.controller.admin.product.vo.ProductStatisticsReqVO;
-import cn.newfeifan.mall.module.statistics.controller.admin.product.vo.ProductStatisticsRespVO;
-import cn.newfeifan.mall.module.statistics.dal.dataobject.product.ProductStatisticsDO;
-import cn.newfeifan.mall.module.statistics.service.product.ProductStatisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertMap;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 商品统计")
-@RestController
-@RequestMapping("/statistics/product")
-@Validated
-public class ProductStatisticsController {
-
-    @Resource
-    private ProductStatisticsService productStatisticsService;
-
-    @Resource
-    private ProductSpuApi productSpuApi;
-
-    @GetMapping("/analyse")
-    @Operation(summary = "获得商品统计分析")
-    @PreAuthorize("@ss.hasPermission('statistics:product:query')")
-    public CommonResult<DataComparisonRespVO<ProductStatisticsRespVO>> getProductStatisticsAnalyse(ProductStatisticsReqVO reqVO) {
-        return success(productStatisticsService.getProductStatisticsAnalyse(reqVO));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得商品统计明细（日期维度）")
-    @PreAuthorize("@ss.hasPermission('statistics:product:query')")
-    public CommonResult<List<ProductStatisticsRespVO>> getProductStatisticsList(ProductStatisticsReqVO reqVO) {
-        List<ProductStatisticsDO> list = productStatisticsService.getProductStatisticsList(reqVO);
-        return success(BeanUtils.toBean(list, ProductStatisticsRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出获得商品统计明细 Excel（日期维度）")
-    @PreAuthorize("@ss.hasPermission('statistics:product:export')")
-    public void exportProductStatisticsExcel(ProductStatisticsReqVO reqVO, HttpServletResponse response) throws IOException {
-        List<ProductStatisticsDO> list = productStatisticsService.getProductStatisticsList(reqVO);
-        // 导出 Excel
-        List<ProductStatisticsRespVO> voList = BeanUtils.toBean(list, ProductStatisticsRespVO.class);
-        ExcelUtils.write(response, "商品状况.xls", "数据", ProductStatisticsRespVO.class, voList);
-    }
-
-    @GetMapping("/rank-page")
-    @Operation(summary = "获得商品统计排行榜分页（商品维度）")
-    @PreAuthorize("@ss.hasPermission('statistics:product:query')")
-    public CommonResult<PageResult<ProductStatisticsRespVO>> getProductStatisticsRankPage(@Valid ProductStatisticsReqVO reqVO,
-                                                                                          @Valid SortablePageParam pageParam) {
-        PageResult<ProductStatisticsDO> pageResult = productStatisticsService.getProductStatisticsRankPage(reqVO, pageParam);
-        // 处理商品信息
-        Set<Long> spuIds = convertSet(pageResult.getList(), ProductStatisticsDO::getSpuId);
-        Map<Long, ProductSpuRespDTO> spuMap = convertMap(productSpuApi.getSpuList(spuIds), ProductSpuRespDTO::getId);
-        return success(BeanUtils.toBean(pageResult, ProductStatisticsRespVO.class,
-                item -> Optional.ofNullable(spuMap.get(item.getSpuId()))
-                        .ifPresent(spu -> item.setName(spu.getName()).setPicUrl(spu.getPicUrl()))));
-    }
-
-}

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/controller/admin/trade/TradeStatisticsController.java

@@ -1,130 +0,0 @@
-package cn.newfeifan.mall.module.statistics.controller.admin.trade;
-
-import cn.hutool.core.util.ArrayUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
-import cn.newfeifan.mall.module.statistics.controller.admin.trade.vo.*;
-import cn.newfeifan.mall.module.statistics.convert.trade.TradeStatisticsConvert;
-import cn.newfeifan.mall.module.statistics.dal.dataobject.trade.TradeStatisticsDO;
-import cn.newfeifan.mall.module.statistics.service.trade.AfterSaleStatisticsService;
-import cn.newfeifan.mall.module.statistics.service.trade.BrokerageStatisticsService;
-import cn.newfeifan.mall.module.statistics.service.trade.TradeOrderStatisticsService;
-import cn.newfeifan.mall.module.statistics.service.trade.TradeStatisticsService;
-import cn.newfeifan.mall.module.statistics.service.trade.bo.TradeSummaryRespBO;
-import cn.newfeifan.mall.module.trade.enums.aftersale.AfterSaleStatusEnum;
-import cn.newfeifan.mall.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
-import cn.newfeifan.mall.module.trade.enums.delivery.DeliveryTypeEnum;
-import cn.newfeifan.mall.module.trade.enums.order.TradeOrderStatusEnum;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 交易统计")
-@RestController
-@RequestMapping("/statistics/trade")
-@Validated
-@Slf4j
-public class TradeStatisticsController {
-
-    @Resource
-    private TradeStatisticsService tradeStatisticsService;
-    @Resource
-    private TradeOrderStatisticsService tradeOrderStatisticsService;
-    @Resource
-    private AfterSaleStatisticsService afterSaleStatisticsService;
-    @Resource
-    private BrokerageStatisticsService brokerageStatisticsService;
-
-    @GetMapping("/summary")
-    @Operation(summary = "获得交易统计")
-    @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
-    public CommonResult<DataComparisonRespVO<TradeSummaryRespVO>> getTradeSummaryComparison() {
-        // 1.1 昨天的数据
-        TradeSummaryRespBO yesterdayData = tradeStatisticsService.getTradeSummaryByDays(-1);
-        // 1.2 前天的数据（用于对照昨天的数据）
-        TradeSummaryRespBO beforeYesterdayData = tradeStatisticsService.getTradeSummaryByDays(-2);
-
-        // 2.1 本月数据
-        TradeSummaryRespBO monthData = tradeStatisticsService.getTradeSummaryByMonths(0);
-        // 2.2 上月数据（用于对照本月的数据）
-        TradeSummaryRespBO lastMonthData = tradeStatisticsService.getTradeSummaryByMonths(-1);
-        // 拼接数据
-        return success(TradeStatisticsConvert.INSTANCE.convert(yesterdayData, beforeYesterdayData, monthData, lastMonthData));
-    }
-
-    @GetMapping("/analyse")
-    @Operation(summary = "获得交易状况统计")
-    @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
-    public CommonResult<DataComparisonRespVO<TradeTrendSummaryRespVO>> getTradeStatisticsAnalyse(TradeTrendReqVO reqVO) {
-        return success(tradeStatisticsService.getTradeStatisticsAnalyse(ArrayUtil.get(reqVO.getTimes(), 0),
-                ArrayUtil.get(reqVO.getTimes(), 1)));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得交易状况明细")
-    @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
-    public CommonResult<List<TradeTrendSummaryRespVO>> getTradeStatisticsList(TradeTrendReqVO reqVO) {
-        List<TradeStatisticsDO> list = tradeStatisticsService.getTradeStatisticsList(ArrayUtil.get(reqVO.getTimes(), 0),
-                ArrayUtil.get(reqVO.getTimes(), 1));
-        return success(TradeStatisticsConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出获得交易状况明细 Excel")
-    @PreAuthorize("@ss.hasPermission('statistics:trade:export')")
-    public void exportTradeStatisticsExcel(TradeTrendReqVO reqVO, HttpServletResponse response) throws IOException {
-        List<TradeStatisticsDO> list = tradeStatisticsService.getTradeStatisticsList(ArrayUtil.get(reqVO.getTimes(), 0),
-                ArrayUtil.get(reqVO.getTimes(), 1));
-        // 导出 Excel
-        List<TradeTrendSummaryRespVO> voList = TradeStatisticsConvert.INSTANCE.convertList(list);
-        List<TradeTrendSummaryExcelVO> data = TradeStatisticsConvert.INSTANCE.convertList02(voList);
-        ExcelUtils.write(response, "交易状况.xls", "数据", TradeTrendSummaryExcelVO.class, data);
-    }
-
-    @GetMapping("/order-count")
-    @Operation(summary = "获得交易订单数量")
-    @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
-    public CommonResult<TradeOrderCountRespVO> getOrderCount() {
-        // 订单统计
-        Long undeliveredCount = tradeOrderStatisticsService.getCountByStatusAndDeliveryType(
-                TradeOrderStatusEnum.UNDELIVERED.getStatus(), DeliveryTypeEnum.EXPRESS.getType());
-        // TODO @疯狂：订单支付后，如果是门店自提的，需要 update 成 DELIVERED；；目前还没搞~~突然反应过来
-        Long pickUpCount = tradeOrderStatisticsService.getCountByStatusAndDeliveryType(
-                TradeOrderStatusEnum.DELIVERED.getStatus(), DeliveryTypeEnum.PICK_UP.getType());
-        // 售后统计
-        Long afterSaleApplyCount = afterSaleStatisticsService.getCountByStatus(AfterSaleStatusEnum.APPLY);
-        Long auditingWithdrawCount = brokerageStatisticsService.getWithdrawCountByStatus(BrokerageWithdrawStatusEnum.AUDITING);
-        // 拼接返回
-        return success(TradeStatisticsConvert.INSTANCE.convert(undeliveredCount, pickUpCount, afterSaleApplyCount, auditingWithdrawCount));
-    }
-
-    @GetMapping("/order-comparison")
-    @Operation(summary = "获得交易订单数量")
-    @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
-    public CommonResult<DataComparisonRespVO<TradeOrderSummaryRespVO>> getOrderComparison() {
-        return success(tradeOrderStatisticsService.getOrderComparison());
-    }
-
-    @GetMapping("/order-count-trend")
-    @Operation(summary = "获得订单量趋势统计")
-    @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
-    public CommonResult<List<DataComparisonRespVO<TradeOrderTrendRespVO>>> getOrderCountTrendComparison(@Valid TradeOrderTrendReqVO reqVO) {
-        // TODO @疯狂：要注意 date 的排序；
-        return success(tradeOrderStatisticsService.getOrderCountTrendComparison(reqVO));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/aftersale/AfterSaleController.java

@@ -1,146 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.aftersale;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
-import cn.newfeifan.mall.module.trade.controller.admin.aftersale.vo.*;
-import cn.newfeifan.mall.module.trade.convert.aftersale.AfterSaleConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.aftersale.AfterSaleDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.aftersale.AfterSaleLogDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleLogService;
-import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
-import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.newfeifan.mall.framework.common.util.servlet.ServletUtils.getClientIP;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - 售后订单")
-@RestController
-@RequestMapping("/trade/after-sale")
-@Validated
-@Slf4j
-public class AfterSaleController {
-
-    @Resource
-    private AfterSaleService afterSaleService;
-    @Resource
-    private TradeOrderQueryService tradeOrderQueryService;
-    @Resource
-    private AfterSaleLogService afterSaleLogService;
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得售后订单分页")
-    @PreAuthorize("@ss.hasPermission('trade:after-sale:query')")
-    public CommonResult<PageResult<AfterSaleRespPageItemVO>> getAfterSalePage(@Valid AfterSalePageReqVO pageVO) {
-        // 查询售后
-        PageResult<AfterSaleDO> pageResult = afterSaleService.getAfterSalePage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty());
-        }
-
-        // 查询会员
-        Map<Long, MemberUserRespDTO> memberUsers = memberUserApi.getUserMap(
-                convertSet(pageResult.getList(), AfterSaleDO::getUserId));
-        return success(AfterSaleConvert.INSTANCE.convertPage(pageResult, memberUsers));
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得售后订单详情")
-    @Parameter(name = "id", description = "售后编号", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('trade:after-sale:query')")
-    public CommonResult<AfterSaleDetailRespVO> getOrderDetail(@RequestParam("id") Long id) {
-        // 查询订单
-        AfterSaleDO afterSale = afterSaleService.getAfterSale(id);
-        if (afterSale == null) {
-            return success(null);
-        }
-
-        // 查询订单
-        TradeOrderDO order = tradeOrderQueryService.getOrder(afterSale.getOrderId());
-        // 查询订单项
-        TradeOrderItemDO orderItem = tradeOrderQueryService.getOrderItem(afterSale.getOrderItemId());
-        // 拼接数据
-        MemberUserRespDTO user = memberUserApi.getUser(afterSale.getUserId());
-        List<AfterSaleLogDO> logs = afterSaleLogService.getAfterSaleLogList(afterSale.getId());
-        return success(AfterSaleConvert.INSTANCE.convert(afterSale, order, orderItem, user, logs));
-    }
-
-    @PutMapping("/agree")
-    @Operation(summary = "同意售后")
-    @Parameter(name = "id", description = "售后编号", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('trade:after-sale:agree')")
-    public CommonResult<Boolean> agreeAfterSale(@RequestParam("id") Long id) {
-        afterSaleService.agreeAfterSale(getLoginUserId(), id);
-        return success(true);
-    }
-
-    @PutMapping("/disagree")
-    @Operation(summary = "拒绝售后")
-    @PreAuthorize("@ss.hasPermission('trade:after-sale:disagree')")
-    public CommonResult<Boolean> disagreeAfterSale(@RequestBody AfterSaleDisagreeReqVO confirmReqVO) {
-        afterSaleService.disagreeAfterSale(getLoginUserId(), confirmReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/receive")
-    @Operation(summary = "确认收货")
-    @Parameter(name = "id", description = "售后编号", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('trade:after-sale:receive')")
-    public CommonResult<Boolean> receiveAfterSale(@RequestParam("id") Long id) {
-        afterSaleService.receiveAfterSale(getLoginUserId(), id);
-        return success(true);
-    }
-
-    @PutMapping("/refuse")
-    @Operation(summary = "拒绝收货")
-    @Parameter(name = "id", description = "售后编号", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('trade:after-sale:receive')")
-    public CommonResult<Boolean> refuseAfterSale(AfterSaleRefuseReqVO refuseReqVO) {
-        afterSaleService.refuseAfterSale(getLoginUserId(), refuseReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/refund")
-    @Operation(summary = "确认退款")
-    @Parameter(name = "id", description = "售后编号", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('trade:after-sale:refund')")
-    public CommonResult<Boolean> refundAfterSale(@RequestParam("id") Long id) {
-        afterSaleService.refundAfterSale(getLoginUserId(), getClientIP(), id);
-        return success(true);
-    }
-
-    @PostMapping("/update-refunded")
-    @Operation(summary = "更新售后订单为已退款") // 由 pay-module 支付服务，进行回调，可见 PayNotifyJob
-    @PermitAll // 无需登录，安全由 PayDemoOrderService 内部校验实现
-    @OperateLog(enable = false) // 禁用操作日志，因为没有操作人
-    public CommonResult<Boolean> updateAfterRefund(@RequestBody PayRefundNotifyReqDTO notifyReqDTO) {
-        // 目前业务逻辑，不需要做任何事情
-        // 当然，退款会有小概率会失败的情况，可以监控失败状态，进行告警
-        log.info("[updateAfterRefund][notifyReqDTO({})]", notifyReqDTO);
-        return success(true);
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/aftersale/TradeAfterSaleController.http

@@ -1,33 +0,0 @@
-### 获得交易售后分页 => 成功
-GET {{baseUrl}}/trade/after-sale/page?pageNo=1&pageSize=10
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-### 同意售后 => 成功
-PUT {{baseUrl}}/trade/after-sale/agree?id=7
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-Content-Type: application/json
-
-### 拒绝售后 => 成功
-PUT {{baseUrl}}/trade/after-sale/disagree
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-Content-Type: application/json
-
-{
-  "id": 6,
-  "auditReason": "阿巴巴"
-}
-
-### 确认退款 => 成功
-PUT {{baseUrl}}/trade/after-sale/refund?id=6
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-Content-Type: application/json
-
-### 确认收货 => 成功
-PUT {{baseUrl}}/trade/after-sale/receive?id=7
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-Content-Type: application/json

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/brokerage/BrokerageRecordController.java

@@ -1,66 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.brokerage;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordPageReqVO;
-import cn.newfeifan.mall.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordRespVO;
-import cn.newfeifan.mall.module.trade.convert.brokerage.BrokerageRecordConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 佣金记录")
-@RestController
-@RequestMapping("/trade/brokerage-record")
-@Validated
-public class BrokerageRecordController {
-
-    @Resource
-    private BrokerageRecordService brokerageRecordService;
-
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得佣金记录")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-record:query')")
-    public CommonResult<BrokerageRecordRespVO> getBrokerageRecord(@RequestParam("id") Integer id) {
-        BrokerageRecordDO brokerageRecord = brokerageRecordService.getBrokerageRecord(id);
-        return success(BrokerageRecordConvert.INSTANCE.convert(brokerageRecord));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得佣金记录分页")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-record:query')")
-    public CommonResult<PageResult<BrokerageRecordRespVO>> getBrokerageRecordPage(@Valid BrokerageRecordPageReqVO pageVO) {
-        PageResult<BrokerageRecordDO> pageResult = brokerageRecordService.getBrokerageRecordPage(pageVO);
-
-        // 查询用户信息
-        Set<Long> userIds = convertSet(pageResult.getList(), BrokerageRecordDO::getUserId);
-        userIds.addAll(convertList(pageResult.getList(), BrokerageRecordDO::getSourceUserId));
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(userIds);
-        // 拼接数据
-        return success(BrokerageRecordConvert.INSTANCE.convertPage(pageResult, userMap));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/brokerage/BrokerageUserController.java

@@ -1,112 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.brokerage;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.trade.controller.admin.brokerage.vo.user.*;
-import cn.newfeifan.mall.module.trade.convert.brokerage.BrokerageUserConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
-import cn.newfeifan.mall.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
-import cn.newfeifan.mall.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
-import cn.newfeifan.mall.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageRecordService;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageUserService;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageWithdrawService;
-import cn.newfeifan.mall.module.trade.service.brokerage.bo.UserBrokerageSummaryRespBO;
-import cn.newfeifan.mall.module.trade.service.brokerage.bo.BrokerageWithdrawSummaryRespBO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertMap;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 分销用户")
-@RestController
-@RequestMapping("/trade/brokerage-user")
-@Validated
-public class BrokerageUserController {
-
-    @Resource
-    private BrokerageUserService brokerageUserService;
-    @Resource
-    private BrokerageRecordService brokerageRecordService;
-    @Resource
-    private BrokerageWithdrawService brokerageWithdrawService;
-
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @PutMapping("/update-bind-user")
-    @Operation(summary = "修改推广员")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:update-bind-user')")
-    public CommonResult<Boolean> updateBindUser(@Valid @RequestBody BrokerageUserUpdateBrokerageUserReqVO updateReqVO) {
-        brokerageUserService.updateBrokerageUserId(updateReqVO.getId(), updateReqVO.getBindUserId());
-        return success(true);
-    }
-
-    @PutMapping("/clear-bind-user")
-    @Operation(summary = "清除推广员")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:clear-bind-user')")
-    public CommonResult<Boolean> clearBindUser(@Valid @RequestBody BrokerageUserClearBrokerageUserReqVO updateReqVO) {
-        brokerageUserService.updateBrokerageUserId(updateReqVO.getId(), null);
-        return success(true);
-    }
-
-    @PutMapping("/update-brokerage-enable")
-    @Operation(summary = "修改推广资格")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:update-brokerage-enable')")
-    public CommonResult<Boolean> updateBrokerageEnabled(@Valid @RequestBody BrokerageUserUpdateBrokerageEnabledReqVO updateReqVO) {
-        brokerageUserService.updateBrokerageUserEnabled(updateReqVO.getId(), updateReqVO.getEnabled());
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得分销用户")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:query')")
-    public CommonResult<BrokerageUserRespVO> getBrokerageUser(@RequestParam("id") Long id) {
-        BrokerageUserDO brokerageUser = brokerageUserService.getBrokerageUser(id);
-        // TODO @疯狂：是不是搞成一个统一的 convert？
-        BrokerageUserRespVO respVO = BrokerageUserConvert.INSTANCE.convert(brokerageUser);
-        return success(BrokerageUserConvert.INSTANCE.copyTo(memberUserApi.getUser(id), respVO));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得分销用户分页")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:query')")
-    public CommonResult<PageResult<BrokerageUserRespVO>> getBrokerageUserPage(@Valid BrokerageUserPageReqVO pageVO) {
-        // 分页查询
-        PageResult<BrokerageUserDO> pageResult = brokerageUserService.getBrokerageUserPage(pageVO);
-
-        // 查询用户信息
-        Set<Long> userIds = convertSet(pageResult.getList(), BrokerageUserDO::getId);
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(userIds);
-        // 合计分佣的推广订单
-        Map<Long, UserBrokerageSummaryRespBO> brokerageOrderSummaryMap = brokerageRecordService.getUserBrokerageSummaryMapByUserId(
-                userIds, BrokerageRecordBizTypeEnum.ORDER.getType(), BrokerageRecordStatusEnum.SETTLEMENT.getStatus());
-        // 合计分佣的推广用户
-        // TODO @疯狂：转成 map 批量读取
-        Map<Long, Long> brokerageUserCountMap = convertMap(userIds,
-                userId -> userId,
-                userId -> brokerageUserService.getBrokerageUserCountByBindUserId(userId, null));
-        // 合计分佣的提现
-        // TODO @疯狂：如果未来支持了打款这个动作，可能 status 会不对；
-        Map<Long, BrokerageWithdrawSummaryRespBO> withdrawMap = brokerageWithdrawService.getWithdrawSummaryMapByUserId(
-                userIds, BrokerageWithdrawStatusEnum.AUDIT_SUCCESS);
-        // 拼接返回
-        return success(BrokerageUserConvert.INSTANCE.convertPage(pageResult, userMap, brokerageUserCountMap,
-                brokerageOrderSummaryMap, withdrawMap));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/brokerage/BrokerageWithdrawController.java

@@ -1,78 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.brokerage;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRejectReqVO;
-import cn.newfeifan.mall.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
-import cn.newfeifan.mall.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRespVO;
-import cn.newfeifan.mall.module.trade.convert.brokerage.BrokerageWithdrawConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
-import cn.newfeifan.mall.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
-import cn.newfeifan.mall.module.trade.service.brokerage.BrokerageWithdrawService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Map;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 佣金提现")
-@RestController
-@RequestMapping("/trade/brokerage-withdraw")
-@Validated
-public class BrokerageWithdrawController {
-
-    @Resource
-    private BrokerageWithdrawService brokerageWithdrawService;
-
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @PutMapping("/approve")
-    @Operation(summary = "通过申请")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-withdraw:audit')")
-    public CommonResult<Boolean> approveBrokerageWithdraw(@RequestParam("id") Integer id) {
-        brokerageWithdrawService.auditBrokerageWithdraw(id, BrokerageWithdrawStatusEnum.AUDIT_SUCCESS, "");
-        return success(true);
-    }
-
-    @PutMapping("/reject")
-    @Operation(summary = "驳回申请")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-withdraw:audit')")
-    public CommonResult<Boolean> rejectBrokerageWithdraw(@Valid @RequestBody BrokerageWithdrawRejectReqVO reqVO) {
-        brokerageWithdrawService.auditBrokerageWithdraw(reqVO.getId(), BrokerageWithdrawStatusEnum.AUDIT_FAIL, reqVO.getAuditReason());
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得佣金提现")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-withdraw:query')")
-    public CommonResult<BrokerageWithdrawRespVO> getBrokerageWithdraw(@RequestParam("id") Integer id) {
-        BrokerageWithdrawDO brokerageWithdraw = brokerageWithdrawService.getBrokerageWithdraw(id);
-        return success(BrokerageWithdrawConvert.INSTANCE.convert(brokerageWithdraw));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得佣金提现分页")
-    @PreAuthorize("@ss.hasPermission('trade:brokerage-withdraw:query')")
-    public CommonResult<PageResult<BrokerageWithdrawRespVO>> getBrokerageWithdrawPage(@Valid BrokerageWithdrawPageReqVO pageVO) {
-        // 分页查询
-        PageResult<BrokerageWithdrawDO> pageResult = brokerageWithdrawService.getBrokerageWithdrawPage(pageVO);
-
-        // 拼接信息
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(
-                convertSet(pageResult.getList(), BrokerageWithdrawDO::getUserId));
-        return success(BrokerageWithdrawConvert.INSTANCE.convertPage(pageResult, userMap));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/config/TradeConfigController.java

@@ -1,53 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.config;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.trade.controller.admin.config.vo.TradeConfigRespVO;
-import cn.newfeifan.mall.module.trade.controller.admin.config.vo.TradeConfigSaveReqVO;
-import cn.newfeifan.mall.module.trade.convert.config.TradeConfigConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.config.TradeConfigDO;
-import cn.newfeifan.mall.module.trade.service.config.TradeConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 交易中心配置")
-@RestController
-@RequestMapping("/trade/config")
-@Validated
-public class TradeConfigController {
-
-    @Resource
-    private TradeConfigService tradeConfigService;
-
-    @Value("${feifan.tencent-lbs-key}")
-    private String tencentLbsKey;
-
-    @PutMapping("/save")
-    @Operation(summary = "更新交易中心配置")
-    @PreAuthorize("@ss.hasPermission('trade:config:save')")
-    public CommonResult<Boolean> updateConfig(@Valid @RequestBody TradeConfigSaveReqVO updateReqVO) {
-        tradeConfigService.saveTradeConfig(updateReqVO);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得交易中心配置")
-    @PreAuthorize("@ss.hasPermission('trade:config:query')")
-    public CommonResult<TradeConfigRespVO> getConfig() {
-        TradeConfigDO config = tradeConfigService.getTradeConfig();
-        TradeConfigRespVO configVO = TradeConfigConvert.INSTANCE.convert(config);
-        if (configVO != null) {
-            configVO.setTencentLbsKey(tencentLbsKey);
-        }
-        return success(configVO);
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/DeliveryExpressController.java

@@ -1,96 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.delivery;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.trade.controller.admin.delivery.vo.express.*;
-import cn.newfeifan.mall.module.trade.convert.delivery.DeliveryExpressConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
-import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - 快递公司")
-@RestController
-@RequestMapping("/trade/delivery/express")
-@Validated
-public class DeliveryExpressController {
-
-    @Resource
-    private DeliveryExpressService deliveryExpressService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建快递公司")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express:create')")
-    public CommonResult<Long> createDeliveryExpress(@Valid @RequestBody DeliveryExpressCreateReqVO createReqVO) {
-        return success(deliveryExpressService.createDeliveryExpress(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新快递公司")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express:update')")
-    public CommonResult<Boolean> updateDeliveryExpress(@Valid @RequestBody DeliveryExpressUpdateReqVO updateReqVO) {
-        deliveryExpressService.updateDeliveryExpress(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除快递公司")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express:delete')")
-    public CommonResult<Boolean> deleteDeliveryExpress(@RequestParam("id") Long id) {
-        deliveryExpressService.deleteDeliveryExpress(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得快递公司")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express:query')")
-    public CommonResult<DeliveryExpressRespVO> getDeliveryExpress(@RequestParam("id") Long id) {
-        DeliveryExpressDO deliveryExpress = deliveryExpressService.getDeliveryExpress(id);
-        return success(DeliveryExpressConvert.INSTANCE.convert(deliveryExpress));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取快递公司精简信息列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<DeliveryExpressSimpleRespVO>> getSimpleDeliveryExpressList() {
-        List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        return success(DeliveryExpressConvert.INSTANCE.convertList1(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得快递公司分页")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express:query')")
-    public CommonResult<PageResult<DeliveryExpressRespVO>> getDeliveryExpressPage(@Valid DeliveryExpressPageReqVO pageVO) {
-        PageResult<DeliveryExpressDO> pageResult = deliveryExpressService.getDeliveryExpressPage(pageVO);
-        return success(DeliveryExpressConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出快递公司 Excel")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express:export')")
-    @OperateLog(type = EXPORT)
-    public void exportDeliveryExpressExcel(@Valid DeliveryExpressExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressList(exportReqVO);
-        // 导出 Excel
-        List<DeliveryExpressExcelVO> dataList = DeliveryExpressConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "快递公司.xls", "数据", DeliveryExpressExcelVO.class, dataList);
-    }
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/DeliveryExpressTemplateController.java

@@ -1,90 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.delivery;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.trade.controller.admin.delivery.vo.expresstemplate.*;
-import cn.newfeifan.mall.module.trade.convert.delivery.DeliveryExpressTemplateConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
-import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressTemplateService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 快递运费模板")
-@RestController
-@RequestMapping("/trade/delivery/express-template")
-@Validated
-public class DeliveryExpressTemplateController {
-
-    @Resource
-    private DeliveryExpressTemplateService deliveryExpressTemplateService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建快递运费模板")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:create')")
-    public CommonResult<Long> createDeliveryExpressTemplate(@Valid @RequestBody DeliveryExpressTemplateCreateReqVO createReqVO) {
-        return success(deliveryExpressTemplateService.createDeliveryExpressTemplate(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新快递运费模板")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:update')")
-    public CommonResult<Boolean> updateDeliveryExpressTemplate(@Valid @RequestBody DeliveryExpressTemplateUpdateReqVO updateReqVO) {
-        deliveryExpressTemplateService.updateDeliveryExpressTemplate(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除快递运费模板")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:delete')")
-    public CommonResult<Boolean> deleteDeliveryExpressTemplate(@RequestParam("id") Long id) {
-        deliveryExpressTemplateService.deleteDeliveryExpressTemplate(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得快递运费模板")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
-    public CommonResult<DeliveryExpressTemplateDetailRespVO> getDeliveryExpressTemplate(@RequestParam("id") Long id) {
-        return success(deliveryExpressTemplateService.getDeliveryExpressTemplate(id));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得快递运费模板列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
-    public CommonResult<List<DeliveryExpressTemplateRespVO>> getDeliveryExpressTemplateList(@RequestParam("ids") Collection<Long> ids) {
-        List<DeliveryExpressTemplateDO> list = deliveryExpressTemplateService.getDeliveryExpressTemplateList(ids);
-        return success(DeliveryExpressTemplateConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取快递模版精简信息列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<DeliveryExpressTemplateSimpleRespVO>> getSimpleTemplateList() {
-        // 获取运费模版列表，只要开启状态的
-        List<DeliveryExpressTemplateDO> list = deliveryExpressTemplateService.getDeliveryExpressTemplateList();
-        // 排序后，返回给前端
-        return success(DeliveryExpressTemplateConvert.INSTANCE.convertList1(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得快递运费模板分页")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
-    public CommonResult<PageResult<DeliveryExpressTemplateRespVO>> getDeliveryExpressTemplatePage(@Valid DeliveryExpressTemplatePageReqVO pageVO) {
-        PageResult<DeliveryExpressTemplateDO> pageResult = deliveryExpressTemplateService.getDeliveryExpressTemplatePage(pageVO);
-        return success(DeliveryExpressTemplateConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java

@@ -1,91 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.delivery;
-
-import cn.newfeifan.mall.framework.common.enums.CommonStatusEnum;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.trade.controller.admin.delivery.vo.pickup.*;
-import cn.newfeifan.mall.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
-import cn.newfeifan.mall.module.trade.service.delivery.DeliveryPickUpStoreService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 自提门店")
-@RestController
-@RequestMapping("/trade/delivery/pick-up-store")
-@Validated
-public class DeliveryPickUpStoreController {
-
-    @Resource
-    private DeliveryPickUpStoreService deliveryPickUpStoreService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建自提门店")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:create')")
-    public CommonResult<Long> createDeliveryPickUpStore(@Valid @RequestBody DeliveryPickUpStoreCreateReqVO createReqVO) {
-        return success(deliveryPickUpStoreService.createDeliveryPickUpStore(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新自提门店")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:update')")
-    public CommonResult<Boolean> updateDeliveryPickUpStore(@Valid @RequestBody DeliveryPickUpStoreUpdateReqVO updateReqVO) {
-        deliveryPickUpStoreService.updateDeliveryPickUpStore(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除自提门店")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:delete')")
-    public CommonResult<Boolean> deleteDeliveryPickUpStore(@RequestParam("id") Long id) {
-        deliveryPickUpStoreService.deleteDeliveryPickUpStore(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得自提门店")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:query')")
-    public CommonResult<DeliveryPickUpStoreRespVO> getDeliveryPickUpStore(@RequestParam("id") Long id) {
-        DeliveryPickUpStoreDO deliveryPickUpStore = deliveryPickUpStoreService.getDeliveryPickUpStore(id);
-        return success(DeliveryPickUpStoreConvert.INSTANCE.convert(deliveryPickUpStore));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获得自提门店精简信息列表")
-    public CommonResult<List<DeliveryPickUpStoreSimpleRespVO>> getSimpleDeliveryPickUpStoreList() {
-        List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreListByStatus(
-                CommonStatusEnum.ENABLE.getStatus());
-        return success(DeliveryPickUpStoreConvert.INSTANCE.convertList1(list));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得自提门店列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:query')")
-    public CommonResult<List<DeliveryPickUpStoreRespVO>> getDeliveryPickUpStoreList(@RequestParam("ids") Collection<Long> ids) {
-        List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreList(ids);
-        return success(DeliveryPickUpStoreConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得自提门店分页")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:query')")
-    public CommonResult<PageResult<DeliveryPickUpStoreRespVO>> getDeliveryPickUpStorePage(@Valid DeliveryPickUpStorePageReqVO pageVO) {
-        PageResult<DeliveryPickUpStoreDO> pageResult = deliveryPickUpStoreService.getDeliveryPickUpStorePage(pageVO);
-        return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/messagelog/MessageLogController.java

@@ -1,93 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.messagelog;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import cn.newfeifan.mall.module.trade.controller.admin.messagelog.vo.MessageLogPageReqVO;
-import cn.newfeifan.mall.module.trade.controller.admin.messagelog.vo.MessageLogRespVO;
-import cn.newfeifan.mall.module.trade.controller.admin.messagelog.vo.MessageLogSaveReqVO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.messagelog.MessageLogDO;
-import cn.newfeifan.mall.module.trade.service.messagelog.MessageLogService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Tag(name = "管理后台 - 微信消息记录")
-@RestController
-@RequestMapping("/wechat/message-log")
-@Validated
-public class MessageLogController {
-
-    @Resource
-    private MessageLogService messageLogService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建微信消息记录")
-    @PreAuthorize("@ss.hasPermission('wechat:message-log:create')")
-    public CommonResult<Long> createMessageLog(@Valid @RequestBody MessageLogSaveReqVO createReqVO) {
-        return success(messageLogService.createMessageLog(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新微信消息记录")
-    @PreAuthorize("@ss.hasPermission('wechat:message-log:update')")
-    public CommonResult<Boolean> updateMessageLog(@Valid @RequestBody MessageLogSaveReqVO updateReqVO) {
-        messageLogService.updateMessageLog(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除微信消息记录")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('wechat:message-log:delete')")
-    public CommonResult<Boolean> deleteMessageLog(@RequestParam("id") Long id) {
-        messageLogService.deleteMessageLog(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得微信消息记录")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('wechat:message-log:query')")
-    public CommonResult<MessageLogRespVO> getMessageLog(@RequestParam("id") Long id) {
-        MessageLogDO messageLog = messageLogService.getMessageLog(id);
-        return success(BeanUtils.toBean(messageLog, MessageLogRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得微信消息记录分页")
-    @PreAuthorize("@ss.hasPermission('wechat:message-log:query')")
-    public CommonResult<PageResult<MessageLogRespVO>> getMessageLogPage(@Valid MessageLogPageReqVO pageReqVO) {
-        PageResult<MessageLogDO> pageResult = messageLogService.getMessageLogPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, MessageLogRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出微信消息记录 Excel")
-    @PreAuthorize("@ss.hasPermission('wechat:message-log:export')")
-    @OperateLog(type = EXPORT)
-    public void exportMessageLogExcel(@Valid MessageLogPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<MessageLogDO> list = messageLogService.getMessageLogPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "微信消息记录.xls", "数据", MessageLogRespVO.class,
-                        BeanUtils.toBean(list, MessageLogRespVO.class));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.http

@@ -1,9 +0,0 @@
-### 获得交易订单分页 => 成功
-GET {{baseUrl}}/trade/order/page?pageNo=1&pageSize=10
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-### 获得交易订单分页 => 成功
-GET {{baseUrl}}/trade/order/get-detail?id=21
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -1,169 +0,0 @@
-package cn.newfeifan.mall.module.trade.controller.admin.order;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.trade.controller.admin.order.vo.*;
-import cn.newfeifan.mall.module.trade.convert.order.TradeOrderConvert;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderLogDO;
-import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
-import cn.newfeifan.mall.module.trade.service.order.TradeOrderLogService;
-import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
-import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 交易订单")
-@RestController
-@RequestMapping("/trade/order")
-@Validated
-@Slf4j
-public class TradeOrderController {
-
-    @Resource
-    private TradeOrderUpdateService tradeOrderUpdateService;
-    @Resource
-    private TradeOrderQueryService tradeOrderQueryService;
-    @Resource
-    private TradeOrderLogService tradeOrderLogService;
-
-    @Resource
-    private MemberUserApi memberUserApi;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得交易订单分页")
-    @PreAuthorize("@ss.hasPermission('trade:order:query')")
-    public CommonResult<PageResult<TradeOrderPageItemRespVO>> getOrderPage(TradeOrderPageReqVO reqVO) {
-        // 查询订单
-        PageResult<TradeOrderDO> pageResult = tradeOrderQueryService.getOrderPage(reqVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty());
-        }
-
-        // 查询用户信息
-        Set<Long> userIds = CollUtil.unionDistinct(convertList(pageResult.getList(), TradeOrderDO::getUserId),
-                convertList(pageResult.getList(), TradeOrderDO::getBrokerageUserId, Objects::nonNull));
-        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(userIds);
-        // 查询订单项
-        List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(
-                convertSet(pageResult.getList(), TradeOrderDO::getId));
-        // 最终组合
-        return success(TradeOrderConvert.INSTANCE.convertPage(pageResult, orderItems, userMap));
-    }
-
-    @GetMapping("/summary")
-    @Operation(summary = "获得交易订单统计")
-    @PreAuthorize("@ss.hasPermission('trade:order:query')")
-    public CommonResult<TradeOrderSummaryRespVO> getOrderSummary(TradeOrderPageReqVO reqVO) {
-        return success(tradeOrderQueryService.getOrderSummary(reqVO));
-    }
-
-    @GetMapping("/get-detail")
-    @Operation(summary = "获得交易订单详情")
-    @Parameter(name = "id", description = "订单编号", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('trade:order:query')")
-    public CommonResult<TradeOrderDetailRespVO> getOrderDetail(@RequestParam("id") Long id) {
-        // 查询订单
-        TradeOrderDO order = tradeOrderQueryService.getOrder(id);
-        if (order == null) {
-            return success(null);
-        }
-        // 查询订单项
-        List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(id);
-
-        // 拼接数据
-        MemberUserRespDTO user = memberUserApi.getUser(order.getUserId());
-        MemberUserRespDTO brokerageUser = order.getBrokerageUserId() != null ?
-                memberUserApi.getUser(order.getBrokerageUserId()) : null;
-        List<TradeOrderLogDO> orderLogs = tradeOrderLogService.getOrderLogListByOrderId(id);
-        return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, orderLogs, user, brokerageUser));
-    }
-
-    @GetMapping("/get-express-track-list")
-    @Operation(summary = "获得交易订单的物流轨迹")
-    @Parameter(name = "id", description = "交易订单编号")
-    @PreAuthorize("@ss.hasPermission('trade:order:query')")
-    public CommonResult<List<?>> getOrderExpressTrackList(@RequestParam("id") Long id) {
-        return success(TradeOrderConvert.INSTANCE.convertList02(
-                tradeOrderQueryService.getExpressTrackList(id)));
-    }
-
-    @PutMapping("/delivery")
-    @Operation(summary = "订单发货")
-    @PreAuthorize("@ss.hasPermission('trade:order:update')")
-    public CommonResult<Boolean> deliveryOrder(@RequestBody TradeOrderDeliveryReqVO deliveryReqVO) {
-        tradeOrderUpdateService.deliveryOrder(deliveryReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-remark")
-    @Operation(summary = "订单备注")
-    @PreAuthorize("@ss.hasPermission('trade:order:update')")
-    public CommonResult<Boolean> updateOrderRemark(@RequestBody TradeOrderRemarkReqVO reqVO) {
-        tradeOrderUpdateService.updateOrderRemark(reqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-price")
-    @Operation(summary = "订单调价")
-    @PreAuthorize("@ss.hasPermission('trade:order:update')")
-    public CommonResult<Boolean> updateOrderPrice(@RequestBody TradeOrderUpdatePriceReqVO reqVO) {
-        tradeOrderUpdateService.updateOrderPrice(reqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-address")
-    @Operation(summary = "修改订单收货地址")
-    @PreAuthorize("@ss.hasPermission('trade:order:update')")
-    public CommonResult<Boolean> updateOrderAddress(@RequestBody TradeOrderUpdateAddressReqVO reqVO) {
-        tradeOrderUpdateService.updateOrderAddress(reqVO);
-        return success(true);
-    }
-
-    @PutMapping("/pick-up-by-id")
-    @Operation(summary = "订单核销")
-    @Parameter(name = "id", description = "交易订单编号")
-    @PreAuthorize("@ss.hasPermission('trade:order:pick-up')")
-    public CommonResult<Boolean> pickUpOrderById(@RequestParam("id") Long id) {
-        tradeOrderUpdateService.pickUpOrderByAdmin(id);
-        return success(true);
-    }
-
-    @PutMapping("/pick-up-by-verify-code")
-    @Operation(summary = "订单核销")
-    @Parameter(name = "pickUpVerifyCode", description = "自提核销码")
-    @PreAuthorize("@ss.hasPermission('trade:order:pick-up')")
-    public CommonResult<Boolean> pickUpOrderByVerifyCode(@RequestParam("pickUpVerifyCode") String pickUpVerifyCode) {
-        tradeOrderUpdateService.pickUpOrderByAdmin(pickUpVerifyCode);
-        return success(true);
-    }
-
-    @GetMapping("/get-by-pick-up-verify-code")
-    @Operation(summary = "查询核销码对应的订单")
-    @Parameter(name = "pickUpVerifyCode", description = "自提核销码")
-    @PreAuthorize("@ss.hasPermission('trade:order:query')")
-    public CommonResult<TradeOrderDetailRespVO> getByPickUpVerifyCode(@RequestParam("pickUpVerifyCode") String pickUpVerifyCode) {
-        TradeOrderDO tradeOrder = tradeOrderUpdateService.getByPickUpVerifyCode(pickUpVerifyCode);
-        return success(TradeOrderConvert.INSTANCE.convert2(tradeOrder, null));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/aftersale/AppAfterSaleLogController.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
 
-@Tag(name = "管理后台 - 售后日志")
+@Tag(name = "用户 App - 售后日志")
 @RestController
 @RequestMapping("/trade/after-sale-log")
 @Validated

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/address/AddressController.java

@@ -1,41 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.address;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.member.controller.admin.address.vo.AddressRespVO;
-import cn.newfeifan.mall.module.member.convert.address.AddressConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.address.MemberAddressDO;
-import cn.newfeifan.mall.module.member.service.address.AddressService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 用户收件地址")
-@RestController
-@RequestMapping("/member/address")
-@Validated
-public class AddressController {
-
-    @Resource
-    private AddressService addressService;
-
-    @GetMapping("/list")
-    @Operation(summary = "获得用户收件地址列表")
-    @Parameter(name = "userId", description = "用户编号", required = true)
-    @PreAuthorize("@ss.hasPermission('member:user:query')")
-    public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("userId") Long userId) {
-        List<MemberAddressDO> list = addressService.getAddressList(userId);
-        return success(AddressConvert.INSTANCE.convertList2(list));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/config/MemberConfigController.java

@@ -1,45 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.config;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.member.controller.admin.config.vo.MemberConfigRespVO;
-import cn.newfeifan.mall.module.member.controller.admin.config.vo.MemberConfigSaveReqVO;
-import cn.newfeifan.mall.module.member.convert.config.MemberConfigConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.config.MemberConfigDO;
-import cn.newfeifan.mall.module.member.service.config.MemberConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员设置")
-@RestController
-@RequestMapping("/member/config")
-@Validated
-public class MemberConfigController {
-
-    @Resource
-    private MemberConfigService memberConfigService;
-
-    @PutMapping("/save")
-    @Operation(summary = "保存会员配置")
-    @PreAuthorize("@ss.hasPermission('member:config:save')")
-    public CommonResult<Boolean> saveConfig(@Valid @RequestBody MemberConfigSaveReqVO saveReqVO) {
-        memberConfigService.saveConfig(saveReqVO);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员配置")
-    @PreAuthorize("@ss.hasPermission('member:config:query')")
-    public CommonResult<MemberConfigRespVO> getConfig() {
-        MemberConfigDO config = memberConfigService.getConfig();
-        return success(MemberConfigConvert.INSTANCE.convert(config));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/group/MemberGroupController.java

@@ -1,81 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.group;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.controller.admin.group.vo.*;
-import cn.newfeifan.mall.module.member.convert.group.MemberGroupConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.group.MemberGroupDO;
-import cn.newfeifan.mall.module.member.service.group.MemberGroupService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-
-@Tag(name = "管理后台 - 用户分组")
-@RestController
-@RequestMapping("/member/group")
-@Validated
-public class MemberGroupController {
-
-    @Resource
-    private MemberGroupService groupService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建用户分组")
-    @PreAuthorize("@ss.hasPermission('member:group:create')")
-    public CommonResult<Long> createGroup(@Valid @RequestBody MemberGroupCreateReqVO createReqVO) {
-        return success(groupService.createGroup(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新用户分组")
-    @PreAuthorize("@ss.hasPermission('member:group:update')")
-    public CommonResult<Boolean> updateGroup(@Valid @RequestBody MemberGroupUpdateReqVO updateReqVO) {
-        groupService.updateGroup(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除用户分组")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('member:group:delete')")
-    public CommonResult<Boolean> deleteGroup(@RequestParam("id") Long id) {
-        groupService.deleteGroup(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得用户分组")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:group:query')")
-    public CommonResult<MemberGroupRespVO> getGroup(@RequestParam("id") Long id) {
-        MemberGroupDO group = groupService.getGroup(id);
-        return success(MemberGroupConvert.INSTANCE.convert(group));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取会员分组精简信息列表", description = "只包含被开启的会员分组，主要用于前端的下拉选项")
-    public CommonResult<List<MemberGroupSimpleRespVO>> getSimpleGroupList() {
-        // 获用户列表，只要开启状态的
-        List<MemberGroupDO> list = groupService.getEnableGroupList();
-        return success(MemberGroupConvert.INSTANCE.convertSimpleList(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得用户分组分页")
-    @PreAuthorize("@ss.hasPermission('member:group:query')")
-    public CommonResult<PageResult<MemberGroupRespVO>> getGroupPage(@Valid MemberGroupPageReqVO pageVO) {
-        PageResult<MemberGroupDO> pageResult = groupService.getGroupPage(pageVO);
-        return success(MemberGroupConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/level/MemberExperienceRecordController.java

@@ -1,52 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.level;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
-import cn.newfeifan.mall.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO;
-import cn.newfeifan.mall.module.member.convert.level.MemberExperienceRecordConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.level.MemberExperienceRecordDO;
-import cn.newfeifan.mall.module.member.service.level.MemberExperienceRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员经验记录")
-@RestController
-@RequestMapping("/member/experience-record")
-@Validated
-public class MemberExperienceRecordController {
-
-    @Resource
-    private MemberExperienceRecordService experienceLogService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员经验记录")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
-    public CommonResult<MemberExperienceRecordRespVO> getExperienceRecord(@RequestParam("id") Long id) {
-        MemberExperienceRecordDO experienceLog = experienceLogService.getExperienceRecord(id);
-        return success(MemberExperienceRecordConvert.INSTANCE.convert(experienceLog));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员经验记录分页")
-    @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
-    public CommonResult<PageResult<MemberExperienceRecordRespVO>> getExperienceRecordPage(
-            @Valid MemberExperienceRecordPageReqVO pageVO) {
-        PageResult<MemberExperienceRecordDO> pageResult = experienceLogService.getExperienceRecordPage(pageVO);
-        return success(MemberExperienceRecordConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/level/MemberLevelController.java

@@ -1,80 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.level;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.member.controller.admin.level.vo.level.*;
-import cn.newfeifan.mall.module.member.convert.level.MemberLevelConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.level.MemberLevelDO;
-import cn.newfeifan.mall.module.member.service.level.MemberLevelService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员等级")
-@RestController
-@RequestMapping("/member/level")
-@Validated
-public class MemberLevelController {
-
-    @Resource
-    private MemberLevelService levelService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建会员等级")
-    @PreAuthorize("@ss.hasPermission('member:level:create')")
-    public CommonResult<Long> createLevel(@Valid @RequestBody MemberLevelCreateReqVO createReqVO) {
-        return success(levelService.createLevel(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新会员等级")
-    @PreAuthorize("@ss.hasPermission('member:level:update')")
-    public CommonResult<Boolean> updateLevel(@Valid @RequestBody MemberLevelUpdateReqVO updateReqVO) {
-        levelService.updateLevel(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除会员等级")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('member:level:delete')")
-    public CommonResult<Boolean> deleteLevel(@RequestParam("id") Long id) {
-        levelService.deleteLevel(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员等级")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:level:query')")
-    public CommonResult<MemberLevelRespVO> getLevel(@RequestParam("id") Long id) {
-        MemberLevelDO level = levelService.getLevel(id);
-        return success(MemberLevelConvert.INSTANCE.convert(level));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取会员等级精简信息列表", description = "只包含被开启的会员等级，主要用于前端的下拉选项")
-    public CommonResult<List<MemberLevelSimpleRespVO>> getSimpleLevelList() {
-        // 获用户列表，只要开启状态的
-        List<MemberLevelDO> list = levelService.getEnableLevelList();
-        // 排序后，返回给前端
-        return success(MemberLevelConvert.INSTANCE.convertSimpleList(list));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得会员等级列表")
-    @PreAuthorize("@ss.hasPermission('member:level:query')")
-    public CommonResult<List<MemberLevelRespVO>> getLevelList(@Valid MemberLevelListReqVO listReqVO) {
-        List<MemberLevelDO> result = levelService.getLevelList(listReqVO);
-        return success(MemberLevelConvert.INSTANCE.convertList(result));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/level/MemberLevelRecordController.java

@@ -1,52 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.level;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.controller.admin.level.vo.record.MemberLevelRecordPageReqVO;
-import cn.newfeifan.mall.module.member.controller.admin.level.vo.record.MemberLevelRecordRespVO;
-import cn.newfeifan.mall.module.member.convert.level.MemberLevelRecordConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.level.MemberLevelRecordDO;
-import cn.newfeifan.mall.module.member.service.level.MemberLevelRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员等级记录")
-@RestController
-@RequestMapping("/member/level-record")
-@Validated
-public class MemberLevelRecordController {
-
-    @Resource
-    private MemberLevelRecordService levelLogService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员等级记录")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:level-record:query')")
-    public CommonResult<MemberLevelRecordRespVO> getLevelRecord(@RequestParam("id") Long id) {
-        MemberLevelRecordDO levelLog = levelLogService.getLevelRecord(id);
-        return success(MemberLevelRecordConvert.INSTANCE.convert(levelLog));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员等级记录分页")
-    @PreAuthorize("@ss.hasPermission('member:level-record:query')")
-    public CommonResult<PageResult<MemberLevelRecordRespVO>> getLevelRecordPage(
-            @Valid MemberLevelRecordPageReqVO pageVO) {
-        PageResult<MemberLevelRecordDO> pageResult = levelLogService.getLevelRecordPage(pageVO);
-        return success(MemberLevelRecordConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/point/MemberPointRecordController.java

@@ -1,56 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.point;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
-import cn.newfeifan.mall.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO;
-import cn.newfeifan.mall.module.member.convert.point.MemberPointRecordConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.point.MemberPointRecordDO;
-import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
-import cn.newfeifan.mall.module.member.service.point.MemberPointRecordService;
-import cn.newfeifan.mall.module.member.service.user.MemberUserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 签到记录")
-@RestController
-@RequestMapping("/member/point/record")
-@Validated
-public class MemberPointRecordController {
-
-    @Resource
-    private MemberPointRecordService pointRecordService;
-
-    @Resource
-    private MemberUserService memberUserService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得用户积分记录分页")
-    @PreAuthorize("@ss.hasPermission('point:record:query')")
-    public CommonResult<PageResult<MemberPointRecordRespVO>> getPointRecordPage(@Valid MemberPointRecordPageReqVO pageVO) {
-        // 执行分页查询
-        PageResult<MemberPointRecordDO> pageResult = pointRecordService.getPointRecordPage(pageVO);
-        if (CollectionUtils.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接结果返回
-        List<MemberUserDO> users = memberUserService.getUserList(
-                convertSet(pageResult.getList(), MemberPointRecordDO::getUserId));
-        return success(MemberPointRecordConvert.INSTANCE.convertPage(pageResult, users));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/signin/MemberSignInConfigController.java

@@ -1,74 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.signin;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO;
-import cn.newfeifan.mall.module.member.controller.admin.signin.vo.config.MemberSignInConfigRespVO;
-import cn.newfeifan.mall.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO;
-import cn.newfeifan.mall.module.member.convert.signin.MemberSignInConfigConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.signin.MemberSignInConfigDO;
-import cn.newfeifan.mall.module.member.service.signin.MemberSignInConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-// TODO 非繁人：url
-@Tag(name = "管理后台 - 签到规则")
-@RestController
-@RequestMapping("/member/sign-in/config")
-@Validated
-public class MemberSignInConfigController {
-
-    @Resource
-    private MemberSignInConfigService signInConfigService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建签到规则")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:create')")
-    public CommonResult<Long> createSignInConfig(@Valid @RequestBody MemberSignInConfigCreateReqVO createReqVO) {
-        return success(signInConfigService.createSignInConfig(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新签到规则")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:update')")
-    public CommonResult<Boolean> updateSignInConfig(@Valid @RequestBody MemberSignInConfigUpdateReqVO updateReqVO) {
-        signInConfigService.updateSignInConfig(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除签到规则")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:delete')")
-    public CommonResult<Boolean> deleteSignInConfig(@RequestParam("id") Long id) {
-        signInConfigService.deleteSignInConfig(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得签到规则")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')")
-    public CommonResult<MemberSignInConfigRespVO> getSignInConfig(@RequestParam("id") Long id) {
-        MemberSignInConfigDO signInConfig = signInConfigService.getSignInConfig(id);
-        return success(MemberSignInConfigConvert.INSTANCE.convert(signInConfig));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得签到规则列表")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')")
-    public CommonResult<List<MemberSignInConfigRespVO>> getSignInConfigList() {
-        List<MemberSignInConfigDO> list = signInConfigService.getSignInConfigList();
-        return success(MemberSignInConfigConvert.INSTANCE.convertList(list));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/signin/MemberSignInRecordController.java

@@ -1,55 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.signin;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
-import cn.newfeifan.mall.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
-import cn.newfeifan.mall.module.member.convert.signin.MemberSignInRecordConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.signin.MemberSignInRecordDO;
-import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
-import cn.newfeifan.mall.module.member.service.signin.MemberSignInRecordService;
-import cn.newfeifan.mall.module.member.service.user.MemberUserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 签到记录")
-@RestController
-@RequestMapping("/member/sign-in/record")
-@Validated
-public class MemberSignInRecordController {
-
-    @Resource
-    private MemberSignInRecordService signInRecordService;
-
-    @Resource
-    private MemberUserService memberUserService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得签到记录分页")
-    @PreAuthorize("@ss.hasPermission('point:sign-in-record:query')")
-    public CommonResult<PageResult<MemberSignInRecordRespVO>> getSignInRecordPage(@Valid MemberSignInRecordPageReqVO pageVO) {
-        // 执行分页查询
-        PageResult<MemberSignInRecordDO> pageResult = signInRecordService.getSignInRecordPage(pageVO);
-        if (CollectionUtils.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty(pageResult.getTotal()));
-        }
-
-        // 拼接结果返回
-        List<MemberUserDO> users = memberUserService.getUserList(
-                convertSet(pageResult.getList(), MemberSignInRecordDO::getUserId));
-        return success(MemberSignInRecordConvert.INSTANCE.convertPage(pageResult, users));
-    }
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/tag/MemberTagController.java

@@ -1,94 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.tag;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.controller.admin.tag.vo.MemberTagCreateReqVO;
-import cn.newfeifan.mall.module.member.controller.admin.tag.vo.MemberTagPageReqVO;
-import cn.newfeifan.mall.module.member.controller.admin.tag.vo.MemberTagRespVO;
-import cn.newfeifan.mall.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO;
-import cn.newfeifan.mall.module.member.convert.tag.MemberTagConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.tag.MemberTagDO;
-import cn.newfeifan.mall.module.member.service.tag.MemberTagService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 会员标签")
-@RestController
-@RequestMapping("/member/tag")
-@Validated
-public class MemberTagController {
-
-    @Resource
-    private MemberTagService tagService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建会员标签")
-    @PreAuthorize("@ss.hasPermission('member:tag:create')")
-    public CommonResult<Long> createTag(@Valid @RequestBody MemberTagCreateReqVO createReqVO) {
-        return success(tagService.createTag(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新会员标签")
-    @PreAuthorize("@ss.hasPermission('member:tag:update')")
-    public CommonResult<Boolean> updateTag(@Valid @RequestBody MemberTagUpdateReqVO updateReqVO) {
-        tagService.updateTag(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除会员标签")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('member:tag:delete')")
-    public CommonResult<Boolean> deleteTag(@RequestParam("id") Long id) {
-        tagService.deleteTag(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员标签")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:tag:query')")
-    public CommonResult<MemberTagRespVO> getMemberTag(@RequestParam("id") Long id) {
-        MemberTagDO tag = tagService.getTag(id);
-        return success(MemberTagConvert.INSTANCE.convert(tag));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取会员标签精简信息列表", description = "只包含被开启的会员标签，主要用于前端的下拉选项")
-    public CommonResult<List<MemberTagRespVO>> getSimpleTagList() {
-        // 获用户列表，只要开启状态的
-        List<MemberTagDO> list = tagService.getTagList();
-        // 排序后，返回给前端
-        return success(MemberTagConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得会员标签列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('member:tag:query')")
-    public CommonResult<List<MemberTagRespVO>> getMemberTagList(@RequestParam("ids") Collection<Long> ids) {
-        List<MemberTagDO> list = tagService.getTagList(ids);
-        return success(MemberTagConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员标签分页")
-    @PreAuthorize("@ss.hasPermission('member:tag:query')")
-    public CommonResult<PageResult<MemberTagRespVO>> getTagPage(@Valid MemberTagPageReqVO pageVO) {
-        PageResult<MemberTagDO> pageResult = tagService.getTagPage(pageVO);
-        return success(MemberTagConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/MemberUserController.java

@@ -1,121 +0,0 @@
-package cn.newfeifan.mall.module.member.controller.admin.user;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.member.controller.admin.user.vo.*;
-import cn.newfeifan.mall.module.member.convert.user.MemberUserConvert;
-import cn.newfeifan.mall.module.member.dal.dataobject.group.MemberGroupDO;
-import cn.newfeifan.mall.module.member.dal.dataobject.level.MemberLevelDO;
-import cn.newfeifan.mall.module.member.dal.dataobject.tag.MemberTagDO;
-import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
-import cn.newfeifan.mall.module.member.enums.point.MemberPointBizTypeEnum;
-import cn.newfeifan.mall.module.member.service.group.MemberGroupService;
-import cn.newfeifan.mall.module.member.service.level.MemberLevelService;
-import cn.newfeifan.mall.module.member.service.point.MemberPointRecordService;
-import cn.newfeifan.mall.module.member.service.tag.MemberTagService;
-import cn.newfeifan.mall.module.member.service.user.MemberUserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.newfeifan.mall.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - 会员用户")
-@RestController
-@RequestMapping("/member/user")
-@Validated
-public class MemberUserController {
-
-    @Resource
-    private MemberUserService memberUserService;
-    @Resource
-    private MemberTagService memberTagService;
-    @Resource
-    private MemberLevelService memberLevelService;
-    @Resource
-    private MemberGroupService memberGroupService;
-    @Resource
-    private MemberPointRecordService memberPointRecordService;
-
-    @PutMapping("/update")
-    @Operation(summary = "更新会员用户")
-    @PreAuthorize("@ss.hasPermission('member:user:update')")
-    public CommonResult<Boolean> updateUser(@Valid @RequestBody MemberUserUpdateReqVO updateReqVO) {
-        memberUserService.updateUser(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-level")
-    @Operation(summary = "更新会员用户等级")
-    @PreAuthorize("@ss.hasPermission('member:user:update-level')")
-    public CommonResult<Boolean> updateUserLevel(@Valid @RequestBody MemberUserUpdateLevelReqVO updateReqVO) {
-        memberLevelService.updateUserLevel(updateReqVO);
-        return success(true);
-    }
-
-    @PutMapping("/update-point")
-    @Operation(summary = "更新会员用户积分")
-    @PreAuthorize("@ss.hasPermission('member:user:update-point')")
-    public CommonResult<Boolean> updateUserPoint(@Valid @RequestBody MemberUserUpdatePointReqVO updateReqVO) {
-        memberPointRecordService.createPointRecord(updateReqVO.getId(), updateReqVO.getPoint(),
-                MemberPointBizTypeEnum.ADMIN, String.valueOf(getLoginUserId()));
-        return success(true);
-    }
-
-    @PutMapping("/update-balance")
-    @Operation(summary = "更新会员用户余额")
-    @PreAuthorize("@ss.hasPermission('member:user:update-balance')")
-    public CommonResult<Boolean> updateUserBalance(@Valid @RequestBody Long id) {
-        // todo @jason：增加一个【修改余额】
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得会员用户")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:user:query')")
-    public CommonResult<MemberUserRespVO> getUser(@RequestParam("id") Long id) {
-        MemberUserDO user = memberUserService.getUser(id);
-        return success(MemberUserConvert.INSTANCE.convert03(user));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得会员用户分页")
-    @PreAuthorize("@ss.hasPermission('member:user:query')")
-    public CommonResult<PageResult<MemberUserRespVO>> getUserPage(@Valid MemberUserPageReqVO pageVO) {
-        PageResult<MemberUserDO> pageResult = memberUserService.getUserPage(pageVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(PageResult.empty());
-        }
-
-        // 处理用户标签返显
-        Set<Long> tagIds = pageResult.getList().stream()
-                .map(MemberUserDO::getTagIds)
-                .filter(Objects::nonNull)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toSet());
-        List<MemberTagDO> tags = memberTagService.getTagList(tagIds);
-        // 处理用户级别返显
-        List<MemberLevelDO> levels = memberLevelService.getLevelList(
-                convertSet(pageResult.getList(), MemberUserDO::getLevelId));
-        // 处理用户分组返显
-        List<MemberGroupDO> groups = memberGroupService.getGroupList(
-                convertSet(pageResult.getList(), MemberUserDO::getGroupId));
-        return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/signin/AppMemberSignInRecordController.java

@@ -20,7 +20,7 @@ import javax.annotation.Resource;
 import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
 import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
-@Tag(name = "管理后台 - 签到记录")
+@Tag(name = "用户 App - 签到记录")
 @RestController
 @RequestMapping("/member/sign-in/record")
 @Validated

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/account/MpAccountController.java

@@ -1,98 +0,0 @@
-package cn.newfeifan.mall.module.mp.controller.admin.account;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.mp.controller.admin.account.vo.*;
-import cn.newfeifan.mall.module.mp.convert.account.MpAccountConvert;
-import cn.newfeifan.mall.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.newfeifan.mall.module.mp.service.account.MpAccountService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 公众号账号")
-@RestController
-@RequestMapping("/mp/account")
-@Validated
-public class MpAccountController {
-
-    @Resource
-    private MpAccountService mpAccountService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建公众号账号")
-    @PreAuthorize("@ss.hasPermission('mp:account:create')")
-    public CommonResult<Long> createAccount(@Valid @RequestBody MpAccountCreateReqVO createReqVO) {
-        return success(mpAccountService.createAccount(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新公众号账号")
-    @PreAuthorize("@ss.hasPermission('mp:account:update')")
-    public CommonResult<Boolean> updateAccount(@Valid @RequestBody MpAccountUpdateReqVO updateReqVO) {
-        mpAccountService.updateAccount(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除公众号账号")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mp:account:delete')")
-    public CommonResult<Boolean> deleteAccount(@RequestParam("id") Long id) {
-        mpAccountService.deleteAccount(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得公众号账号")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('mp:account:query')")
-    public CommonResult<MpAccountRespVO> getAccount(@RequestParam("id") Long id) {
-        MpAccountDO wxAccount = mpAccountService.getAccount(id);
-        return success(MpAccountConvert.INSTANCE.convert(wxAccount));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得公众号账号分页")
-    @PreAuthorize("@ss.hasPermission('mp:account:query')")
-    public CommonResult<PageResult<MpAccountRespVO>> getAccountPage(@Valid MpAccountPageReqVO pageVO) {
-        PageResult<MpAccountDO> pageResult = mpAccountService.getAccountPage(pageVO);
-        return success(MpAccountConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取公众号账号精简信息列表")
-    @PreAuthorize("@ss.hasPermission('mp:account:query')")
-    public CommonResult<List<MpAccountSimpleRespVO>> getSimpleAccounts() {
-        List<MpAccountDO> list = mpAccountService.getAccountList();
-        return success(MpAccountConvert.INSTANCE.convertList02(list));
-    }
-
-    @PutMapping("/generate-qr-code")
-    @Operation(summary = "生成公众号二维码")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mp:account:qr-code')")
-    public CommonResult<Boolean> generateAccountQrCode(@RequestParam("id") Long id) {
-        mpAccountService.generateAccountQrCode(id);
-        return success(true);
-    }
-
-    @PutMapping("/clear-quota")
-    @Operation(summary = "清空公众号 API 配额")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mp:account:clear-quota')")
-    public CommonResult<Boolean> clearAccountQuota(@RequestParam("id") Long id) {
-        mpAccountService.clearAccountQuota(id);
-        return success(true);
-    }
-
-}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/material/MpMaterialController.http

@@ -1,5 +0,0 @@
-### 请求 /mp/material/page 接口 => 成功
-GET {{baseUrl}}/mp/material/page?permanent=true&pageNo=1&pageSize=10
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/material/MpMaterialController.java

@@ -1,74 +0,0 @@
-package cn.newfeifan.mall.module.mp.controller.admin.material;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.mp.controller.admin.material.vo.*;
-import cn.newfeifan.mall.module.mp.convert.material.MpMaterialConvert;
-import cn.newfeifan.mall.module.mp.dal.dataobject.material.MpMaterialDO;
-import cn.newfeifan.mall.module.mp.service.material.MpMaterialService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.io.IOException;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 公众号素材")
-@RestController
-@RequestMapping("/mp/material")
-@Validated
-public class MpMaterialController {
-
-    @Resource
-    private MpMaterialService mpMaterialService;
-
-    @Operation(summary = "上传临时素材")
-    @PostMapping("/upload-temporary")
-    @PreAuthorize("@ss.hasPermission('mp:material:upload-temporary')")
-    public CommonResult<MpMaterialUploadRespVO> uploadTemporaryMaterial(
-            @Valid MpMaterialUploadTemporaryReqVO reqVO) throws IOException {
-        MpMaterialDO material = mpMaterialService.uploadTemporaryMaterial(reqVO);
-        return success(MpMaterialConvert.INSTANCE.convert(material));
-    }
-
-    @Operation(summary = "上传永久素材")
-    @PostMapping("/upload-permanent")
-    @PreAuthorize("@ss.hasPermission('mp:material:upload-permanent')")
-    public CommonResult<MpMaterialUploadRespVO> uploadPermanentMaterial(
-            @Valid MpMaterialUploadPermanentReqVO reqVO) throws IOException {
-        MpMaterialDO material = mpMaterialService.uploadPermanentMaterial(reqVO);
-        return success(MpMaterialConvert.INSTANCE.convert(material));
-    }
-
-    @Operation(summary = "删除素材")
-    @DeleteMapping("/delete-permanent")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('mp:material:delete')")
-    public CommonResult<Boolean> deleteMaterial(@RequestParam("id") Long id) {
-        mpMaterialService.deleteMaterial(id);
-        return success(true);
-    }
-
-    @Operation(summary = "上传图文内容中的图片")
-    @PostMapping("/upload-news-image")
-    @PreAuthorize("@ss.hasPermission('mp:material:upload-news-image')")
-    public CommonResult<String> uploadNewsImage(@Valid MpMaterialUploadNewsImageReqVO reqVO)
-            throws IOException {
-        return success(mpMaterialService.uploadNewsImage(reqVO));
-    }
-
-    @Operation(summary = "获得素材分页")
-    @GetMapping("/page")
-    @PreAuthorize("@ss.hasPermission('mp:material:query')")
-    public CommonResult<PageResult<MpMaterialRespVO>> getMaterialPage(@Valid MpMaterialPageReqVO pageReqVO) {
-        PageResult<MpMaterialDO> pageResult = mpMaterialService.getMaterialPage(pageReqVO);
-        return success(MpMaterialConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/menu/MpMenuController.http

@@ -1,50 +0,0 @@
-### 请求 /mp/menu/save 接口 => 成功
-POST {{baseUrl}}/mp/menu/save
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-{
-  "accountId": "1",
-  "menus": [
-    {
-      "type":"click",
-      "name":"今日歌曲",
-      "menuKey":"V1001_TODAY_MUSIC"
-    },
-    {
-      "name":"搜索",
-      "type":"view",
-      "url":"https://www.soso.com/"
-    },
-    {
-      "name": "父按钮",
-      "children": [
-        {
-          "type":"click",
-          "name":"归去来兮",
-          "menuKey":"MUSIC"
-        },
-        {
-          "name":"不说",
-          "type":"view",
-          "url":"https://www.soso.com/"
-        }]
-    }]
-}
-
-### 请求 /mp/menu/save 接口 => 成功（清空）
-POST {{baseUrl}}/mp/menu/save
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-{
-  "accountId": "1",
-  "menus": []
-}
-
-### 请求 /mp/menu/list 接口 => 成功
-GET {{baseUrl}}/mp/menu/list?accountId=1
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/menu/MpMenuController.java

@@ -1,57 +0,0 @@
-package cn.newfeifan.mall.module.mp.controller.admin.menu;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.module.mp.controller.admin.menu.vo.MpMenuRespVO;
-import cn.newfeifan.mall.module.mp.controller.admin.menu.vo.MpMenuSaveReqVO;
-import cn.newfeifan.mall.module.mp.convert.menu.MpMenuConvert;
-import cn.newfeifan.mall.module.mp.dal.dataobject.menu.MpMenuDO;
-import cn.newfeifan.mall.module.mp.service.menu.MpMenuService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 公众号菜单")
-@RestController
-@RequestMapping("/mp/menu")
-@Validated
-public class MpMenuController {
-
-    @Resource
-    private MpMenuService mpMenuService;
-
-    @PostMapping("/save")
-    @Operation(summary = "保存公众号菜单")
-    @PreAuthorize("@ss.hasPermission('mp:menu:save')")
-    public CommonResult<Boolean> saveMenu(@Valid @RequestBody MpMenuSaveReqVO createReqVO) {
-        mpMenuService.saveMenu(createReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除公众号菜单")
-    @Parameter(name = "accountId", description = "公众号账号的编号", required = true, example = "10")
-    @PreAuthorize("@ss.hasPermission('mp:menu:delete')")
-    public CommonResult<Boolean> deleteMenu(@RequestParam("accountId") Long accountId) {
-        mpMenuService.deleteMenuByAccountId(accountId);
-        return success(true);
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得公众号菜单列表")
-    @Parameter(name = "accountId", description = "公众号账号的编号", required = true, example = "10")
-    @PreAuthorize("@ss.hasPermission('mp:menu:query')")
-    public CommonResult<List<MpMenuRespVO>> getMenuList(@RequestParam("accountId") Long accountId) {
-        List<MpMenuDO> list = mpMenuService.getMenuListByAccountId(accountId);
-        return success(MpMenuConvert.INSTANCE.convertList(list));
-    }
-
-}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/message/MpAutoReplyController.http

@@ -1,5 +0,0 @@
-### 请求 /mp/message/page 接口 => 成功
-GET {{baseUrl}}/mp/auto-reply/page?accountId=1&pageNo=1&pageSize=10
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/message/MpAutoReplyController.java

@@ -1,74 +0,0 @@
-package cn.newfeifan.mall.module.mp.controller.admin.message;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyCreateReqVO;
-import cn.newfeifan.mall.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyRespVO;
-import cn.newfeifan.mall.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyUpdateReqVO;
-import cn.newfeifan.mall.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
-import cn.newfeifan.mall.module.mp.convert.message.MpAutoReplyConvert;
-import cn.newfeifan.mall.module.mp.dal.dataobject.message.MpAutoReplyDO;
-import cn.newfeifan.mall.module.mp.service.message.MpAutoReplyService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 公众号自动回复")
-@RestController
-@RequestMapping("/mp/auto-reply")
-@Validated
-public class MpAutoReplyController {
-
-    @Resource
-    private MpAutoReplyService mpAutoReplyService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得公众号自动回复分页")
-    @PreAuthorize("@ss.hasPermission('mp:auto-reply:query')")
-    public CommonResult<PageResult<MpAutoReplyRespVO>> getAutoReplyPage(@Valid MpMessagePageReqVO pageVO) {
-        PageResult<MpAutoReplyDO> pageResult = mpAutoReplyService.getAutoReplyPage(pageVO);
-        return success(MpAutoReplyConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得公众号自动回复")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('mp:auto-reply:query')")
-    public CommonResult<MpAutoReplyRespVO> getAutoReply(@RequestParam("id") Long id) {
-        MpAutoReplyDO autoReply = mpAutoReplyService.getAutoReply(id);
-        return success(MpAutoReplyConvert.INSTANCE.convert(autoReply));
-    }
-
-    @PostMapping("/create")
-    @Operation(summary = "创建公众号自动回复")
-    @PreAuthorize("@ss.hasPermission('mp:auto-reply:create')")
-    public CommonResult<Long> createAutoReply(@Valid @RequestBody MpAutoReplyCreateReqVO createReqVO) {
-        return success(mpAutoReplyService.createAutoReply(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新公众号自动回复")
-    @PreAuthorize("@ss.hasPermission('mp:auto-reply:update')")
-    public CommonResult<Boolean> updateAutoReply(@Valid @RequestBody MpAutoReplyUpdateReqVO updateReqVO) {
-        mpAutoReplyService.updateAutoReply(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除公众号自动回复")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mp:auto-reply:delete')")
-    public CommonResult<Boolean> deleteAutoReply(@RequestParam("id") Long id) {
-        mpAutoReplyService.deleteAutoReply(id);
-        return success(true);
-    }
-
-}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/message/MpMessageController.http

@@ -1,33 +0,0 @@
-### 请求 /mp/message/page 接口 => 成功
-GET {{baseUrl}}/mp/message/page?accountId=1&pageNo=1&pageSize=10
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-### 请求 /mp/message/send 接口 => 成功（文本）
-POST {{baseUrl}}/mp/message/send
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-{
-  "userId": 3,
-  "type": "text",
-  "content": "测试消息"
-}
-
-### 请求 /mp/message/send 接口 => 成功（音乐）
-POST {{baseUrl}}/mp/message/send
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-{
-  "userId": 3,
-  "type": "music",
-  "title": "测试音乐标题",
-  "description": "测试音乐内容",
-  "musicUrl": "https://www.zhongxing.cn/xx.mp3",
-  "hqMusicUrl": "https://www.zhongxing.cn/xx_high.mp3",
-  "thumbMediaId": "s98Iveeg9vDVFwa9q0u8-zSfdKe3xIzAm7wCrFE4WKGPIo4d9qAhtC-n6qvnyWyH"
-}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/message/MpMessageController.java

@@ -1,47 +0,0 @@
-package cn.newfeifan.mall.module.mp.controller.admin.message;
-
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
-import cn.newfeifan.mall.module.mp.controller.admin.message.vo.message.MpMessageRespVO;
-import cn.newfeifan.mall.module.mp.controller.admin.message.vo.message.MpMessageSendReqVO;
-import cn.newfeifan.mall.module.mp.convert.message.MpMessageConvert;
-import cn.newfeifan.mall.module.mp.dal.dataobject.message.MpMessageDO;
-import cn.newfeifan.mall.module.mp.service.message.MpMessageService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 公众号消息")
-@RestController
-@RequestMapping("/mp/message")
-@Validated
-public class MpMessageController {
-
-    @Resource
-    private MpMessageService mpMessageService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得公众号消息分页")
-    @PreAuthorize("@ss.hasPermission('mp:message:query')")
-    public CommonResult<PageResult<MpMessageRespVO>> getMessagePage(@Valid MpMessagePageReqVO pageVO) {
-        PageResult<MpMessageDO> pageResult = mpMessageService.getMessagePage(pageVO);
-        return success(MpMessageConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @PostMapping("/send")
-    @Operation(summary = "给粉丝发送消息")
-    @PreAuthorize("@ss.hasPermission('mp:message:send')")
-    public CommonResult<MpMessageRespVO> sendMessage(@Valid @RequestBody MpMessageSendReqVO reqVO) {
-        MpMessageDO message = mpMessageService.sendKefuMessage(reqVO);
-        return success(MpMessageConvert.INSTANCE.convert(message));
-    }
-
-}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/news/MpDraftController.http

@@ -1,54 +0,0 @@
-### 请求 /mp/draft/page 接口 => 成功
-GET {{baseUrl}}/mp/draft/page?accountId=1&pageNo=1&pageSize=10
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-### 请求 /mp/draft/create 接口 => 成功
-POST {{baseUrl}}/mp/draft/create?accountId=1
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-{
-  "articles": [
-    {
-      "title": "我是标题",
-      "author": "我是作者",
-      "digest": "我是摘要",
-      "content": "我是内容",
-      "contentSourceUrl": "https://www.zhongxing.cn",
-      "thumbMediaId": "r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn"
-    },
-    {
-      "title": "我是标题 2",
-      "author": "我是作者 2",
-      "digest": "我是摘要 2",
-      "content": "我是内容 2",
-      "contentSourceUrl": "https://www.zhongxing.cn",
-      "thumbMediaId": "r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn"
-    }
-  ]
-}
-
-### 请求 /mp/draft/create 接口 => 成功
-PUT {{baseUrl}}/mp/draft/update?accountId=1&mediaId=r6ryvl6LrxBU0miaST4Y-q-G9pdsmZw0OYG4FzHQkKfpLfEwIH51wy2bxisx8PvW
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-[{
-    "title": "我是标题（OOO）",
-    "author": "我是作者",
-    "digest": "我是摘要",
-    "content": "我是内容",
-    "contentSourceUrl": "https://www.zhongxing.cn",
-    "thumbMediaId": "r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn"
-}, {
-  "title": "我是标题（XXX）",
-  "author": "我是作者",
-  "digest": "我是摘要",
-  "content": "我是内容",
-  "contentSourceUrl": "https://www.zhongxing.cn",
-  "thumbMediaId": "r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn"
-}]

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/news/MpDraftController.java

@@ -1,136 +0,0 @@
-package cn.newfeifan.mall.module.mp.controller.admin.news;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.collection.CollectionUtils;
-import cn.newfeifan.mall.framework.common.util.object.PageUtils;
-import cn.newfeifan.mall.module.mp.controller.admin.news.vo.MpDraftPageReqVO;
-import cn.newfeifan.mall.module.mp.dal.dataobject.material.MpMaterialDO;
-import cn.newfeifan.mall.module.mp.framework.mp.core.MpServiceFactory;
-import cn.newfeifan.mall.module.mp.service.material.MpMaterialService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.draft.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.MapUtils.findAndThen;
-import static cn.newfeifan.mall.module.mp.enums.ErrorCodeConstants.*;
-
-@Tag(name = "管理后台 - 公众号草稿")
-@RestController
-@RequestMapping("/mp/draft")
-@Validated
-public class MpDraftController {
-
-    @Resource
-    private MpServiceFactory mpServiceFactory;
-
-    @Resource
-    private MpMaterialService mpMaterialService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得草稿分页")
-    @PreAuthorize("@ss.hasPermission('mp:draft:query')")
-    public CommonResult<PageResult<WxMpDraftItem>> getDraftPage(MpDraftPageReqVO reqVO) {
-        // 从公众号查询草稿箱
-        WxMpService mpService = mpServiceFactory.getRequiredMpService(reqVO.getAccountId());
-        WxMpDraftList draftList;
-        try {
-            draftList = mpService.getDraftService().listDraft(PageUtils.getStart(reqVO), reqVO.getPageSize());
-        } catch (WxErrorException e) {
-            throw exception(DRAFT_LIST_FAIL, e.getError().getErrorMsg());
-        }
-        // 查询对应的图片地址。目的：解决公众号的图片链接无法在我们后台展示
-        setDraftThumbUrl(draftList.getItems());
-
-        // 返回分页
-        return success(new PageResult<>(draftList.getItems(), draftList.getTotalCount().longValue()));
-    }
-
-    private void setDraftThumbUrl(List<WxMpDraftItem> items) {
-        // 1.1 获得 mediaId 数组
-        Set<String> mediaIds = new HashSet<>();
-        items.forEach(item -> item.getContent().getNewsItem().forEach(newsItem -> mediaIds.add(newsItem.getThumbMediaId())));
-        if (CollUtil.isEmpty(mediaIds)) {
-            return;
-        }
-        // 1.2 批量查询对应的 Media 素材
-        Map<String, MpMaterialDO> materials = CollectionUtils.convertMap(mpMaterialService.getMaterialListByMediaId(mediaIds),
-                MpMaterialDO::getMediaId);
-
-        // 2. 设置回 WxMpDraftItem 记录
-        items.forEach(item -> item.getContent().getNewsItem().forEach(newsItem ->
-                findAndThen(materials, newsItem.getThumbMediaId(), material -> newsItem.setThumbUrl(material.getUrl()))));
-    }
-
-    @PostMapping("/create")
-    @Operation(summary = "创建草稿")
-    @Parameter(name = "accountId", description = "公众号账号的编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('mp:draft:create')")
-    public CommonResult<String> deleteDraft(@RequestParam("accountId") Long accountId,
-                                            @RequestBody WxMpAddDraft draft) {
-        WxMpService mpService = mpServiceFactory.getRequiredMpService(accountId);
-        try {
-            String mediaId = mpService.getDraftService().addDraft(draft);
-            return success(mediaId);
-        } catch (WxErrorException e) {
-            throw exception(DRAFT_CREATE_FAIL, e.getError().getErrorMsg());
-        }
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新草稿")
-    @Parameters({
-            @Parameter(name = "accountId", description = "公众号账号的编号", required = true, example = "1024"),
-            @Parameter(name = "mediaId", description = "草稿素材的编号", required = true, example = "xxx")
-    })
-    @PreAuthorize("@ss.hasPermission('mp:draft:update')")
-    public CommonResult<Boolean> deleteDraft(@RequestParam("accountId") Long accountId,
-                                             @RequestParam("mediaId") String mediaId,
-                                             @RequestBody List<WxMpDraftArticles> articles) {
-        WxMpService mpService = mpServiceFactory.getRequiredMpService(accountId);
-        try {
-            for (int i = 0; i < articles.size(); i++) {
-                WxMpDraftArticles article = articles.get(i);
-                mpService.getDraftService().updateDraft(new WxMpUpdateDraft(mediaId, i, article));
-            }
-            return success(true);
-        } catch (WxErrorException e) {
-            throw exception(DRAFT_UPDATE_FAIL, e.getError().getErrorMsg());
-        }
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除草稿")
-    @Parameters({
-            @Parameter(name = "accountId", description = "公众号账号的编号", required = true, example = "1024"),
-            @Parameter(name = "mediaId", description = "草稿素材的编号", required = true, example = "xxx")
-    })
-    @PreAuthorize("@ss.hasPermission('mp:draft:delete')")
-    public CommonResult<Boolean> deleteDraft(@RequestParam("accountId") Long accountId,
-                                             @RequestParam("mediaId") String mediaId) {
-        WxMpService mpService = mpServiceFactory.getRequiredMpService(accountId);
-        try {
-            mpService.getDraftService().delDraft(mediaId);
-            return success(true);
-        } catch (WxErrorException e) {
-            throw exception(DRAFT_DELETE_FAIL, e.getError().getErrorMsg());
-        }
-    }
-
-}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/news/MpFreePublishController.http

@@ -1,13 +0,0 @@
-### 请求 /mp/free-publish/page 接口 => 成功
-GET {{baseUrl}}/mp/free-publish/page?accountId=1&pageNo=1&pageSize=10
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-### 请求 /mp/free-publish/submit 接口 => 成功
-POST {{baseUrl}}/mp/free-publish/submit?accountId=1&mediaId=r6ryvl6LrxBU0miaST4Y-vilmd7iS51D8IPddxflWrau0hIQ2ovY8YanO5jlgUcM
-Content-Type: application/json
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-{}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/news/MpFreePublishController.java

@@ -1,119 +0,0 @@
-package cn.newfeifan.mall.module.mp.controller.admin.news;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.newfeifan.mall.framework.common.pojo.CommonResult;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.util.collection.CollectionUtils;
-import cn.newfeifan.mall.framework.common.util.object.PageUtils;
-import cn.newfeifan.mall.module.mp.controller.admin.news.vo.MpFreePublishPageReqVO;
-import cn.newfeifan.mall.module.mp.dal.dataobject.material.MpMaterialDO;
-import cn.newfeifan.mall.module.mp.framework.mp.core.MpServiceFactory;
-import cn.newfeifan.mall.module.mp.service.material.MpMaterialService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.freepublish.WxMpFreePublishItem;
-import me.chanjar.weixin.mp.bean.freepublish.WxMpFreePublishList;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.MapUtils.findAndThen;
-import static cn.newfeifan.mall.module.mp.enums.ErrorCodeConstants.*;
-
-@Tag(name = "管理后台 - 公众号发布能力")
-@RestController
-@RequestMapping("/mp/free-publish")
-@Validated
-public class MpFreePublishController {
-
-    @Resource
-    private MpServiceFactory mpServiceFactory;
-
-    @Resource
-    private MpMaterialService mpMaterialService;
-
-    @GetMapping("/page")
-    @Operation(summary = "获得已发布的图文分页")
-    @PreAuthorize("@ss.hasPermission('mp:free-publish:query')")
-    public CommonResult<PageResult<WxMpFreePublishItem>> getFreePublishPage(MpFreePublishPageReqVO reqVO) {
-        // 从公众号查询已发布的图文列表
-        WxMpService mpService = mpServiceFactory.getRequiredMpService(reqVO.getAccountId());
-        WxMpFreePublishList publicationRecords;
-        try {
-            publicationRecords = mpService.getFreePublishService().getPublicationRecords(
-                    PageUtils.getStart(reqVO), reqVO.getPageSize());
-        } catch (WxErrorException e) {
-            throw exception(FREE_PUBLISH_LIST_FAIL, e.getError().getErrorMsg());
-        }
-        // 查询对应的图片地址。目的：解决公众号的图片链接无法在我们后台展示
-        setFreePublishThumbUrl(publicationRecords.getItems());
-
-        // 返回分页
-        return success(new PageResult<>(publicationRecords.getItems(), publicationRecords.getTotalCount().longValue()));
-    }
-
-    private void setFreePublishThumbUrl(List<WxMpFreePublishItem> items) {
-        // 1.1 获得 mediaId 数组
-        Set<String> mediaIds = new HashSet<>();
-        items.forEach(item -> item.getContent().getNewsItem().forEach(newsItem -> mediaIds.add(newsItem.getThumbMediaId())));
-        if (CollUtil.isEmpty(mediaIds)) {
-            return;
-        }
-        // 1.2 批量查询对应的 Media 素材
-        Map<String, MpMaterialDO> materials = CollectionUtils.convertMap(mpMaterialService.getMaterialListByMediaId(mediaIds),
-                MpMaterialDO::getMediaId);
-
-        // 2. 设置回 WxMpFreePublishItem 记录
-        items.forEach(item -> item.getContent().getNewsItem().forEach(newsItem ->
-                findAndThen(materials, newsItem.getThumbMediaId(), material -> newsItem.setThumbUrl(material.getUrl()))));
-    }
-
-    @PostMapping("/submit")
-    @Operation(summary = "发布草稿")
-    @Parameters({
-            @Parameter(name = "accountId", description = "公众号账号的编号", required = true, example = "1024"),
-            @Parameter(name = "mediaId", description = "要发布的草稿的 media_id", required = true, example = "2048")
-    })
-    @PreAuthorize("@ss.hasPermission('mp:free-publish:submit')")
-    public CommonResult<String> submitFreePublish(@RequestParam("accountId") Long accountId,
-                                                  @RequestParam("mediaId") String mediaId) {
-        WxMpService mpService = mpServiceFactory.getRequiredMpService(accountId);
-        try {
-            String publishId = mpService.getFreePublishService().submit(mediaId);
-            return success(publishId);
-        } catch (WxErrorException e) {
-            throw exception(FREE_PUBLISH_SUBMIT_FAIL, e.getError().getErrorMsg());
-        }
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除草稿")
-    @Parameters({
-            @Parameter(name = "accountId", description = "公众号账号的编号", required = true, example = "1024"),
-            @Parameter(name = "articleId", description = "发布记录的编号", required = true, example = "2048")
-    })
-    @PreAuthorize("@ss.hasPermission('mp:free-publish:delete')")
-    public CommonResult<Boolean> deleteFreePublish(@RequestParam("accountId") Long accountId,
-                                                   @RequestParam("articleId") String articleId) {
-        WxMpService mpService = mpServiceFactory.getRequiredMpService(accountId);
-        try {
-            mpService.getFreePublishService().deletePushAllArticle(articleId);
-            return success(true);
-        } catch (WxErrorException e) {
-            throw exception(FREE_PUBLISH_DELETE_FAIL, e.getError().getErrorMsg());
-        }
-    }
-
-}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/news/vo/MpDraftPageReqVO.java

@@ -1,21 +0,0 @@
-package cn.newfeifan.mall.module.mp.controller.admin.news.vo;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 公众号草稿的分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MpDraftPageReqVO extends PageParam {
-
-    @Schema(description = "公众号账号的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotNull(message = "公众号账号的编号不能为空")
-    private Long accountId;
-
-}

feifan-module-mp/feifan-module-mp-biz/src/main/java/cn/newfeifan/mall/module/mp/controller/admin/news/vo/MpFreePublishPageReqVO.java

@@ -1,21 +0,0 @@
-package cn.newfeifan.mall.module.mp.controller.admin.news.vo;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 公众号已发布列表的分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MpFreePublishPageReqVO extends PageParam {
-
-    @Schema(description = "公众号账号的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotNull(message = "公众号账号的编号不能为空")
-    private Long accountId;
-
-}