From 118623071a97b66f21c29e2bc02b8f15855ede5d Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期三, 25 九月 2024 19:54:11 +0800
Subject: [PATCH] 均价计算 优化

---
 src/main/java/com/mzl/flower/web/customer/OrderCustomerController.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/customer/OrderCustomerController.java b/src/main/java/com/mzl/flower/web/customer/OrderCustomerController.java
index cf1772b..a18d47f 100644
--- a/src/main/java/com/mzl/flower/web/customer/OrderCustomerController.java
+++ b/src/main/java/com/mzl/flower/web/customer/OrderCustomerController.java
@@ -11,6 +11,7 @@
 import com.mzl.flower.dto.response.payment.OrderDTO;
 import com.mzl.flower.dto.response.payment.OrderItemListDTO;
 import com.mzl.flower.dto.response.payment.OrderListDTO;
+import com.mzl.flower.entity.payment.Order;
 import com.mzl.flower.service.payment.OrderService;
 import com.mzl.flower.service.payment.UserPaymentV3Service;
 import io.swagger.annotations.Api;
@@ -68,7 +69,8 @@
             @ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query")
     })
     public ResponseEntity<ReturnDataDTO<?>> confirmOrderReceive(String id){
-        orderService.confirmOrderReceive(id);
+        Order o = orderService.confirmOrderReceive(id);
+        orderService.processAfterReceive(o);
         return returnData(R.SUCCESS.getCode(), null);
     }
 
@@ -146,4 +148,19 @@
         orderService.deleteOrder(id);
         return returnData(R.SUCCESS.getCode(), null);
     }
+
+
+
+
+
+    @GetMapping(value = "/copyOrder")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query"),
+    })
+    @ApiOperation(value = "再来一单")
+    public ResponseEntity<ReturnDataDTO> copyOrder(String id) {
+        String message=orderService.copyOrder(id);
+        return returnData(R.SUCCESS.getCode(),null, message);
+    }
+
 }

--
Gitblit v1.9.3