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);