qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 调整

Browse Source
This commit is contained in:
邱贞招 2024-08-07 10:25:15 +08:00
parent a9a4a36b8a
commit 803d2211aa
11 changed files with 141 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java
View File

@ -345,6 +345,20 @@ public class AppController extends BaseController
return success(orders);
}
/**
* 查询当前用户是否有正在审核中的订单
*/
@PostMapping("/user/isInAuditOrder")
public AjaxResult isInAuditOrder(Long userId)
{
if(StrUtil.isBlank(userId.toString())){
logger.info("没有userId参数：【userId={}】",userId);
return error("请传userId参数"+"【userId="+userId+"】");
}
List<EtOrder> orders = etOrderService.isInAuditOrder(userId,null);
return success(orders);
}
/**
* 根据定位获取地址 逆地理编码

17
electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
View File

@ -270,6 +270,9 @@ public class AppVerifyController extends BaseController
if(!ServiceConstants.ORDER_PAY_STATUS_NON_PAYMENT.equals(etOrder1.getPaid())){
throw new ServiceException("订单已支付，不能改价");
}
if("1".equals(etOrder1.getLocking())){
throw new ServiceException("用户正在支付中，请勿操作");
}
if(!ServiceConstants.ORDER_STATUS_RIDING_END.equals(etOrder1.getStatus()) && !ServiceConstants.ORDER_STATUS_CANCEL_APPOINTMENT.equals(etOrder1.getStatus())){
throw new ServiceException("改价失败，订单未结束，订单状态："+etOrder1.getStatus());
}
@ -937,6 +940,20 @@ public class AppVerifyController extends BaseController
return toAjax(etOrderService.updateEtOrderByOrderNo(etOrder));
}
/**
* 取消锁单
*/
@Log(title = "取消锁单", businessType = BusinessType.UNLOCKORDER)
@PostMapping("/order/unlockOrder")
public AjaxResult unlockOrder(String orderNo)
{
logger.info("【取消锁单】：{}", orderNo);
EtOrder etOrder = new EtOrder();
etOrder.setLocking("0");
etOrder.setOrderNo(orderNo);
return toAjax(etOrderService.updateEtOrderByOrderNo(etOrder));
}
/**
* 还车审核通过
* 改状态，退押金

4
electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
View File

@ -159,6 +159,10 @@ public enum BusinessType
* 保存视频
*/
VIDEO,
/**
* 取消锁单
*/
UNLOCKORDER,
/**
* 重启设备
*/

4
electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java
View File

@ -263,4 +263,8 @@ public class EtOrder extends BaseEntity
/** 换车原因：1-电量过低，2-车辆故障 */
@Excel(name = "换车原因：1-电量过低，2-车辆故障")
private String changeReason;
/** 锁单中: 0-否；1-是 */
@Excel(name = "锁单中: 0-否；1-是")
private String locking;
}

9
electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java
View File

@ -94,6 +94,15 @@ public interface EtOrderMapper
*/
public List<EtOrder> isInOrder(@Param("userId") Long userId,@Param("orderNo") String orderNo);
/**
* 查询当前用户是否有正在进行中的审核订单
*
* @param userId 用户id
* @param orderNo 排除当前订单号
* @return 结果
*/
public List<EtOrder> isInAuditOrder(@Param("userId") Long userId,@Param("orderNo") String orderNo);
/**
* 查询当前车辆是否有正在进行中的订单
*

5
electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java
View File

@ -115,6 +115,11 @@ public interface IEtOrderService
*/
List<EtOrder> isInOrder(Long userId,String orderNo);
/**
* 查询当前用户是否有正在审核中的订单
*/
List<EtOrder> isInAuditOrder(Long userId,String orderNo);
/**
* 查询当前车辆是否有正在进行中的订单
*/

26
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -1318,8 +1318,14 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
/** 2.发送命令*/
sendCommand(asDevice.getMac(), Token.getToken(),IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"管理员锁车",null,userName);
asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
if(!asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){
asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);
// 判断该sn是否有正在骑行中的订单，如果有骑行中的订单则修改为临时锁车
EtOrder etOrder = etOrderService.getCurrentOrder(asDevice.getSn());
if(ObjectUtil.isNotNull(etOrder)){
asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK);
}else{
if(!asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){
asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);
}
}
asDevice.setIsAdminUnlocking("0");
int device = asDeviceMapper.updateAsDevice(asDevice);
@ -1591,13 +1597,15 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
}
}
}
/** 4. 更新车辆状态*/
device.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);
device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
int deviceUpdate = asDeviceMapper.updateAsDevice(device);
if(deviceUpdate==0){
log.info("【还车关锁】更新车辆状态失败");
throw new ServiceException("【还车关锁】更新车辆状态失败");
if(ObjectUtil.isNotNull(device)){
/** 4. 更新车辆状态*/
device.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);
device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
int deviceUpdate = asDeviceMapper.updateAsDevice(device);
if(deviceUpdate==0){
log.info("【还车关锁】更新车辆状态失败");
throw new ServiceException("【还车关锁】更新车辆状态失败");
}
}
/** 3. 计算订单费用，保存订单总金额*/
order = calculateOrderFee(order,isInParkingArea);

1
electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java
View File

@ -194,6 +194,7 @@ public class CallbackServiceImpl implements CallbackService {
order.setPaid("1");
order.setPayTime(DateUtils.getNowDate());
order.setPayType(ServiceConstants.PAY_TYPE_WX);
order.setLocking("0");
if(attachVo.getType().equals(ServiceConstants.BUSINESS_TYPE_RIDING)){
logger.info("【微信支付回调】骑行支付");
// 1-骑行支付 关锁

100
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
View File

@ -1546,6 +1546,15 @@ public class EtOrderServiceImpl implements IEtOrderService
}
return inOrder;
}
/**
* 查询当前用户是否有正在进行中的订单
*/
@Override
public List<EtOrder> isInAuditOrder(Long userId,String orderNo) {
List<EtOrder> inOrder = etOrderMapper.isInAuditOrder(userId, orderNo);
return inOrder;
}
/**
* 查询当前车辆是否有正在进行中的订单
*/
@ -1570,53 +1579,54 @@ public class EtOrderServiceImpl implements IEtOrderService
throw new ServiceException("该订单状态非骑行中");
}
String sn = order.getSn();
if(StrUtil.isBlank(sn))throw new ServiceException("sn不能为空");
AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn);
/** 2.发送命令*/
if(!"true".equals(isBluetooth)){
ResponseVo responseVo = asDeviceService.sendCommandWithResp(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "换车关锁",orderNo);
if(responseVo.getCode()!=0){
log.info("【还车关锁】远程关锁失败");
throw new ServiceException("远程关锁失败");
}
}else{
asDevice.setLongitude(lon);
asDevice.setLatitude(lat);
if(StrUtil.isNotBlank(voltage)){
BigDecimal divide = new BigDecimal(voltage).divide(new BigDecimal(10));
asDevice.setVoltage(divide.toString());
EtModel model = etModelService.selectEtModelByModelId(asDevice.getModelId());
Integer remainingMileage = 0;
if(StrUtil.isNotBlank(asDevice.getVoltage())){
remainingMileage = CommonUtil.getRemainingMileage(asDevice.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance());
if(StrUtil.isNotBlank(sn)){
AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn);
/** 2.发送命令*/
if(!"true".equals(isBluetooth)){
ResponseVo responseVo = asDeviceService.sendCommandWithResp(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "换车关锁",orderNo);
if(responseVo.getCode()!=0){
log.info("【还车关锁】远程关锁失败");
throw new ServiceException("远程关锁失败");
}
Integer electricQuantity = CommonUtil.getElectricQuantity(asDevice.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百
asDevice.setRemainingMileage(remainingMileage);
asDevice.setRemainingPower(electricQuantity.toString());
}else{
asDevice.setLongitude(lon);
asDevice.setLatitude(lat);
if(StrUtil.isNotBlank(voltage)){
BigDecimal divide = new BigDecimal(voltage).divide(new BigDecimal(10));
asDevice.setVoltage(divide.toString());
EtModel model = etModelService.selectEtModelByModelId(asDevice.getModelId());
Integer remainingMileage = 0;
if(StrUtil.isNotBlank(asDevice.getVoltage())){
remainingMileage = CommonUtil.getRemainingMileage(asDevice.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance());
}
Integer electricQuantity = CommonUtil.getElectricQuantity(asDevice.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百
asDevice.setRemainingMileage(remainingMileage);
asDevice.setRemainingPower(electricQuantity.toString());
}
asDevice.setLastTime(DateUtils.getNowDate());
}
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失败");
}
asDevice.setLastTime(DateUtils.getNowDate());
}
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
electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java
View File

@ -108,6 +108,7 @@ public class WxPayService implements IWxPayService {
request.setAmount(getAmount(order.getPayFee()));
String outTradeNo = IdUtils.getOrderNo("wx");
order.setOutTradeNo(outTradeNo);
order.setLocking("1");
int updateEtOrder = etOrderService.updateEtOrder(order);
if(updateEtOrder == 0){
throw new ServiceException("更新订单outTradeNo失败");

16
electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
View File

@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="audioFiles" column="audio_files" />
<result property="usedSn" column="used_sn" />
<result property="changeReason" column="change_reason" />
<result property="locking" column="locking" />
</resultMap>
<sql id="selectEtOrderVo">
@ -53,7 +54,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,upload_time,deduction_amount,audio_files,used_sn,change_reason from et_order
rule_end_time, return_type, AsText(trip_route) trip_route,trip_route_str,cycle,deposit_deduction,video_url,upload_time,deduction_amount,audio_files,used_sn,change_reason,locking from et_order
</sql>
<select id="selectEtOrderList" parameterType="EtOrder" resultMap="EtOrderResult">
@ -101,7 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.deduction_amount,
o.audio_files,
o.used_sn,
o.change_reason
o.change_reason,
o.locking
FROM
et_order o
LEFT JOIN
@ -209,6 +211,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="isInAuditOrder" resultMap="EtOrderResult" parameterType="Long">
<include refid="selectEtOrderVo"/>
<where>
<if test="orderNo != null and orderNo != ''"> and order_no != #{orderNo}</if>
and user_id = #{userId} and status in(5,6,7) and type = 1
</where>
</select>
<select id="isInOrderBySn" resultMap="EtOrderResult" parameterType="String">
<include refid="selectEtOrderVo"/>
where sn = #{sn} and status =2 and type = 1
@ -699,6 +709,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="audioFiles != null">audio_files = #{audioFiles},</if>
<if test="usedSn != null">used_sn = #{usedSn},</if>
<if test="changeReason != null">change_reason = #{changeReason},</if>
<if test="locking != null">locking = #{locking},</if>
</trim>
where order_id = #{orderId}
</update>
@ -743,6 +754,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="audioFiles != null">audio_files = #{audioFiles},</if>
<if test="usedSn != null">used_sn = #{usedSn},</if>
<if test="changeReason != null">change_reason = #{changeReason},</if>
<if test="locking != null">locking = #{locking},</if>
</trim>
where order_no = #{orderNo}
</update>