From b141df9bf9764db8567efebed48006e12ab1f657 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 14 Aug 2022 15:52:45 +0800
Subject: [PATCH] fix:jhy 停止下单

---
 gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java |   78 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 73 insertions(+), 5 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 fc7fde0..e726899 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
@@ -1,18 +1,28 @@
 package com.xzx.gc.order.controller;
 
+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;
+import com.xzx.gc.order.vo.JhyOrderListVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
-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
@@ -25,8 +35,66 @@
     @ApiOperation("下单")
     @PostMapping(value = "/jhy/order/add")
     public Result<String> addJhyOrder(@RequestBody AddJhyOrderDto addJhyOrderDto, HttpServletRequest request) {
-        addJhyOrderDto.setUserId(getUserId(request));
-        jhyOrderService.addJhyOrder(addJhyOrderDto);
+//        addJhyOrderDto.setUserId(getUserId(request));
+//        jhyOrderService.addJhyOrder(addJhyOrderDto);
+//        return Result.success();
+
+        return Result.error("停止下单");
+    }
+
+    @ApiOperation("集物员订单列表")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "success", response = JhyOrderListVo.class)
+    )
+    @PostMapping(value = "/jhy/order/list")
+    public JsonResult<PageInfo<JhyOrderListVo>> orderList(@RequestBody JhyOrderListDto jhyOrderListDto, HttpServletRequest request) {
+        jhyOrderListDto.setUserId(getUserId(request));
+        PageInfo<JhyOrderListVo> result = jhyOrderService.orderList(jhyOrderListDto);
+        return JsonResult.success(result);
+    }
+
+    @ApiOperation("订单明细信息")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "success", response = JhyOrderDetailsVo.class)
+    )
+    @PostMapping(value = "/jhy/order/details/{orderId}")
+    public JsonResult<Object> orderDetail(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
+        return JsonResult.success(jhyOrderService.orderDetails(orderId, getUserId(request)));
+    }
+
+    @ApiOperation("抢单")
+    @PostMapping(value = "/jhy/order/grab/{orderId}")
+    public Result<String> grabOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
+        jhyOrderService.grabOrder(orderId, getUserId(request));
         return Result.success();
     }
+
+    @ApiOperation("取消订单")
+    @PostMapping(value = "/jhy/order/cancel/{orderId}")
+    public Result<String> cancelOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
+        jhyOrderService.cancelOrder(orderId, getUserId(request));
+        return Result.success();
+    }
+
+    @ApiOperation("确认订单-支付")
+    @PostMapping(value = "/jhy/order/confirm")
+    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