From ae4a996ce351c55fa466187c74d790efe484dd32 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 18:01:47 +0800
Subject: [PATCH] 解bug
---
inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
index 3e80933..28b986f 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.pojo.dto.ConsignmentDto;
import com.yuanchu.mom.service.SaleService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -13,10 +16,12 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.yuanchu.mom.service.ConsignmentService;
import javax.annotation.Resource;
+import java.sql.Wrapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,12 +52,17 @@
})
@GetMapping("/selSale")
public Result selSale(String orderNumber) {
+ //鍙湁閿�鍞崟瀹℃牳閫氳繃涔嬪悗鎵嶈兘鍙戣揣
+ Sale sale = saleService.getOne(Wrappers.<Sale>query().eq("order_number", orderNumber));
+ if (ObjectUtils.isEmpty(sale.getType()) || sale.getType() != 1 ) {
+ return Result.fail("鍙湁閿�鍞崟瀹℃牳閫氳繃涔嬪悗鎵嶈兘鍙戣揣!");
+ }
return Result.success(saleService.selSale(orderNumber));
}
@ApiOperation(value = "鏂板鎴愬搧鍙戣揣")
@PostMapping("/addCon")
- public Result addCon(@RequestHeader("token") String token, @RequestBody ConsignmentDto consignmentDto) throws Exception {
+ public Result addCon(@RequestHeader("token") String token, @Validated @RequestBody ConsignmentDto consignmentDto) throws Exception {
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
return Result.success(consignmentService.addCon(data.get("name").replaceAll("\"", ""), consignmentDto));
}
@@ -74,6 +84,7 @@
map.put("row", consignmentPage.getRecords());
return Result.success(map);
}
+
@ApiOperation(value = "鏍规嵁鍙戣揣id鍒犻櫎")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "鍙戣揣id", dataTypeClass = Integer.class, required = true)
--
Gitblit v1.9.3