From 482b2982ba27b18e6391c3862ec239c89a801a46 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 13:09:05 +0800
Subject: [PATCH] feat(home): 添加生产看板功能并优化订单查询性能
---
src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index dabd7ac..ce70940 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -5,13 +5,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.PaymentShippingMapper;
import com.ruoyi.sales.pojo.PaymentShipping;
import com.ruoyi.sales.service.PaymentShippingService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,48 +23,46 @@
*/
@RestController
@RequestMapping("/paymentShipping")
-@Api(tags = "鏀粯涓庡彂璐х鐞�")
+@Tag(name = "鏀粯涓庡彂璐х鐞�")
+@AllArgsConstructor
public class PaymentShippingController extends BaseController {
- @Autowired
private PaymentShippingService paymentShippingService;
-
- @Autowired
private PaymentShippingMapper paymentShippingMapper;
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ鏀粯涓庡彂璐т俊鎭�")
- public AjaxResult listPage(Page page, PaymentShipping paymentShipping) {
+ @Operation(summary = "鍒嗛〉鏌ヨ鏀粯涓庡彂璐т俊鎭�")
+ public R<?> listPage(Page page, PaymentShipping paymentShipping) {
IPage<PaymentShipping> listPage = paymentShippingService.listPage(page, paymentShipping);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
- @ApiOperation("娣诲姞鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "娣诲姞鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
+ public R<?> add(@RequestBody PaymentShipping paymentShipping) {
String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no");
paymentShipping.setOrderNo(ord);
boolean save = paymentShippingService.save(paymentShipping);
- return save ? success() : error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
- @ApiOperation("淇敼鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "淇敼鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody PaymentShipping paymentShipping) {
+ public R<?> update(@RequestBody PaymentShipping paymentShipping) {
boolean update = paymentShippingService.updateById(paymentShipping);
- return update ? success() : error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids){
+ public R<?> delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return AjaxResult.success(paymentShippingService.removeByIds(ids));
+ return R.ok(paymentShippingService.removeByIds(ids));
}
}
--
Gitblit v1.9.3