diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index 7b542976c..932706d90 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -25,13 +25,6 @@ import java.util.Map; * @date 2022-09-30 */ public interface IOrderBasicInfoService { - /** - * 查询订单 - * - * @param id 订单主键 - * @return 订单 - */ - OrderBasicInfo selectOrderBasicInfoById(Long id); /** * 条件查询订单基础信息 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 5d99ff683..50cb0093b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -144,17 +144,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { @Autowired private IPileAuthCardService pileAuthCardService; - /** - * 查询订单 - * - * @param id 订单主键 - * @return 订单 - */ - @Override - public OrderBasicInfo selectOrderBasicInfoById(Long id) { - return orderBasicInfoMapper.selectOrderBasicInfoById(id); - } - /** * 条件查询订单基本信息 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 01b9a206b..be7b3c4b0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -361,6 +361,16 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { PageInfo pageInfo = new PageInfo<>(pileConnectorInfoList); + // 查询枪口当前订单 + for (PileConnectorInfoVO pileConnectorInfoVO : pageInfo.getList()) { + String pileConnectorCode = pileConnectorInfoVO.getPileConnectorCode(); + pileConnectorInfoVO.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(pileConnectorCode)); // 枪口号二维码 + OrderBasicInfo order = orderBasicInfoService.queryChargingByPileConnectorCode(pileConnectorCode); + if (order != null) { + pileConnectorInfoVO.setOrderCode(order.getOrderCode()); + } + } + queryRealTimeData(pageInfo.getList()); // 返回结果集