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-09-29 10:03:58 +08:00
parent d782ae275c
commit beaf9ac7d7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,7 +336,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(newMerchantCode); saveData.setMerchantCode(oldMerchantCode);//新电池归属地要变成订单的归属地
boolean b = equipmentService.updateById(saveData); boolean b = equipmentService.updateById(saveData);
// 记录新电池明细 // 记录新电池明细
EquipmentRecord record = new EquipmentRecord(); EquipmentRecord record = new EquipmentRecord();
@@ -351,7 +351,7 @@ public class OpenEquipmentController extends BaseController {
// 解绑旧电池 // 解绑旧电池
old.setUserId(0); old.setUserId(0);
old.setOrderId(0); old.setOrderId(0);
old.setMerchantCode(oldMerchantCode); old.setMerchantCode(newMerchantCode);//旧电池归属地要变成换电电池的归属地
equipmentService.updateById(old); equipmentService.updateById(old);
// 记录明细 // 记录明细
EquipmentRecord record2 = new EquipmentRecord(); EquipmentRecord record2 = new EquipmentRecord();
@@ -442,7 +442,7 @@ public class OpenEquipmentController extends BaseController {
BeanCopier.create(receiptParam, order, CopyOptions.create().ignoreNullValue()).copy(); BeanCopier.create(receiptParam, order, CopyOptions.create().ignoreNullValue()).copy();
order.setOrderStatus(ORDER_STATUS_COMPLETED); 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.setDeliveryStatus(DELIVERY_STATUS_YES);
} }
order.setReceiptStatus(RECEIPT_STATUS_YES); order.setReceiptStatus(RECEIPT_STATUS_YES);