From 71904d449511804db819924ab877df42703491a9 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期四, 29 八月 2024 18:52:43 +0800
Subject: [PATCH] 质检完成的状态确认
---
src/main/java/com/mzl/flower/web/init/InitResource.java | 4 ++--
src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/init/InitResource.java b/src/main/java/com/mzl/flower/web/init/InitResource.java
index 75ff2dd..256b725 100644
--- a/src/main/java/com/mzl/flower/web/init/InitResource.java
+++ b/src/main/java/com/mzl/flower/web/init/InitResource.java
@@ -36,7 +36,7 @@
return returnData(R.SUCCESS.getCode(), null);
}
- @GetMapping("/callback")
+ /*@GetMapping("/callback")
public ResponseEntity<ReturnDataDTO> callback(String orderId) {
String originalXml = "";
UserPaymentDTO dto = new UserPaymentDTO();
@@ -50,5 +50,5 @@
userPaymentV3Service.saveCallbackInfo(dto, Constants.ORDER_STATUS_BACKEND.PAYMENT.name());
return returnData(R.SUCCESS.getCode(), null);
- }
+ }*/
}
diff --git a/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java b/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
index 9b635a2..ed329cd 100644
--- a/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
@@ -292,6 +292,7 @@
@ApiOperation(value = "完成商品质检")
public ResponseEntity<ReturnDataDTO> setCheckOk(String orderItemId){
deliveryOrderService.setCheckOk(orderItemId);
+ deliveryOrderService.checkOrderItemStatus(orderItemId);
return returnData(R.SUCCESS.getCode(), null);
}
--
Gitblit v1.9.3