From e1df5bacc9eb968458c8c7edfe7f8de139d1c5d4 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Wed, 17 Jul 2024 09:34:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E7=8E=B0=E5=8A=9F=E8=83=BD=E6=94=B9?= =?UTF-8?q?=E9=80=A0=202.=E6=8D=A2=E8=BD=A6=203.=E6=97=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=94=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E6=83=85=E5=86=B5=E4=B8=8B=E5=85=B3=E9=94=81=204.?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=BD=E4=BB=A4=E7=9A=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=205.=E5=A2=9E=E5=8A=A0gps=E3=80=81=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=97=B6=E9=97=B4=206.=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E5=87=BA=E4=BB=93=E3=80=81=E4=B8=80=E9=94=AE=E5=85=A5=E4=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppVerifyController.java | 95 +++++++++++++- .../iot/receive/ReceiveController.java | 24 ++-- .../controller/system/AsDeviceController.java | 32 ++++- .../system/EtCapitalFlowController.java | 42 ++++++ .../controller/system/SysDeptController.java | 15 +++ .../common/constant/ServiceConstants.java | 23 ++++ .../common/core/domain/entity/SysDept.java | 11 ++ .../common/core/domain/entity/SysUser.java | 11 ++ .../com/ruoyi/common/enums/BusinessType.java | 13 ++ .../com/ruoyi/system/domain/AsDevice.java | 12 +- .../ruoyi/system/domain/EtCapitalFlow.java | 4 + .../com/ruoyi/system/domain/EtCommandLog.java | 4 +- .../java/com/ruoyi/system/domain/EtOrder.java | 8 ++ .../ruoyi/system/mapper/SysDeptMapper.java | 8 ++ .../ruoyi/system/service/CallbackService.java | 12 ++ .../system/service/IAsDeviceService.java | 26 +++- .../ruoyi/system/service/IEtOrderService.java | 15 +++ .../ruoyi/system/service/ISysDeptService.java | 24 ++++ .../service/impl/AsDeviceServiceImpl.java | 95 +++++++++++--- .../service/impl/CallbackServiceImpl.java | 50 +++++++ .../service/impl/EtModelServiceImpl.java | 2 +- .../service/impl/EtOrderServiceImpl.java | 111 ++++++++++++++-- .../service/impl/SysDeptServiceImpl.java | 122 +++++++++++++++++- .../service/impl/SysUserServiceImpl.java | 10 ++ .../mapper/system/AsDeviceMapper.xml | 18 ++- .../mapper/system/EtCapitalFlowMapper.xml | 8 +- .../mapper/system/EtCommandLogMapper.xml | 5 +- .../mapper/system/EtOperatingAreaMapper.xml | 1 + .../resources/mapper/system/EtOrderMapper.xml | 14 +- .../resources/mapper/system/SysDeptMapper.xml | 17 ++- 30 files changed, 759 insertions(+), 73 deletions(-) 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 ffca01a..3fd6050 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 @@ -98,6 +98,12 @@ public class AppVerifyController extends BaseController @Autowired private ISysDeptService deptService; + @Autowired + private IEtCapitalFlowService etCapitalFlowService; + + @Autowired + private IEtWithdrawService etWithdrawService; + /** * 故障上报 @@ -547,7 +553,8 @@ public class AppVerifyController extends BaseController public AjaxResult unlocking(String sn) { logger.info("【管理员开锁请求】：{}",sn); - Boolean aBoolean =asDeviceService.unlocking(sn); + AsUser asUser = getLoginUser().getAsUser(); + Boolean aBoolean =asDeviceService.unlocking(sn,asUser.getUserName()); return success(aBoolean); } @@ -559,7 +566,8 @@ public class AppVerifyController extends BaseController public AjaxResult lock(String sn) { logger.info("【管理员关锁请求】：{}",sn); - Boolean aBoolean =asDeviceService.adminLock(sn); + AsUser asUser = getLoginUser().getAsUser(); + Boolean aBoolean =asDeviceService.adminLock(sn,asUser.getUserName()); return success(aBoolean); } @@ -872,17 +880,19 @@ public class AppVerifyController extends BaseController public AjaxResult getDept() { AsUser asUser = getLoginUser().getAsUser(); - logger.info("获取到当前app登录用户：【{}】", JSON.toJSON(asUser)); - if(ObjectUtil.isNull(asUser.getSysUserId())){ - throw new RuntimeException("用户【"+asUser.getUserName()+"】未绑定系统用户"); + AsUser asUser1 = asUserService.selectUserById(asUser.getUserId()); + logger.info("获取到当前app登录用户：【{}】", JSON.toJSON(asUser1)); + if(ObjectUtil.isNull(asUser1.getSysUserId())){ + throw new RuntimeException("用户【"+asUser1.getUserName()+"】未绑定系统用户"); } - SysUser sysUser = userService.selectUserById(asUser.getSysUserId()); + SysUser sysUser = userService.selectUserById(asUser1.getSysUserId()); Long deptId; SysDept sysDept = null; if(!sysUser.isAdmin()){ deptId = sysUser.getDeptId(); sysDept = deptService.selectDeptById(deptId); logger.info("根据token获取运营商信息：【{}】", JSON.toJSON(sysDept)); + return success(sysDept); } return success(sysDept); } @@ -979,6 +989,17 @@ public class AppVerifyController extends BaseController } } + /** + * 查询押金订单 + */ + @GetMapping("/getDepositOrder") + public AjaxResult getDepositOrder(Long userId) + { + logger.info("查询押金订单请求：【{}】", userId); + EtOrder depositOrder = etOrderService.getDepositOrder(userId); + return AjaxResult.success(depositOrder); + } + /** * 提交审核 */ @@ -988,4 +1009,66 @@ public class AppVerifyController extends BaseController { return toAjax(etOrderService.updateEtOrderByOrderNo(etOrder)); } + + /** + * 查询资金流水列表 + */ + @GetMapping("/flowList") + public TableDataInfo list(EtCapitalFlow etCapitalFlow) + { + startPage(); + List list = etCapitalFlowService.selectEtCapitalFlowList(etCapitalFlow); + return getDataTable(list); + } + + /** + * 管理员提现 + */ + @Log(title = "管理员提现", businessType = BusinessType.ADMINWITHDRAW) + @PostMapping("/admin/withdraw") + public AjaxResult add(@RequestBody EtWithdraw etWithdraw) + { + logger.info("管理员提现请求：【{}】", JSON.toJSON(etWithdraw)); + AsUser asUser = getLoginUser().getAsUser(); + logger.info("【管理员提现】获取当前用户：【{}】", JSON.toJSON(asUser)); + Long userId = asUser.getUserId(); + int i = deptService.adminWithdraw(etWithdraw.getAmount(),userId); + return toAjax(i); + } + + /** + * 换车关锁 + */ + @Log(title = "换车关锁", businessType = BusinessType.CHANGELOCK) + @PostMapping("/changeVehicle/lock") + public AjaxResult changeVehicleLock(String orderNo,String changeReason) + { + if (StrUtil.isBlank(orderNo)){ + logger.info("没有orderNo参数：【orderNo={}】",orderNo); + return error("请传orderNo号参数"+"【orderNo="+orderNo+"】"); + } + logger.info("【换车关锁请求】：orderNo={}",orderNo); + Boolean aBoolean = etOrderService.changeVehicleLock(orderNo,changeReason); + return success(aBoolean); + } + + /** + * 换车开锁 + */ + @Log(title = "换车开锁", businessType = BusinessType.CHANGEUNLOCK) + @PostMapping("/changeVehicle/unlocking") + public AjaxResult changeVehicleLockUnlocking(String orderNo,String newSn) + { + if (StrUtil.isBlank(newSn)){ + logger.info("没有sn号参数：【newSn={}】",newSn); + return error("请传sn号参数"+"【newSn="+newSn+"】"); + } + if (StrUtil.isBlank(orderNo)){ + logger.info("没有orderNo参数：【orderNo={}】",orderNo); + return error("请传orderNo号参数"+"【orderNo="+orderNo+"】"); + } + logger.info("【换车开锁请求】：orderNo={},newSn ={}",orderNo,newSn); + Boolean aBoolean =etOrderService.changeVehicleLockUnlocking(orderNo,newSn); + return success(aBoolean); + } } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java index 2b36933..a850663 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java @@ -203,6 +203,8 @@ public class ReceiveController { device.setRemainingMileage(remainingMileage); device.setRemainingPower(electricQuantity.toString()); device.setLastTime(DateUtils.getNowDate()); + device.setLastLocationTime(DateUtils.getNowDate()); + device.setGps("1"); // 信号强度 device.setSignalStrength(value.getCsq()); device.setSatellites(value.getS()); @@ -213,13 +215,13 @@ public class ReceiveController { /** 2. 判断是否在禁行区内 * 如果在， 根据配置‘禁行区内断电配置’进行断电 **/ + String isAdminUnlocking = device.getIsAdminUnlocking();// 是否是管理员开锁：0-否；1-是 boolean noRidingArea = asDeviceService.isNoRidingArea(device.getSn(), device.getAreaId()); if(noRidingArea){ - String isAdminUnlocking = device.getIsAdminUnlocking();// 是否管理员开锁 String noRidingOutage = area.getNoRidingOutage(); if (noRidingOutage.equals("1") && value.getStatus() != 3 && !isAdminUnlocking.equals("1")) { // 禁行区内断电 log.info("禁行区内断电命令--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "禁行区内断电",null); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "禁行区内断电",null,null); device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); int updateAsDevice = asDeviceService.updateAsDevice(device); if (updateAsDevice > 0) { @@ -231,7 +233,7 @@ public class ReceiveController { boolean inPolygon = asDeviceService.isNoRidingAreaWithTolerance(device.getSn(), device.getAreaId(),20); if (inPolygon) { log.info("距离禁行区20米内发送警告命令--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY2, "距离禁行区20米内",null); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY2, "距离禁行区20米内",null,null); } } /** 3.超出运营区外断电*/ @@ -242,14 +244,13 @@ public class ReceiveController { if(inPolygon){ //在20米范围内，发报警 log.info("超出运营区30米内发送警告命令--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY3, "超出运营区30米内",null); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY3, "超出运营区30米内",null,null); }else{ //超出运营区外断电 - String isAdminUnlocking = device.getIsAdminUnlocking();// 是否管理员开锁 String areaOutOutage = area.getAreaOutOutage(); if (areaOutOutage.equals("1") && value.getStatus() != 3 && !isAdminUnlocking.equals("1")) { // 超出营运区断电 log.info("超出营运区断电命令--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "超出营运区断电",null); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "超出营运区断电",null,null); device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); int updateAsDevice = asDeviceService.updateAsDevice(device); if (updateAsDevice > 0) { @@ -262,7 +263,7 @@ public class ReceiveController { Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn()); if (inOrderBySn && ServiceConstants.VEHICLE_STATUS_IN_USING.equals(device.getStatus()) && ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus())) { // 有正在骑行的订单，给车辆上电 log.info("返回营运区上电，有正在骑行的订单，给车辆上电--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "返回营运区上电",null); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "返回营运区上电",null,null); // 更新车辆状态和锁状态 /** 3.更新车辆状态*/ device.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); @@ -294,6 +295,12 @@ public class ReceiveController { // 优化轨迹，如果获取到的定位与最后一个定位相同，则不添加 optimizeRoute(jsonArray, newPoint,lon,lat,etOrder); + }else{ + //当前无订单，并且不是管理员开锁的情况下，直接关锁 + if(!isAdminUnlocking.equals("1")){ + log.info("当前无订单，并且不是管理员开锁的情况下，直接关锁--------" +logEntry.getDevName()); + asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"无订单关锁",null,null); + } } } } @@ -357,8 +364,9 @@ public class ReceiveController { device.setRemainingMileage(remainingMileage); device.setRemainingPower(electricQuantity.toString()); device.setLastTime(DateUtils.getNowDate()); + device.setGps("0"); device.setSignalStrength(value.getCsq()); - device.setSatellites(value.getS()); + device.setSatellites(0); device.setQuality(value.getQ()); int i = asDeviceService.updateLocation(device); if(i>0){ diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java index 1a18fea..fde7c92 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java @@ -132,6 +132,30 @@ public class AsDeviceController extends BaseController return toAjax(asDeviceService.oneClickOffline(deviceIds)); } + + /** + * 一键出仓 + */ + @PreAuthorize("@ss.hasPermi('system:device:oneClickOnline')") + @Log(title = "设备", businessType = BusinessType.ONLINE) + @PostMapping("/oneClickListing/{deviceIds}") + public AjaxResult oneClickListing(@PathVariable Long[] deviceIds) + { + return toAjax(asDeviceService.oneClickListing(deviceIds)); + } + + + /** + * 一键入仓 + */ + @PreAuthorize("@ss.hasPermi('system:device:oneClickOnline')") + @Log(title = "设备", businessType = BusinessType.ONLINE) + @PostMapping("/oneClickWarehousing/{deviceIds}") + public AjaxResult oneClickWarehousing(@PathVariable Long[] deviceIds) + { + return toAjax(asDeviceService.oneClickWarehousing(deviceIds)); + } + /** * 响铃寻车 */ @@ -171,7 +195,7 @@ public class AsDeviceController extends BaseController public AjaxResult unlocking(String sn) { logger.info("【管理员开锁请求】：{}",sn); - Boolean aBoolean =asDeviceService.unlocking(sn); + Boolean aBoolean =asDeviceService.unlocking(sn,getUsername()); return success(aBoolean); } @@ -185,7 +209,7 @@ public class AsDeviceController extends BaseController public AjaxResult unlockingByMac(String mac) { logger.info("【管理员开锁请求】：{}",mac); - Boolean aBoolean =asDeviceService.unlockingByMac(mac); + Boolean aBoolean =asDeviceService.unlockingByMac(mac,getUsername()); return success(aBoolean); } @@ -198,7 +222,7 @@ public class AsDeviceController extends BaseController public AjaxResult lock(String sn) { logger.info("【管理员关锁请求】：{}",sn); - Boolean aBoolean =asDeviceService.adminLock(sn); + Boolean aBoolean =asDeviceService.adminLock(sn,getUsername()); return success(aBoolean); } @@ -211,7 +235,7 @@ public class AsDeviceController extends BaseController public AjaxResult lockByMac(String mac) { logger.info("【管理员关锁请求】：{}",mac); - Boolean aBoolean =asDeviceService.adminLockByMac(mac); + Boolean aBoolean =asDeviceService.adminLockByMac(mac,getUsername()); return success(aBoolean); } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtCapitalFlowController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtCapitalFlowController.java index ec2657f..30d8bee 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtCapitalFlowController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtCapitalFlowController.java @@ -2,6 +2,15 @@ package com.ruoyi.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson2.JSON; +import com.ruoyi.common.core.domain.entity.AsUser; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.domain.EtWithdraw; +import com.ruoyi.system.service.IEtWithdrawService; +import com.ruoyi.system.service.ISysDeptService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -34,6 +43,9 @@ public class EtCapitalFlowController extends BaseController @Autowired private IEtCapitalFlowService etCapitalFlowService; + @Autowired + private ISysDeptService deptService; + /** * 查询资金流水列表 */ @@ -101,4 +113,34 @@ public class EtCapitalFlowController extends BaseController { return toAjax(etCapitalFlowService.deleteEtCapitalFlowByFlowIds(flowIds)); } + + /** + * 管理员提现 + */ + @Log(title = "管理员提现", businessType = BusinessType.ADMINWITHDRAW) + @PostMapping("/withdraw") + public AjaxResult add(@RequestBody EtWithdraw etWithdraw) + { + logger.info("管理员提现请求：【{}】", JSON.toJSON(etWithdraw)); + Long deptId = getDeptId(); + SysDept sysDept = deptService.selectDeptById(deptId); + if(ObjectUtil.isNull(sysDept.getAppUserId())){ + throw new RuntimeException("运营商未绑定app用户,请联系管理员添加【绑定微信用户】"); + } + logger.info("【管理员提现】获取当前部门：【{}】", JSON.toJSON(sysDept)); + int i = deptService.adminWithdraw(etWithdraw.getAmount(),sysDept.getAppUserId()); + return toAjax(i); + } + + /** + * 提现失败 + */ + @Log(title = "管理员提现失败", businessType = BusinessType.ADMINWITHDRAW) + @PostMapping("/rejectWithdraw") + public AjaxResult rejectWithdraw(@RequestBody EtCapitalFlow flow) + { + logger.info("管理员提现失败请求：【{}】", JSON.toJSON(flow)); + int i = deptService.rejectWithdraw(flow.getFlowId()); + return toAjax(i); + } } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 465f7d9..b3f086e 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -1,13 +1,17 @@ package com.ruoyi.web.controller.system; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.EtAreaDept; import com.ruoyi.system.mapper.EtAreaDeptMapper; @@ -193,4 +197,15 @@ public class SysDeptController extends BaseController return ajax; } + /** + * 绑定APP用户 + */ + @Log(title = "绑定APP用户", businessType = BusinessType.UPDATE) + @PutMapping("/bandAppUser") + public AjaxResult bandAppUser(@RequestBody SysDept dept) + { + logger.info("【运营商】绑定APP用户", JSON.toJSON(dept)); + return toAjax(deptService.bandAppUser(dept)); + } + } diff --git a/electripper-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java b/electripper-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java index ebb2fd0..b07e581 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java +++ b/electripper-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java @@ -35,6 +35,11 @@ public class ServiceConstants { */ public static final String ORDER_TYPE_WITHDRAW = "5"; + /** + * 订单类型: 6-提现失败 + */ + public static final String ORDER_TYPE_WITHDRAW_FAIL = "6"; + /**----------------------------订单类型end----------------------------*/ /**----------------------------支付场景start----------------------------*/ /** 支付场景： 1-骑行支付,2-取消预约支付,3-套餐支付,4-押金支付 */ @@ -588,4 +593,22 @@ public class ServiceConstants { public static final String RETURN_VERIFY_YES = "1"; /**----------------------------还车是否拍照审核end----------------------------*/ + + /**----------------------------资金流水状态start----------------------------*/ + /** 状态： 0-待结算，2-驳回,8-已完成 */ + /** + * 0-待结算 + */ + public static final String FLOW_STATUS_APPLY = "0"; + /** + * 2-驳回 + */ + public static final String FLOW_STATUS_REJECT = "2"; + + /** + * 8-已完成 + */ + public static final String FLOW_STATUS_COMPLETE = "8"; + /**----------------------------资金流水状态end----------------------------*/ + } diff --git a/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index 4b972af..7dd7c8e 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -106,6 +106,17 @@ public class SysDept extends BaseEntity /** 退款回调地址 */ private String refundNotifyUrl; + /** app用户id,用于提现 */ + private Long appUserId; + + public Long getAppUserId() { + return appUserId; + } + + public void setAppUserId(Long appUserId) { + this.appUserId = appUserId; + } + public String getSeparateAccount() { return separateAccount; } diff --git a/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 34516b0..745edb9 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -129,6 +129,17 @@ public class SysUser extends BaseEntity /** app用户id,用于分账或提现 */ private Long appUserId; + /** app用户名 */ + private String appUserName; + + public String getAppUserName() { + return appUserName; + } + + public void setAppUserName(String appUserName) { + this.appUserName = appUserName; + } + public BigDecimal getBalance() { return balance; } diff --git a/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java index 60697df..8d25932 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -100,6 +100,10 @@ public enum BusinessType * 提现 */ WITHDRAW, + /** + * 管理员提现 + */ + ADMINWITHDRAW, /** * 预约 @@ -164,4 +168,13 @@ public enum BusinessType */ AUTHENTICATION, + /** + * 换车关锁 + */ + CHANGELOCK, + + /** + * 换车开锁 + */ + CHANGEUNLOCK, } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/AsDevice.java b/electripper-system/src/main/java/com/ruoyi/system/domain/AsDevice.java index ccb63e3..2bddb13 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/AsDevice.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/AsDevice.java @@ -90,9 +90,19 @@ public class AsDevice extends BaseEntityPlus implements Serializable { @Excel(name = "定位地址") private String location; + /** 最后更新时间 */ + @Excel(name = "最后更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date lastTime; + /** 最后定位时间 */ @Excel(name = "最后定位时间") - private Date lastTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date lastLocationTime; + + /** 是否有GPS信号: 0-没有;1-有 */ + @Excel(name = "是否有GPS信号") + private String gps; /** 剩余电量 */ @Excel(name = "剩余电量") diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java index abb0213..286fa31 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java @@ -80,4 +80,8 @@ public class EtCapitalFlow extends BaseEntity @Excel(name = "支付方式") private String payType; + /** 状态： 0-待结算，2-驳回,8-已完成 */ + @Excel(name = "状态： 0-待结算，2-驳回,8-已完成") + private String status; + } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java index 20b5070..25b6649 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java @@ -1,10 +1,8 @@ package com.ruoyi.system.domain; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; /** * 命令日志对象 et_command_log diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java index 18645ed..6b42da8 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java @@ -246,4 +246,12 @@ public class EtOrder extends BaseEntity /** 音频文件 */ @Excel(name = "音频文件") private String audioFiles; + + /** 使用过的sn,用,分隔 */ + @Excel(name = "使用过的sn,用,分隔") + private String usedSn; + + /** 换车原因：1-电量过低，2-车辆故障 */ + @Excel(name = "换车原因：1-电量过低，2-车辆故障") + private String changeReason; } diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index 56fc2e9..e64cb9f 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -37,6 +37,14 @@ public interface SysDeptMapper */ public SysDept selectDeptById(Long deptId); + /** + * 根据app用户id查询信息 + * + * @param appUserId 部门ID + * @return 部门信息 + */ + public SysDept selectDeptByAppUserId(Long appUserId); + /** * 根据ID查询所有子部门 * diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/CallbackService.java b/electripper-system/src/main/java/com/ruoyi/system/service/CallbackService.java index 95ee5ec..cda9dc3 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/CallbackService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/CallbackService.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.system.domain.EtOperatingArea; import com.ruoyi.system.domain.EtOrder; @@ -36,6 +37,17 @@ public interface CallbackService { */ public void capitalFlowRecords(EtOrder order, String type, String busType, String ownerType, SysUser user); + /** + * 新增资金流水记录 + * @param order 订单 + * @param type 类型 + * @param busType 业务类型 + * @param ownerType 所属人类型 + * @param user 合伙人对象 + * @return void + */ + public int capitalFlowRecords2(EtOrder order, String type, String busType, String ownerType, SysDept sysDept); + /** * 分红处理 * @param transactionId 订单号 diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java index d336a99..5aa85d5 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java @@ -116,6 +116,22 @@ public interface IAsDeviceService extends IService */ public int oneClickOffline(Long[] deviceIds); + /** + * 一键出仓 + * + * @param deviceIds 需要一键出仓的设备主键集合 + * @return 结果 + */ + int oneClickListing(Long[] deviceIds); + + /** + * 一键入仓 + * + * @param deviceIds 需要一键入仓的设备主键集合 + * @return 结果 + */ + int oneClickWarehousing(Long[] deviceIds); + /** * 删除设备信息 * @@ -151,7 +167,7 @@ public interface IAsDeviceService extends IService /** * 发送命令 */ - public void sendCommand(String mac, String token,String command,String type,String orderNo); + public void sendCommand(String mac, String token,String command,String type,String orderNo,String userName); /** * 发送命令(带响应) @@ -191,12 +207,12 @@ public interface IAsDeviceService extends IService /** * 管理员锁车 */ - Boolean adminLock(String sn); + Boolean adminLock(String sn,String userName); /** * 管理员锁车 */ - Boolean adminLockByMac(String mac); + Boolean adminLockByMac(String mac,String userName); /** * 临时解锁 @@ -221,12 +237,12 @@ public interface IAsDeviceService extends IService /** * 管理员开锁 */ - Boolean unlocking(String sn); + Boolean unlocking(String sn,String userName); /** * 管理员开锁 */ - Boolean unlockingByMac(String mac); + Boolean unlockingByMac(String mac,String userName); /** * 车辆上线 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 92c798d..0da0ff0 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 @@ -201,4 +201,19 @@ public interface IEtOrderService * 官方审核通过 */ boolean authoritypass(EtOrder etOrder); + + /** + * 换车关锁 + */ + Boolean changeVehicleLock(String orderNo,String changeReason); + + /** + * 换车开锁 + */ + Boolean changeVehicleLockUnlocking(String orderNo,String newSn); + + /** + * 押金订单 + */ + EtOrder getDepositOrder(Long userId); } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/electripper-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index f6a156b..d407378 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.List; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysUser; /** * 部门管理 服务层 @@ -60,6 +61,14 @@ public interface ISysDeptService */ public SysDept selectDeptById(Long deptId); + /** + * 根据app用户id查询信息 + * + * @param appUserId app用户id + * @return 部门信息 + */ + public SysDept selectDeptByAppUserId(Long appUserId); + /** * 根据ID查询所有子部门（正常状态） * @@ -137,4 +146,19 @@ public interface ISysDeptService * @return 结果 */ void changeDeptBalance(BigDecimal negate, Long deptId); + + /** + * 管理员提现 + */ + int adminWithdraw(BigDecimal amount,Long appUserId); + + /** + * 绑定app用户 + */ + int bandAppUser(SysDept dept); + + /** + * 管理员提现失败 + */ + int rejectWithdraw(Long flowId); } 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 fe33fa2..2050b7d 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 @@ -381,6 +381,27 @@ public class AsDeviceServiceImpl extends ServiceImpl i return asDeviceMapper.oneClickOnline(deviceIds); } + /** + * 一键出仓 + * + * @param deviceIds 需要一键出仓的设备主键集合 + * @return 结果 + */ + @Override + public int oneClickListing(Long[] deviceIds) + { + for (Long deviceId:deviceIds) { + AsDevice device = asDeviceMapper.selectAsDeviceByDeviceId(deviceId); + if(ObjectUtil.isNull(device)){ + throw new ServiceException("车辆【"+deviceId+"】不存在"); + } + if(!device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){ + throw new ServiceException("车辆【"+device.getSn()+"】非仓库中状态，请重新选择！"); + } + } + return asDeviceMapper.oneClickOnline(deviceIds); + } + /** * 一键下线 * @@ -414,6 +435,39 @@ public class AsDeviceServiceImpl extends ServiceImpl i return asDeviceMapper.oneClickOffline(deviceIds); } + /** + * 一键入仓 + * + * @param deviceIds 需要一键入仓的设备主键集合 + * @return 结果 + */ + @Override + public int oneClickWarehousing(Long[] deviceIds) + { + for (Long deviceId:deviceIds) { + AsDevice device = asDeviceMapper.selectAsDeviceByDeviceId(deviceId); + if(ObjectUtil.isNull(device)){ + throw new ServiceException("车辆【"+deviceId+"】不存在"); + } + if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_APPOINTMENT)){ + throw new ServiceException("车辆【"+device.getSn()+"】为‘预约中’状态不能入仓"); + } + if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_USING)){ + throw new ServiceException("车辆【"+device.getSn()+"】为‘使用中’状态不能入仓"); + } + if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK)){ + throw new ServiceException("车辆【"+device.getSn()+"】为‘临时停车’状态不能入仓"); + } + if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){ + throw new ServiceException("车辆【"+device.getSn()+"】为‘仓库中’状态不能入仓"); + } + if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_ABANDON)){ + throw new ServiceException("车辆【"+device.getSn()+"】为‘废弃’状态不能入仓"); + } + } + return asDeviceMapper.oneClickOffline(deviceIds); + } + /** * 删除设备信息 * @@ -550,7 +604,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i deviceNumVo.setInAppointmentNum(inAppointmentNum);//预约中 QueryWrapper wrapperForDispatch = new QueryWrapper<>(); - wrapperForDispatch.or(i -> i.eq("in_parking_area", 1).or().eq("in_operating_area", 1)); + wrapperForDispatch.eq("status","6"); if(StrUtil.isNotBlank(powerStart) && StrUtil.isNotBlank(powerEnd)){ wrapperForDispatch.between("remaining_power", Integer.parseInt(powerStart),Integer.parseInt(powerEnd)); } @@ -677,13 +731,13 @@ public class AsDeviceServiceImpl extends ServiceImpl i */ @SneakyThrows @Override - public Boolean unlocking(String sn) { + public Boolean unlocking(String sn,String userName) { AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); /** 1.获取token*/ String token = Token.getToken(); Boolean execute = transactionTemplate.execute(e -> { /** 2.发送命令*/ - sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_20,"管理员开锁",null); + sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_20,"管理员开锁",null,userName); asDevice.setIsAdminUnlocking("1"); asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_SCHEDULING); asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); @@ -702,13 +756,13 @@ public class AsDeviceServiceImpl extends ServiceImpl i */ @SneakyThrows @Override - public Boolean unlockingByMac(String mac) { + public Boolean unlockingByMac(String mac,String userName) { AsDevice asDevice = asDeviceMapper.selectAsDeviceByMac(mac); /** 1.获取token*/ String token = Token.getToken(); Boolean execute = transactionTemplate.execute(e -> { /** 2.发送命令*/ - sendCommand(mac, token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_20,"管理员开锁",null); + sendCommand(mac, token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_20,"管理员开锁",null,userName); asDevice.setIsAdminUnlocking("1"); asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_SCHEDULING); asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); @@ -848,14 +902,14 @@ public class AsDeviceServiceImpl extends ServiceImpl i @Transactional @Override /** 发送命令*/ - public void sendCommand(String mac, String token,String command,String type,String orderNo) { + public void sendCommand(String mac, String token,String command,String type,String orderNo,String userName) { String param = "device_name=" + mac + "&product_id=" + productId +"&timeout=" + timeout; String sendUrl = iotUrl+ IotConstants.ADDS_COMMAND + "?"+param; String result = HttpUtils.sendPostWithToken(sendUrl, command, token); log.info("【"+type+"】===>IOT请求调用结果:【{}】",result); JSONObject paramsObj = JSON.parseObject(result); String code = paramsObj.getString("code"); - asynchronousSaveLog(sendUrl,command,mac,result,type,orderNo); + asynchronousSaveLog(sendUrl,command,mac,result,type,orderNo,userName); //记录命令 if (!HttpStatus.IOT_SUCCESS.equals(code)) { @@ -892,7 +946,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i } /* 异步保存发送命令日志*/ - private void asynchronousSaveLog(String url,String command,String mac,String result,String type,String orderNo) { + private void asynchronousSaveLog(String url,String command,String mac,String result,String type,String orderNo,String userName) { //异步保存发送命令日志 scheduledExecutorService.schedule(() -> { EtCommandLog etCommandLog = new EtCommandLog(); @@ -910,6 +964,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i String code = paramsObj.getString("code"); etCommandLog.setCallStatus(code); etCommandLog.setOrderNo(orderNo); + etCommandLog.setCreateBy(userName); int i = etCommandLogMapper.insertEtCommandLog(etCommandLog); if(i>0){ log.info("【发送命令】异步保存发送命令日志"); @@ -928,7 +983,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i if(responseVo.getCode() != 0){ asynchronousUpdateOnlineStatus(mac); } - asynchronousSaveLog(sendUrl,command,mac,result,type,orderNo); + asynchronousSaveLog(sendUrl,command,mac,result,type,orderNo,null); return JSON.parseObject(result,ResponseVo.class); } @@ -955,7 +1010,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i String token = Token.getToken(); Boolean execute = transactionTemplate.execute(e -> { /** 2.发送命令*/ - sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_PLAY1,"响铃寻车",null); + sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_PLAY1,"响铃寻车",null,null); return Boolean.TRUE; }); if(!execute)throw new ServiceException("响铃寻车失败"); @@ -975,7 +1030,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i String token = Token.getToken(); Boolean execute = transactionTemplate.execute(e -> { /** 2.发送命令*/ - sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_PLAY1,"重启设备",null); + sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_PLAY1,"重启设备",null,null); return Boolean.TRUE; }); if(!execute)throw new ServiceException("重启设备失败"); @@ -994,7 +1049,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i String token = Token.getToken(); Boolean execute = transactionTemplate.execute(e -> { /** 2.发送命令*/ - sendCommand(mac, token,IotConstants.COMMAND_REBOOT,"重启设备",null); + sendCommand(mac, token,IotConstants.COMMAND_REBOOT,"重启设备",null,null); return Boolean.TRUE; }); if(!execute)throw new ServiceException("重启设备失败"); @@ -1013,7 +1068,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i String token = Token.getToken(); Boolean execute = transactionTemplate.execute(e -> { /** 2.发送命令*/ - sendCommand(mac, token,IotConstants.COMMAND_PLAY1,"响铃寻车",null); + sendCommand(mac, token,IotConstants.COMMAND_PLAY1,"响铃寻车",null,null); return Boolean.TRUE; }); if(!execute)throw new ServiceException("响铃寻车失败"); @@ -1038,7 +1093,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i String token = Token.getToken(); if(!"true".equals(isBluetooth)){ /** 2.发送命令*/ - sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_LLOSE+IotConstants.COMMAND_FREQUENCY_3600,"临时锁车",orderNo); + sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_LLOSE+IotConstants.COMMAND_FREQUENCY_3600,"临时锁车",orderNo,order.getUserName()); }else{ asDevice.setLongitude(lon); asDevice.setLatitude(lat); @@ -1071,11 +1126,11 @@ public class AsDeviceServiceImpl extends ServiceImpl i @Transactional @SneakyThrows @Override - public Boolean adminLock(String sn) { + public Boolean adminLock(String sn,String userName) { if(StrUtil.isBlank(sn))throw new ServiceException("sn不能为空"); AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); /** 2.发送命令*/ - sendCommand(asDevice.getMac(), Token.getToken(),IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"管理员锁车",null); + sendCommand(asDevice.getMac(), Token.getToken(),IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"管理员锁车",null,userName); asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); asDevice.setIsAdminUnlocking("0"); @@ -1095,11 +1150,11 @@ public class AsDeviceServiceImpl extends ServiceImpl i @Transactional @SneakyThrows @Override - public Boolean adminLockByMac(String mac) { + public Boolean adminLockByMac(String mac,String userName) { if(StrUtil.isBlank(mac))throw new ServiceException("mac不能为空"); AsDevice asDevice = asDeviceMapper.selectAsDeviceByMac(mac); /** 2.发送命令*/ - sendCommand(asDevice.getMac(), Token.getToken(),IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"管理员锁车",null); + sendCommand(asDevice.getMac(), Token.getToken(),IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"管理员锁车",null,userName); asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); asDevice.setIsAdminUnlocking("0"); @@ -1129,7 +1184,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i String finalSn = sn; if(!"true".equals(isBluetooth)){ /** 2.发送命令*/ - sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5,"临时解锁",orderNo); + sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5,"临时解锁",orderNo,order.getUserName()); }else{ asDevice.setLongitude(lon); asDevice.setLatitude(lat); @@ -1883,9 +1938,11 @@ public class AsDeviceServiceImpl extends ServiceImpl i .set("latitude",device.getLatitude()) .set("remaining_power",device.getRemainingPower()) .set("last_time",device.getLastTime()) + .set("last_location_time",device.getLastLocationTime()) .set("voltage",device.getVoltage()) .set("satellites",device.getSatellites()) .set("quality",device.getQuality()) + .set("gps",device.getGps()) .set("signal_strength",device.getSignalStrength()); return asDeviceMapper.update(null,wrapper); } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java index 1324300..65dffe1 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java @@ -622,6 +622,56 @@ public class CallbackServiceImpl implements CallbackService { } } + /** + * 资金流水记录 + * */ + @Override + public int capitalFlowRecords2(EtOrder order,String type,String busType,String ownerType,SysDept sysDept) { + EtCapitalFlow capitalFlow = new EtCapitalFlow(); + capitalFlow.setAreaId(order.getAreaId()); + capitalFlow.setOrderNo(order.getOrderNo()); + capitalFlow.setOutTradeNo(order.getOutTradeNo()); + capitalFlow.setType(type); + capitalFlow.setBusType(busType); + capitalFlow.setOwnerType(ownerType); + capitalFlow.setOwnerId(sysDept.getDeptId()); + capitalFlow.setOwner(sysDept.getDeptName()); + capitalFlow.setAmount(order.getPayFee()); + + String handlingCharge1 = sysDept.getHandlingCharge(); + logger.info("【保存资金流水记录】 获取到配置手续费==============handlingCharge=====================："+handlingCharge1); + BigDecimal bigDecimal = new BigDecimal(handlingCharge1).divide(new BigDecimal(1000), 6, BigDecimal.ROUND_HALF_UP); + logger.info("【保存资金流水记录】 转换后手续费==============bigDecimal=====================："+bigDecimal); + BigDecimal handlingCharge = bigDecimal.multiply(order.getPayFee()).setScale(2, BigDecimal.ROUND_HALF_UP); + logger.info("【保存资金流水记录】 计算出的手续费==============handlingCharge=====================："+handlingCharge); + BigDecimal serviceFeeScale = new BigDecimal(sysDept.getPlatformServiceFee()).divide(new BigDecimal(100), 6, BigDecimal.ROUND_HALF_UP); + BigDecimal platformServiceFee = serviceFeeScale.multiply(order.getPayFee()); + logger.info("【保存资金流水记录】 计算出的平台服务费==============platformServiceFee=====================："+platformServiceFee); + capitalFlow.setPlatformServiceFee(platformServiceFee); + capitalFlow.setHandlingCharge(handlingCharge);//手续费 + BigDecimal separateAccountFee = order.getPayFee(); + capitalFlow.setPartnerDividend(BigDecimal.ZERO); + capitalFlow.setPlatformServiceFee(BigDecimal.ZERO); + if(type.equals(ServiceConstants.FLOW_TYPE_INCOME)){ + capitalFlow.setStatus(ServiceConstants.FLOW_STATUS_REJECT); + capitalFlow.setOperatorDividend(separateAccountFee); + capitalFlow.setOperatorBalance(sysDept.getBalance().add(separateAccountFee)); + deptService.changeDeptBalance(separateAccountFee,sysDept.getDeptId()); + logger.info("【保存资金流水记录】 ==============收入=====================："); + }else{ + capitalFlow.setStatus(ServiceConstants.FLOW_STATUS_APPLY); + capitalFlow.setOperatorDividend(separateAccountFee.negate()); + capitalFlow.setOperatorBalance(sysDept.getBalance().subtract(separateAccountFee)); + deptService.changeDeptBalance(separateAccountFee.negate(),sysDept.getDeptId()); + logger.info("【保存资金流水记录】 ==============支出=====================："); + } + capitalFlow.setPayType(ServiceConstants.PAY_TYPE_WX); + capitalFlow.setCreateTime(DateUtils.getNowDate()); + logger.info("【保存资金流水】保存资金流水记录对象 : " + JSON.toJSONString(capitalFlow)); + int i = etCapitalFlowService.insertEtCapitalFlow(capitalFlow); + return i; + } + /** * 微信退款回调 */ diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java index 6bf78d7..0d42ddb 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java @@ -137,7 +137,7 @@ public class EtModelServiceImpl implements IEtModelService Integer quantityByPercentage = CommonUtil.getElectricQuantityByPercentage(lowBatteryReminder, etModel.getFullVoltage(), etModel.getLowVoltage()); String lowVoltageCommand = IotConstants.COMMAND_BAT + quantityByPercentage * 10 + "@"; log.info("发送低电压命令：" + lowVoltageCommand); - asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), lowVoltageCommand,"发送低电压播报",null); + asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), lowVoltageCommand,"发送低电压播报",null,null); } } return i; 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 de88630..d5e8ecb 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 @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.IotConstants; import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.core.domain.entity.AsUser; import com.ruoyi.common.core.domain.entity.SysDept; @@ -12,6 +13,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.CommonUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.PageUtils; +import com.ruoyi.common.utils.onenet.Token; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.system.domain.*; import com.ruoyi.system.domain.vo.*; @@ -32,6 +34,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionSynchronizationManager; +import org.springframework.transaction.support.TransactionTemplate; import org.springframework.web.bind.annotation.RequestBody; import javax.annotation.Resource; @@ -95,6 +98,9 @@ public class EtOrderServiceImpl implements IEtOrderService @Resource private EtRefundMapper etRefundMapper; + @Autowired + private TransactionTemplate transactionTemplate; + /** * 查询订单 * @@ -444,15 +450,15 @@ public class EtOrderServiceImpl implements IEtOrderService /** 2.退押金*/ EtOrder depositOrder = getDepositOrder(etOrder.getUserId()); BigDecimal deposit = depositOrder.getTotalFee(); -// Refund refund = wxPayService.refund(depositOrder, "还车审核通过后退押金",deposit,IdUtils.getOrderNo("ref")); + Refund refund = wxPayService.refund(depositOrder, "还车审核通过后退押金",deposit,IdUtils.getOrderNo("ref")); /** 3.记录退款表 创建退款对象*/ -// depositOrder.setReason("还车审核通过后退押金"); -// EtRefund refund1= createRefund(depositOrder, deposit, null, null, null, null, refund.getOutRefundNo(),ServiceConstants.REFUND_TYPE_DEPOSIT); -// int i = etRefundService.insertEtRefund(refund1); -// if(i == 0){ -// log.info("【还车审核通过】保存退款对象失败"); -// throw new ServiceException("【还车审核通过】，保存退款对象失败"); -// } + depositOrder.setReason("还车审核通过后退押金"); + EtRefund refund1= createRefund(depositOrder, deposit, null, null, null, null, refund.getOutRefundNo(),ServiceConstants.REFUND_TYPE_DEPOSIT); + int i = etRefundService.insertEtRefund(refund1); + if(i == 0){ + log.info("【还车审核通过】保存退款对象失败"); + throw new ServiceException("【还车审核通过】，保存退款对象失败"); + } /** 4.更新用户余额*/ AsUser asUser = asUserService.selectUserById(depositOrder.getUserId()); if(asUser!=null){ @@ -507,11 +513,11 @@ public class EtOrderServiceImpl implements IEtOrderService throw new ServiceException("【还车审核通过】，更新用户信息失败"); } } - return false; + return true; } - private EtOrder getDepositOrder(Long userId) { + public EtOrder getDepositOrder(Long userId) { EtOrder depositOrder = new EtOrder(); depositOrder.setUserId(userId); depositOrder.setPaid(ServiceConstants.ORDER_PAY_STATUS_PAID); @@ -1254,4 +1260,89 @@ public class EtOrderServiceImpl implements IEtOrderService List inOrder = etOrderMapper.isInOrderBySn(sn); return inOrder.size() > 0; } + + /** + * 换车关锁 + * 1. 关锁 + * 2. 改变订单信息，sn, 保存使用过的sn + * + */ + @Override + @Transactional + @SneakyThrows + public Boolean changeVehicleLock(String orderNo,String changeReason) { + EtOrder order = etOrderMapper.selectEtOrderByOrderNo(orderNo); + if(!ServiceConstants.ORDER_STATUS_RIDING.equals(order.getStatus())){ + throw new ServiceException("该订单状态非骑行中"); + } + String sn = order.getSn(); + if(StrUtil.isBlank(sn))throw new ServiceException("sn不能为空"); + AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); + /** 2.发送命令*/ + asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"换车关锁",order.getOrderNo(),order.getUserName()); + asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setIsAdminUnlocking("0"); + int device = asDeviceMapper.updateAsDevice(asDevice); + if(device==0){ + log.info("【临时解锁】改变车辆状态失败"); + throw new ServiceException("【临时锁车】改变车辆状态失败"); + } + String usedSn = order.getUsedSn(); + if(StrUtil.isNotBlank(usedSn)){ + usedSn = usedSn+","+sn; + }else{ + usedSn = sn; + } + order.setUsedSn(usedSn); + order.setSn(""); + order.setChangeReason(changeReason); + int i = etOrderMapper.updateEtOrderByOrderNo(order); + if(i==0){ + log.info("【换车关锁】改变订单使用过的sn失败"); + throw new ServiceException("【换车关锁】改变订单使用过的sn失败"); + } + return Boolean.TRUE; + } + + /** + * 换车开锁 + * 1. 开锁 + * 2. 更新订单的sn + */ + @SneakyThrows + @Override + @Transactional + public Boolean changeVehicleLockUnlocking(String orderNo, String newSn) { + EtOrder order = etOrderMapper.selectEtOrderByOrderNo(orderNo); + if(!ServiceConstants.ORDER_STATUS_RIDING.equals(order.getStatus())){ + throw new ServiceException("该订单状态非骑行中"); + } + AsDevice newDevice = asDeviceMapper.selectAsDeviceBySn(newSn); + if (ObjectUtil.isNull(newDevice)) { + throw new ServiceException("设备不存在："+ newSn); + } + /** 1.获取token*/ + String token = Token.getToken(); + Boolean execute = transactionTemplate.execute(e -> { + /** 2.发送命令*/ + asDeviceService.sendCommand(newDevice.getMac(), token,IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_20,"换车开锁",order.getOrderNo(),order.getUserName()); + newDevice.setIsAdminUnlocking("1"); + newDevice.setStatus(ServiceConstants.VEHICLE_STATUS_SCHEDULING); + newDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); + int i = asDeviceMapper.updateAsDevice(newDevice); + if(i>0){ + log.info("管理员开锁，更新设备状态成功"); + } + return Boolean.TRUE; + }); + if(!execute)throw new ServiceException("换车开锁失败"); + order.setSn(newSn); + int i = etOrderMapper.updateEtOrderByOrderNo(order); + if(i==0){ + log.info("【换车开锁】更新订单sn失败"); + throw new ServiceException("【换车开锁】更新订单sn失败"); + } + return Boolean.TRUE; + } } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 4b921de..d7bbccb 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.annotation.DataScope; @@ -16,14 +17,16 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.system.domain.EtAreaDept; +import com.ruoyi.system.domain.EtCapitalFlow; +import com.ruoyi.system.domain.EtOrder; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.mapper.*; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.IWxPayService; +import com.ruoyi.system.service.*; import com.wechat.pay.java.service.profitsharing.model.AddReceiverResponse; import com.wechat.pay.java.service.profitsharing.model.DeleteReceiverResponse; +import com.wechat.pay.java.service.transferbatch.model.TransferDetailInput; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,10 +48,10 @@ import java.util.stream.Collectors; @Service public class SysDeptServiceImpl implements ISysDeptService { - @Autowired + @Resource private SysDeptMapper deptMapper; - @Autowired + @Resource private SysRoleMapper roleMapper; @Resource @@ -60,12 +63,24 @@ public class SysDeptServiceImpl implements ISysDeptService @Autowired private ISysConfigService configService; - @Autowired + @Resource private SysUserRoleMapper userRoleMapper; @Autowired private IWxPayService wxPayService; + @Autowired + private IAsUserService asUserService; + + @Resource + private IEtOperatingAreaService etOperatingAreaService; + + @Autowired + private CallbackService callbackService; + + @Resource + private EtCapitalFlowMapper etCapitalFlowMapper; + /** * 查询部门管理数据 * @@ -157,6 +172,18 @@ public class SysDeptServiceImpl implements ISysDeptService return deptMapper.selectDeptById(deptId); } + /** + * 根据app用户id查询信息 + * + * @param appUserId app用户id + * @return 部门信息 + */ + @Override + public SysDept selectDeptByAppUserId(Long appUserId) + { + return deptMapper.selectDeptByAppUserId(appUserId); + } + /** * 根据ID查询所有子部门（正常状态） * @@ -428,6 +455,81 @@ public class SysDeptServiceImpl implements ISysDeptService deptMapper.changeDeptBalance(amount,deptId); } + /** + * 管理员提现 + * 1. 获取当前用户 + * 2. 获取最新用户 + * 3. 获取部门对象 + * 4. 发起提现 + * -- 5. 更新部门余额（默认通过，直接扣余额） + * 6. 记录资金流水 + */ + @Override + public int adminWithdraw(BigDecimal amount,Long appUserId) { + String orderNo = IdUtils.getOrderNo("tx"); + SysDept sysDept = deptMapper.selectDeptByAppUserId(appUserId); + AsUser asUser1 = asUserService.selectUserById(appUserId); + log.info("【管理员提现】获取到运营商信息：【{}】", JSON.toJSON(sysDept)); + if(ObjectUtil.isNull(sysDept)){ + throw new RuntimeException("运营商未绑定app用户,请联系管理员添加【绑定微信用户】"); + } + String batchName= sysDept.getDeptName()+"发起提现"; + List transferDetailInputs = new ArrayList<>(); + TransferDetailInput transferDetailInput = new TransferDetailInput(); + transferDetailInput.setOutDetailNo(IdUtils.getOrderNo("txd"));//明细订单号 + transferDetailInput.setTransferAmount(amount.multiply(new BigDecimal(100)).longValue()); + transferDetailInput.setTransferRemark(sysDept.getDeptName()+"共享电动车提现"); + transferDetailInput.setOpenid(asUser1.getWxopenid()); + transferDetailInputs.add(transferDetailInput); + log.info("【审核通过】发起转账到零钱:{}",JSON.toJSONString(transferDetailInputs)); + // todo 暂时先不发起真实提现 真正的提现是 +// wxPayService.transfer(sysDept,orderNo,batchName,batchName,amount,1,transferDetailInputs); + //扣余额并记录资金流水 + EtOrder order = new EtOrder(); + order.setOrderNo(orderNo); + order.setPayFee(amount); + order.setTotalFee(amount); + List longs = etOperatingAreaService.selectAreaListByDeptId(sysDept.getDeptId()); + if(longs.size() == 0){ + throw new ServiceException("【提现】提现失败，未找到该运营区，运营商id:"+sysDept.getDeptId()); + } + order.setAreaId(longs.get(0)); + //记录资金流水 + return callbackService.capitalFlowRecords2(order,ServiceConstants.FLOW_TYPE_DISBURSE,ServiceConstants.ORDER_TYPE_WITHDRAW,ServiceConstants.OWNER_TYPE_OPERATOR,sysDept); + } + + /** + * 管理员提现失败 + * 1. 生成一条相同的金额 + * 2. + */ + @Override + public int rejectWithdraw(Long flowId) { + EtCapitalFlow etCapitalFlow = etCapitalFlowMapper.selectEtCapitalFlowByFlowId(flowId); + SysDept sysDept = deptMapper.selectDeptById(etCapitalFlow.getOwnerId()); + log.info("【提现失败】获取到提现流水信息：【{}】", JSON.toJSON(etCapitalFlow)); + EtOrder order = new EtOrder(); + order.setOrderNo(etCapitalFlow.getOrderNo()); + order.setPayFee(etCapitalFlow.getAmount()); + order.setTotalFee(etCapitalFlow.getAmount()); + List longs = etOperatingAreaService.selectAreaListByDeptId(etCapitalFlow.getOwnerId()); + if(longs.size() == 0){ + throw new ServiceException("【管理员提现失败】提现失败，未找到该运营区，运营商id:"+etCapitalFlow.getOwnerId()); + } + order.setAreaId(longs.get(0)); + //记录资金流水 + int i = callbackService.capitalFlowRecords2(order, ServiceConstants.FLOW_TYPE_INCOME, ServiceConstants.ORDER_TYPE_WITHDRAW_FAIL, ServiceConstants.OWNER_TYPE_OPERATOR, sysDept); + if(i>0){ + etCapitalFlow.setStatus(ServiceConstants.FLOW_STATUS_COMPLETE); + if(etCapitalFlowMapper.updateEtCapitalFlow(etCapitalFlow) ==0){ + throw new ServiceException("【管理员提现失败】提现失败，更新资金流水表失败"); + } + }else{ + throw new ServiceException("【管理员提现失败】提现失败，插入资金流水失败"); + } + return i; + } + /** * 递归列表 */ @@ -470,4 +572,12 @@ public class SysDeptServiceImpl implements ISysDeptService { return getChildList(list, t).size() > 0; } + + /** + * 绑定app用户 + */ + @Override + public int bandAppUser(SysDept dept) { + return deptMapper.updateDept(dept); + } } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 61d524b..6120ef0 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -87,6 +87,9 @@ public class SysUserServiceImpl implements ISysUserService @Autowired private RedisCache redisCache; + @Resource + private AsUserMapper asUserMapper; + /** * 根据条件分页查询用户列表 @@ -108,6 +111,13 @@ public class SysUserServiceImpl implements ISysUserService sysUser.setAreaName(area.getAreaName()); } } + Long appUserId = sysUser.getAppUserId(); + if(ObjectUtil.isNotNull(appUserId) && appUserId!=0){ + AsUser asUser = asUserMapper.selectUserById(appUserId); + if(ObjectUtil.isNotNull(asUser)){ + sysUser.setAppUserName(asUser.getUserName()); + } + } } return sysUsers; } diff --git a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml index f4c4867..12557a0 100644 --- a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml @@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -35,13 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select device_id, picture, device_name, mac, sn, model_id, vehicle_num, area_id, activation_time, online_status, create_by, create_time, update_by, update_time, last_time, remark, status, lock_status, location, remaining_power, voltage, qrcode, longitude, latitude, is_area_out_outage, is_admin_unlocking from et_device + select device_id, picture, device_name, mac, sn, model_id, vehicle_num, area_id, activation_time, online_status, create_by, create_time, update_by, update_time, last_time, last_location_time, gps, remark, status, lock_status, location, remaining_power, voltage, qrcode, longitude, latitude, is_area_out_outage, is_admin_unlocking from et_device select de.device_id, de.picture, de.device_name, de.mac, de.sn, de.model_id, de.vehicle_num, de.area_id, de.activation_time, de.online_status, de.create_by, de.create_time, de.update_by, - de.update_time, de.last_time, de.remark, de.status, de.lock_status, de.location, + de.update_time, de.last_time, de.last_location_time, de.gps, de.remark, de.status, de.lock_status, de.location, de.remaining_power, de.voltage, de.version, de.qrcode, de.longitude, de.latitude, de.is_area_out_outage, de.is_admin_unlocking, de.signal_strength, de.satellites, de.quality from et_device de left join et_area_dept ad on ad.area_id = de.area_id left join sys_dept d on d.dept_id = ad.dept_id @@ -171,6 +173,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, last_time, + last_location_time, + gps, remark, status, lock_status, @@ -198,6 +202,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{lastTime}, + #{lastLocationTime}, + #{gps}, #{remark}, #{status}, #{lockStatus}, @@ -229,6 +235,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, last_time = #{lastTime}, + last_location_time = #{lastLocationTime}, + gps = #{gps}, remark = #{remark}, status = #{status}, lock_status = #{lockStatus}, @@ -262,6 +270,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, last_time = #{lastTime}, + last_location_time = #{lastLocationTime}, + gps = #{gps}, remark = #{remark}, status = #{status}, lock_status = #{lockStatus}, @@ -294,6 +304,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, last_time = #{lastTime}, + last_location_time = #{lastLocationTime}, + gps = #{gps}, remark = #{remark}, status = #{status}, lock_status = #{lockStatus}, diff --git a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml index 8c8baa5..af86102 100644 --- a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml @@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select flow_id, area_id, order_no, out_trade_no, type, bus_type, amount, handling_charge, platform_service_fee, operator_dividend, operator_balance, partner_dividend, pay_type, create_time from et_capital_flow + select flow_id, area_id, owner, owner_id, owner_type, order_no, out_trade_no, type, bus_type, status, amount, handling_charge, platform_service_fee, operator_dividend, operator_balance, partner_dividend, pay_type, create_time from et_capital_flow @@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" longitude, call_status, order_no, + create_by, create_time @@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{longitude}, #{callStatus}, #{orderNo}, + #{createBy}, sysdate() diff --git a/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml index 9a40710..5374e26 100644 --- a/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml @@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where 1 = 1 and a.area_name like concat('%', #{areaName}, '%') and d.dept_id = #{deptId} + and a.area_id = #{areaId} ${params.dataScope} diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml index bbe2d50..8379005 100644 --- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml @@ -43,6 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -50,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" device_mac, sn, pay_time, paid, pay_type, type, total_fee, pay_fee, dispatch_fee, manage_fee, riding_fee, appointment_fee, mark, duration, distance, status, create_time, appointment_start_time, appointment_end_time,appointment_timeout, unlock_time,return_time, - rule_end_time, return_type, AsText(trip_route) trip_route,trip_route_str,cycle,deposit_deduction,video_url,deduction_amount,audio_files from et_order + rule_end_time, return_type, AsText(trip_route) trip_route,trip_route_str,cycle,deposit_deduction,video_url,deduction_amount,audio_files,used_sn,change_reason from et_order @@ -573,6 +577,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" video_url = #{videoUrl}, deduction_amount = #{deductionAmount}, audio_files = #{audioFiles}, + used_sn = #{usedSn}, + change_reason = #{changeReason}, where order_id = #{orderId} @@ -614,6 +620,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" video_url = #{videoUrl}, deduction_amount = #{deductionAmount}, audio_files = #{audioFiles}, + used_sn = #{usedSn}, + change_reason = #{changeReason}, where order_no = #{orderNo} diff --git a/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml b/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml index ed0e730..20db175 100644 --- a/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag,d.platform_service_fee, d.handling_charge, d.is_profit_sharing, d.separate_account, d.domain, d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret, - d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url, + d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,d.refund_notify_url, d.app_user_id, d.create_by, d.create_time from sys_dept d @@ -81,12 +82,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -141,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" private_key_path, merchant_serial_number, refund_notify_url, + app_user_id, create_time )values( #{deptId}, @@ -167,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{privateKeyPath}, #{merchantSerialNumber}, #{refundNotifyUrl}, + #{appUserId}, sysdate() ) @@ -198,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" private_key_path = #{privateKeyPath}, merchant_serial_number = #{merchantSerialNumber}, refund_notify_url = #{refundNotifyUrl}, + app_user_id = #{appUserId}, update_time = sysdate() where dept_id = #{deptId}