fix: 转单修改

This commit is contained in:
张松
2024-12-12 14:37:48 +08:00
parent 0bd6ed40a2
commit c17da7d4b3

View File

@@ -2497,6 +2497,9 @@ public class OrderService {
createOrderDTO.setMasterId(switchTableDTO.getMasterId()); createOrderDTO.setMasterId(switchTableDTO.getMasterId());
createOrderDTO.setShopId(switchTableDTO.getShopId()); createOrderDTO.setShopId(switchTableDTO.getShopId());
createOrderDTO.setTableId(switchTableDTO.getCurrentTableId()); createOrderDTO.setTableId(switchTableDTO.getCurrentTableId());
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
createOrderDTO.setMerchantId(Integer.valueOf(userId));
createOrder(createOrderDTO, "pc", token, switchTableDTO.getOrderId()); createOrder(createOrderDTO, "pc", token, switchTableDTO.getOrderId());
} }
@@ -2506,6 +2509,9 @@ public class OrderService {
createOrderDTO.setMasterId(masterId); createOrderDTO.setMasterId(masterId);
createOrderDTO.setShopId(switchTableDTO.getShopId()); createOrderDTO.setShopId(switchTableDTO.getShopId());
createOrderDTO.setTableId(switchTableDTO.getTargetTableId()); createOrderDTO.setTableId(switchTableDTO.getTargetTableId());
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
createOrderDTO.setMerchantId(Integer.valueOf(userId));
createOrder(createOrderDTO, "pc", token, targetOrderId); createOrder(createOrderDTO, "pc", token, targetOrderId);
} }