From 5f49840dcf78085b888cab90f61b1efd68c54d4d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 18:41:10 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 8080976..ee44b39 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,8 +3,10 @@
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;
import com.xzx.gc.order.dto.JhyOrderListDto;
import com.xzx.gc.order.service.JhyOrderService;
import com.xzx.gc.order.vo.JhyOrderDetailsVo;
@@ -16,12 +18,11 @@
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
@RestController
@@ -68,15 +69,30 @@
@ApiOperation("取消订单")
@PostMapping(value = "/jhy/order/cancel/{orderId}")
- public Result<String> cancelOrder(Long orderId, HttpServletRequest request) {
+ public Result<String> cancelOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
jhyOrderService.cancelOrder(orderId, getUserId(request));
- return null;
+ return Result.success();
}
@ApiOperation("确认订单-支付")
@PostMapping(value = "/jhy/order/confirm")
- public Result<String> confirmOrder() {
- return null;
+ public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto, HttpServletRequest request) {
+ confirmDto.setUserId(getUserId(request));
+ jhyOrderService.confirmOrder(confirmDto);
+ return Result.success();
+ }
+
+ @ApiOperation("订单状态数量")
+ @PostMapping(value = "/jhy/order/orderStatusCnt/{type}")
+ public JsonResult<Map<Integer, Integer>> orderStatusCnt(@PathVariable("type") Integer type, HttpServletRequest request) {
+ return JsonResult.success(jhyOrderService.orderStatusCount(type, getUserId(request)));
+ }
+
+ @ApiOperation("地址范围是否有集货员")
+ @PostMapping(value = "/jhy/order/hasJhy/{addressId}")
+ public Result<List<JhyInfo>> hasJhy(@PathVariable("addressId") Long addressId) {
+ List<JhyInfo> inRange = jhyOrderService.findJhyInfoInRange(addressId);
+ return Result.success(inRange);
}
}
--
Gitblit v1.9.1