From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index ce70940..54c7f04 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.mapper.PaymentShippingMapper;
import com.ruoyi.sales.pojo.PaymentShipping;
import com.ruoyi.sales.service.PaymentShippingService;
@@ -15,6 +17,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -32,37 +35,40 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ鏀粯涓庡彂璐т俊鎭�")
- public R<?> listPage(Page page, PaymentShipping paymentShipping) {
+ public AjaxResult listPage(Page page, PaymentShipping paymentShipping) {
IPage<PaymentShipping> listPage = paymentShippingService.listPage(page, paymentShipping);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
+ @Log(title = "浠樻鍙戣揣", businessType = BusinessType.INSERT)
@PostMapping("/add")
@Operation(summary = "娣诲姞鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody PaymentShipping paymentShipping) {
- String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no");
+ public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
+ String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no", paymentShipping.getCreateTime() != null ? paymentShipping.getCreateTime() : LocalDateTime.now());
paymentShipping.setOrderNo(ord);
boolean save = paymentShippingService.save(paymentShipping);
- return save ? R.ok() : R.fail();
+ return save ? success() : error();
}
+ @Log(title = "浠樻鍙戣揣", businessType = BusinessType.UPDATE)
@PostMapping("/update")
@Operation(summary = "淇敼鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody PaymentShipping paymentShipping) {
+ public AjaxResult update(@RequestBody PaymentShipping paymentShipping) {
boolean update = paymentShippingService.updateById(paymentShipping);
- return update ? R.ok() : R.fail();
+ return update ? success() : error();
}
+ @Log(title = "浠樻鍙戣揣", businessType = BusinessType.DELETE)
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids){
+ public AjaxResult delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)){
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return R.ok(paymentShippingService.removeByIds(ids));
+ return AjaxResult.success(paymentShippingService.removeByIds(ids));
}
}
--
Gitblit v1.9.3