gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复更换设备中商家信息错误问题

Browse Source
This commit is contained in:
yangqingyuan
2024-08-18 12:13:42 +08:00
parent 320c864cc5
commit ec5ced1cff
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
View File

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