From ec5ced1cffd0a2fab230f3d3eab0015231ac7a48 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Sun, 18 Aug 2024 12:13:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E8=AE=BE=E5=A4=87=E4=B8=AD=E5=95=86=E5=AE=B6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../open/controller/OpenEquipmentController.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
index f63f9e3..e792950 100644
--- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
+++ b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
@@ -333,7 +333,7 @@ public class OpenEquipmentController extends BaseController {
         saveData.setEquipmentId(one.getEquipmentId());
         saveData.setUserId(orderUserId);
         saveData.setOrderId(orderId);
-        saveData.setMerchantCode(oldMerchantCode);
+        saveData.setMerchantCode(newMerchantCode);
         boolean b = equipmentService.updateById(saveData);
         // 记录新电池明细
         EquipmentRecord record = new EquipmentRecord();
@@ -341,14 +341,14 @@ public class OpenEquipmentController extends BaseController {
         record.setEventType(EVENT_TYPE_BIND);
         record.setUserId(orderUserId);
         record.setOrderId(orderId);
-        record.setMerchantCode(oldMerchantCode);
+        record.setMerchantCode(newMerchantCode);
         equipmentRecordService.save(record);
 
         if (b) {
             // 解绑旧电池
             old.setUserId(0);
             old.setOrderId(0);
-            old.setMerchantCode(newMerchantCode);
+            old.setMerchantCode(oldMerchantCode);
             equipmentService.updateById(old);
             // 记录明细
             EquipmentRecord record2 = new EquipmentRecord();
@@ -356,7 +356,7 @@ public class OpenEquipmentController extends BaseController {
             record2.setUserId(orderUserId);
             record2.setOrderId(orderId);
             record2.setEventType(EVENT_TYPE_UNBIND);
-            record2.setMerchantCode(one.getMerchantCode());
+            record2.setMerchantCode(oldMerchantCode);
             equipmentRecordService.save(record2);
             // 更新订单
             order.setEquipmentId(one.getEquipmentId());