From d9e5ab959b7ff2c578672938c205a7a82765ef9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 09:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
similarity index 93%
rename from sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
rename to inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
index 97fa896..0505b8c 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
@@ -3,10 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.dto.vo.SaleVo;
+import com.yuanchu.mom.pojo.vo.SaleVo;
+import com.yuanchu.mom.service.RepertoryService;
import com.yuanchu.mom.utils.JackSonUtil;
-import org.json.JSONException;
-import org.json.JSONObject;
import com.yuanchu.mom.pojo.dto.SaleDto;
import com.yuanchu.mom.service.SaleService;
import com.yuanchu.mom.utils.Jwt;
@@ -18,7 +17,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.lang.reflect.Array;
import java.util.*;
/**
@@ -40,6 +38,9 @@
@Resource
Jwt jwt;
+ @Resource
+ RepertoryService repertoryService;
+
@ApiOperation(value = "鏌ヨ閿�鍞崟鍒楄〃")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -58,6 +59,12 @@
return Result.success(map);
}
+ @ApiOperation(value = "鏂板閿�鍞崟-->娣诲姞浜у搧-->鏌ヨ鎴愬搧搴撳瓨")
+ @PostMapping("/seleRepe")
+ public Result seleRepe() {
+ return Result.success(repertoryService.getSale());
+ }
+
@ApiOperation(value = "鏂板閿�鍞崟")
@PostMapping("/addSale")
public Result addSale(@RequestHeader("token") String token, @RequestBody SaleDto saleDto) throws Exception {
--
Gitblit v1.9.3