From beaf9ac7d7f9e717a5a3ba9819d9eb063898a89e Mon Sep 17 00:00:00 2001 From: yangqingyuan Date: Sun, 29 Sep 2024 10:03:58 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=8D=A2?= =?UTF-8?q?=E7=94=B5=E5=90=8E=EF=BC=8C=E7=94=B5=E6=B1=A0=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=8D=A2=E7=9A=84=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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java index fad8d1a..64bd4c8 100644 --- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java +++ b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java @@ -336,7 +336,7 @@ public class OpenEquipmentController extends BaseController { saveData.setEquipmentId(one.getEquipmentId()); saveData.setUserId(orderUserId); saveData.setOrderId(orderId); - saveData.setMerchantCode(newMerchantCode); + saveData.setMerchantCode(oldMerchantCode);//新电池归属地要变成订单的归属地 boolean b = equipmentService.updateById(saveData); // 记录新电池明细 EquipmentRecord record = new EquipmentRecord(); @@ -351,7 +351,7 @@ public class OpenEquipmentController extends BaseController { // 解绑旧电池 old.setUserId(0); old.setOrderId(0); - old.setMerchantCode(oldMerchantCode); + old.setMerchantCode(newMerchantCode);//旧电池归属地要变成换电电池的归属地 equipmentService.updateById(old); // 记录明细 EquipmentRecord record2 = new EquipmentRecord(); @@ -442,7 +442,7 @@ public class OpenEquipmentController extends BaseController { BeanCopier.create(receiptParam, order, CopyOptions.create().ignoreNullValue()).copy(); order.setOrderStatus(ORDER_STATUS_COMPLETED); - if (!order.getDeliveryStatus().equals(DELIVERY_STATUS_ACCEPT)) {//小程序下单流程修改后，是先绑定，后确认收获，这里为了兼容 + if (!DELIVERY_STATUS_ACCEPT.equals(order.getDeliveryStatus())) {//小程序下单流程修改后，是先绑定，后确认收获，这里为了兼容 order.setDeliveryStatus(DELIVERY_STATUS_YES); } order.setReceiptStatus(RECEIPT_STATUS_YES);