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("确认收货成功");