From 3728fa293e1faf4bf4f9bf41105b84ddb43dc82e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 02 十一月 2026 16:53:02 +0800
Subject: [PATCH] feat(order-rates): 新增筛选条件下全部订单费用汇总接口
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java
index 89859ab..4a9d969 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java
@@ -5,12 +5,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.dto.SampleOrderDto;
+import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.service.InsOrderRatesService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
+import java.math.BigDecimal;
/**
@@ -36,8 +38,50 @@
*/
@Operation(summary = "鏌ヨ璁㈠崟鍒楄〃")
@GetMapping("/selectRatesPage")
- public Result selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto) {
- return Result.success(insOrderRatesService.selectInsOrderRates(page, sampleOrderDto));
+ public Result selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto,
+ String startMonth, String endMonth) {
+ return Result.success(insOrderRatesService.selectInsOrderRates(page, sampleOrderDto, startMonth, endMonth));
+ }
+
+
+ @Operation(summary = "姹囨�荤瓫閫夋潯浠朵笅鍏ㄩ儴璁㈠崟璐圭敤")
+ @GetMapping("/selectRatesSummary")
+ public Result selectRatesSummary(SampleOrderDto sampleOrderDto, String startMonth, String endMonth) {
+ return Result.success(insOrderRatesService.selectRatesSummary(sampleOrderDto, startMonth, endMonth));
+ }
+
+ /**
+ * 鏇存柊璐圭敤浼樻儬涓庡娉�
+ * @param insOrder
+ * @return
+ */
+ @Operation(summary = "鏇存柊璐圭敤浼樻儬涓庡娉�")
+ @PostMapping("/updateFee")
+ public Result<?> updateFee(@RequestBody InsOrder insOrder) {
+ if (insOrder.getId() == null) {
+ return Result.fail("璁㈠崟id涓嶈兘涓虹┖");
+ }
+ Integer isDiscount = insOrder.getIsDiscount();
+ if (isDiscount == null || (isDiscount != 0 && isDiscount != 1)) {
+ return Result.fail("鏄惁浼樻儬鍙傛暟涓嶆纭�");
+ }
+ BigDecimal discountAmount = insOrder.getDiscountAmount();
+ if (isDiscount == 1) {
+ if (discountAmount == null) {
+ return Result.fail("鏈変紭鎯犳椂璇峰～鍐欎紭鎯犲悗閲戦");
+ }
+ if (discountAmount.compareTo(BigDecimal.ZERO) < 0) {
+ return Result.fail("浼樻儬鍚庨噾棰濅笉鑳藉皬浜�0");
+ }
+ } else {
+ discountAmount = null;
+ }
+ String feeRemark = insOrder.getFeeRemark();
+ if (feeRemark != null && feeRemark.length() > 500) {
+ return Result.fail("澶囨敞涓嶈兘瓒呰繃500瀛�");
+ }
+ boolean success = insOrderRatesService.updateOrderFee(insOrder.getId(), isDiscount, discountAmount, feeRemark);
+ return success ? Result.success() : Result.fail("淇濆瓨澶辫触锛岃鍗曚笉瀛樺湪");
}
--
Gitblit v1.9.3