From 0aba990c0299cdc9245eb43165ccb8cecd35764a Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 13 Sep 2024 09:27:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=20=E8=8E=B7=E5=8F=96=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E5=AE=9A=E4=BD=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AsDeviceServiceImpl.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java index c2a2740..eae58b8 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java @@ -731,10 +731,28 @@ public class AsDeviceServiceImpl extends ServiceImpl i asDevice.setRemainingPower(electricQuantity.toString()); } } + // 根据sn获取redis中的最新定位 + getLatestLocation(asDevice); } return asDevices; } + private void getLatestLocation(AsDevice asDevice) { + String msg = redisCache.getCacheObject(CacheConstants.CACHE_DEVICE_KEY + asDevice.getSn()); + if(StrUtil.isNotBlank(msg)){ + log.info("【根据sn号查询车辆实时信息】-========redis缓存中的数据：" + msg); + LogEntry logEntry = JSONObject.parseObject(msg, LogEntry.class); + log.info("【根据sn号查询车辆实时信息】============logEntry转换后的对象: logEntry---【{}】" , JSON.toJSONString(logEntry)); + LogEntry.LocationValue value = logEntry.getValue(); + // 坐标转换 WGS84 转 GCJ02 + double[] doubles = CommonUtil.coordinateConvert(value.getLon(),value.getLat()); + BigDecimal lon = new BigDecimal(doubles[1]).setScale(8, RoundingMode.HALF_UP); + BigDecimal lat = new BigDecimal(doubles[0]).setScale(8, RoundingMode.HALF_UP); + asDevice.setLongitude(lon.toString()); + asDevice.setLatitude(lat.toString()); + } + } + /** * 查询车辆数量 */ From 2c6a7a3869f48387dda7910dca1cafa6ad672a8a Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 13 Sep 2024 22:23:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/app/AppController.java | 8 +++++++- .../main/resources/mapper/system/EtOrderMapper.xml | 12 +++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java index cfc72b3..abc7ce0 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java @@ -251,7 +251,13 @@ public class AppController extends BaseController @GetMapping("/fee/list") public AjaxResult feeList(EtFeeRule etFeeRule) { - List list = etFeeRuleService.selectEtFeeRuleListByAreaId(etFeeRule.getAreaId()); + List list = null; + Long modelId = etFeeRule.getModelId(); + if(modelId != null){ + list = etFeeRuleService.selectRuleInfoListByModelId(etFeeRule.getModelId()); + }else{ + list = etFeeRuleService.selectEtFeeRuleListByAreaId(etFeeRule.getAreaId()); + } return success(list); } diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml index e5fb5b9..57211e5 100644 --- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml @@ -317,7 +317,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" o.rule_end_time, o.return_type, AsText(o.trip_route) trip_route, - o.trip_route_str from et_order o + o.trip_route_str, + o.rental_unit, + o.riding_rule, + o.riding_rule_json, + o.charging_cycle, + o.charging_cycle_value, + o.capped_amount, + o.handling_charge, + o.platform_service_fee, + o.operator_dividend + from et_order o LEFT JOIN et_user u ON u.user_id = o.user_id LEFT JOIN et_operating_area oa ON o.area_id = oa.area_id where order_id = #{orderId} From a0fb0b4ea084b34ef6c6b971b0c462a32b848b48 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Sat, 14 Sep 2024 10:15:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E5=AE=A2=E6=9C=8D=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E7=9A=84=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AE=A2=E5=8D=95=E7=9A=84=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppVerifyController.java | 28 +++++++++++++++++++ .../ruoyi/system/mapper/EtOrderMapper.java | 5 ++++ .../ruoyi/system/service/IEtOrderService.java | 5 ++++ .../service/impl/EtOrderServiceImpl.java | 9 ++++++ .../resources/mapper/system/EtOrderMapper.xml | 10 +++++++ 5 files changed, 57 insertions(+) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java index 0b2942b..980e10a 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java @@ -1450,4 +1450,32 @@ public class AppVerifyController extends BaseController } return toAjax(1); } + + /** + * 根据用户获取最后一个订单所属的运营区客服电话 latestServicePhone + * 1. 查询用户 + * 2. 最后一个订单 + * 3. 查询订单所属运营区 + * 4. 查询运营区客服电话 + */ + @Log(title = "", businessType = BusinessType.ZEROORDER) + @GetMapping("/latestServicePhone") + public AjaxResult latestServicePhone(Long userId) + { + logger.info("根据用户获取最后一个订单所属的运营区客服电话：【userId="+userId+"】"); + if (ObjectUtil.isNull(userId)){ + throw new ServiceException("未传userId"); + } + EtOrder etOrder =new EtOrder(); + etOrder.setUserId(userId); + EtOrder etOrder1 = etOrderService.latestOrder2(etOrder); + if(ObjectUtil.isNotNull(etOrder1)){ + EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(etOrder1.getAreaId()); + if(ObjectUtil.isNull(area)){ + return error("未查询到运营区域信息"); + } + return success(area); + } + return error(); + } } diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java index b3bc295..45c3203 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java @@ -258,6 +258,11 @@ public interface EtOrderMapper */ EtOrder selectLatestOrder(EtOrder etOrder); + /** + * 最近一笔订单（包含押金订单） + */ + EtOrder selectLatestOrder2(EtOrder etOrder); + /** * 最近一笔订单 */ diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java index cf58abc..18713c4 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java @@ -159,6 +159,11 @@ public interface IEtOrderService */ EtOrder latestOrder(EtOrder etOrder); + /** + * 最近一笔订单（包含押金订单） + */ + EtOrder latestOrder2(EtOrder etOrder); + /** * 订单退款 */ diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java index 6748a78..b01ffee 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java @@ -1709,6 +1709,15 @@ public class EtOrderServiceImpl implements IEtOrderService return order; } + /** + * 最近一笔订单 + */ + @Override + public EtOrder latestOrder2(EtOrder etOrder) { + EtOrder order = etOrderMapper.selectLatestOrder2(etOrder); + return order; + } + /** * 退款 */ diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml index 57211e5..a7194d3 100644 --- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml @@ -727,6 +727,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LIMIT 1 + +