rk
15 小时以前 33caf2bb79bb3c561916c91ae386ec772411e2e8
server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
@@ -42,64 +42,6 @@
    @Autowired
    private PricingRuleService pricingRuleService;
    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:pricingRule:create")
    public ApiResponse create(@RequestBody PricingRule pricingRule) {
        return ApiResponse.success(pricingRuleService.create(pricingRule));
    }
    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:pricingRule:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        pricingRuleService.deleteById(id);
        return ApiResponse.success(null);
    }
    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:pricingRule:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
        String[] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        pricingRuleService.deleteByIdInBatch(idList);
        return ApiResponse.success(null);
    }
    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:pricingRule:update")
    public ApiResponse updateById(@RequestBody PricingRule pricingRule) {
        pricingRuleService.updateById(pricingRule);
        return ApiResponse.success(null);
    }
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:pricingRule:query")
    public ApiResponse<PageData<PricingRule>> findPage(@RequestBody PageWrap<PricingRule> pageWrap) {
        return ApiResponse.success(pricingRuleService.findPage(pageWrap));
    }
    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:pricingRule:exportExcel")
    public void exportExcel(@RequestBody PageWrap<PricingRule> pageWrap, HttpServletResponse response) {
        List<PricingRule> pricingRuleList = pricingRuleService.findPage(pageWrap).getRecords();
        ExcelExporter.build(PricingRule.class).export(pricingRuleList, "计价规则配置", response);
    }
    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:pricingRule:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(pricingRuleService.findById(id));
    }
    @PreventRepeat
    @ApiOperation("批量保存就地存取规则")
@@ -134,35 +76,19 @@
    }
    @PreventRepeat
    @ApiOperation("新增预计时效配置")
    @PostMapping("/estimatedDelivery/create")
    @ApiOperation("保存预计时效配置")
    @PostMapping("/estimatedDelivery/save")
    @RequiresPermissions("business:pricingRule:create")
    public ApiResponse createEstimatedDelivery(@RequestBody @Validated EstimatedDeliverySaveDTO request) {
        return ApiResponse.success(pricingRuleService.createEstimatedDelivery(request));
    }
    @PreventRepeat
    @ApiOperation("修改预计时效配置")
    @PostMapping("/estimatedDelivery/update")
    @RequiresPermissions("business:pricingRule:update")
    public ApiResponse updateEstimatedDelivery(@RequestBody @Validated EstimatedDeliverySaveDTO request) {
        pricingRuleService.updateEstimatedDelivery(request);
    public ApiResponse saveEstimatedDelivery(@RequestBody @Validated EstimatedDeliverySaveDTO request) {
        pricingRuleService.saveEstimatedDelivery(request);
        return ApiResponse.success(null);
    }
    @ApiOperation("删除预计时效配置")
    @GetMapping("/estimatedDelivery/delete/{id}")
    @RequiresPermissions("business:pricingRule:delete")
    public ApiResponse deleteEstimatedDelivery(@PathVariable Integer id) {
        pricingRuleService.deleteEstimatedDelivery(id);
        return ApiResponse.success(null);
    }
    @ApiOperation("查询预计时效配置列表")
    @ApiOperation("查询预计时效配置")
    @GetMapping("/estimatedDelivery/list")
    @RequiresPermissions("business:pricingRule:query")
    public ApiResponse<List<EstimatedDeliveryVO>> listEstimatedDelivery(@RequestParam Integer cityId) {
        return ApiResponse.success(pricingRuleService.listEstimatedDelivery(cityId));
        return ApiResponse.success(pricingRuleService.getEstimatedDelivery(cityId));
    }
    @PreventRepeat