From 35309b932b738d5a8537e53207d28004a8da0f89 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期五, 20 九月 2024 17:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'

---
 src/main/java/com/mzl/flower/web/customer/DeliveryCustomerController.java |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/customer/DeliveryCustomerController.java b/src/main/java/com/mzl/flower/web/customer/DeliveryCustomerController.java
new file mode 100644
index 0000000..cd843dd
--- /dev/null
+++ b/src/main/java/com/mzl/flower/web/customer/DeliveryCustomerController.java
@@ -0,0 +1,47 @@
+package com.mzl.flower.web.customer;
+
+import com.mzl.flower.base.BaseController;
+import com.mzl.flower.base.R;
+import com.mzl.flower.base.ReturnDataDTO;
+import com.mzl.flower.constant.Constants;
+import com.mzl.flower.dto.response.payment.*;
+import com.mzl.flower.service.payment.DeliveryOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/customer/delivery")
+@Api(value = "配送管理-花店", tags = "配送管理-花店")
+@Validated
+@Slf4j
+public class DeliveryCustomerController extends BaseController {
+
+    @Autowired
+    private DeliveryOrderService deliveryOrderService;
+
+    @GetMapping("/mine/list/check/info/reduce")
+    @ApiOperation(value = "降级操作详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderItemId", value = "订单商品id", required = true, dataType = "String", paramType = "query")
+    })
+    public ResponseEntity<ReturnDataDTO<OrderItemCheckReduceDTO>> getReduceCheck(String orderItemId){
+        return returnData(R.SUCCESS.getCode(), deliveryOrderService.getReduceCheck(orderItemId));
+    }
+
+    @GetMapping("/mine/list/check/info/lack")
+    @ApiOperation(value = "缺货操作详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderItemId", value = "订单商品id", required = true, dataType = "String", paramType = "query")
+    })
+    public ResponseEntity<ReturnDataDTO<OrderItemCheckNumDTO>> getLackCheck(String orderItemId){
+        return returnData(R.SUCCESS.getCode(), deliveryOrderService.getOtherCheck(orderItemId
+                , Constants.CHECK_TYPE.lack.name(), false));
+    }
+}

--
Gitblit v1.9.3