From d782ae275c8699f0dfcf133127e80ee920f38c19 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Sat, 28 Sep 2024 09:30:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E7=8A=B6=E6=80=81=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/open/controller/OpenEquipmentController.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
index 84e48b4..fad8d1a 100644
--- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
+++ b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
@@ -441,7 +441,10 @@ public class OpenEquipmentController extends BaseController {
 
         BeanCopier.create(receiptParam, order, CopyOptions.create().ignoreNullValue()).copy();
         order.setOrderStatus(ORDER_STATUS_COMPLETED);
-        order.setDeliveryStatus(DELIVERY_STATUS_YES);
+
+        if (!order.getDeliveryStatus().equals(DELIVERY_STATUS_ACCEPT)) {//小程序下单流程修改后，是先绑定，后确认收获，这里为了兼容
+            order.setDeliveryStatus(DELIVERY_STATUS_YES);
+        }
         order.setReceiptStatus(RECEIPT_STATUS_YES);
         orderService.updateById(order);
         return success("确认收货成功");