From 7c40e052277de0d6654b37a6542b80038a3c4858 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 06 Dec 2021 10:57:23 +0800
Subject: [PATCH] add jhy/order/hasJhy
---
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 14 ++++++++++----
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 4 ++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
index cfc924f..012eed5 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
@@ -3,6 +3,7 @@
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.Result;
import com.xzx.gc.common.request.BaseController;
+import com.xzx.gc.entity.JhyInfo;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.order.dto.AddJhyOrderDto;
import com.xzx.gc.order.dto.JhyOrderConfirmDto;
@@ -17,12 +18,10 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -89,4 +88,11 @@
return JsonResult.success(jhyOrderService.orderStatusCount(type, getUserId(request)));
}
+ @ApiOperation("地址范围是否有集货员")
+ @GetMapping(value = "/jhy/order/hasJhy/{addressId}")
+ public Result<List<JhyInfo>> hasJhy(@PathVariable("addressId") Long addressId) {
+ List<JhyInfo> inRange = jhyOrderService.findJhyInfoInRange(addressId);
+ return Result.success(inRange);
+ }
+
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index 41d1839..23681da 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -329,4 +329,8 @@
return map;
}
+
+ public List<JhyInfo> findJhyInfoInRange(Long addressId) {
+ return jhyInfoMapper.selectJhyInfoListInAddressRange(addressId);
+ }
}
--
Gitblit v1.9.1