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-10-12 01:40:46 +08:00
parent 032e6b6d02
commit c11c2de893
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electripper-common/src/main/java/com/ruoyi/common/pay/tm/enums/PayStatus.java
View File

@ -14,7 +14,7 @@ public enum PayStatus {
SUCCESS("SUCCESS", "支付成功"), SUCCESS("SUCCESS", "支付成功"),
NOTPAY("NOTPAY", "未支付"), NOTPAY("NOTPAY", "未支付"),
CLOSE("CLOSE", "已关闭"), CLOSE("CLOSED", "已关闭"),
REVOKED("REVOKED", "已撤销"), REVOKED("REVOKED", "已撤销"),
USERPAYING("USERPAYING", "用户支付中"), USERPAYING("USERPAYING", "用户支付中"),
PAYERROR("PAYERROR", "支付失败"), PAYERROR("PAYERROR", "支付失败"),

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

@ -1787,10 +1787,10 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
throw new ServiceException("该订单状态非骑行中"); throw new ServiceException("该订单状态非骑行中");
} }
EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(order.getAreaId()); EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(order.getAreaId());
if(ServiceConstants.RETURN_TYPE_NORMAL.equals(returnType)){
if(ServiceConstants.RETURN_VERIFY_YES.equals(area.getReturnVerify()) && StrUtil.isBlank(order.getVideoUrl())){ if(ServiceConstants.RETURN_VERIFY_YES.equals(area.getReturnVerify()) && StrUtil.isBlank(order.getVideoUrl())){
throw new ServiceException("请先拍摄还车视频！"); throw new ServiceException("请先拍摄还车视频！");
} }
if(ServiceConstants.RETURN_TYPE_NORMAL.equals(returnType)){
//判断是否在禁停区内，如果在禁停区内，不能还车。 noParkingArea //判断是否在禁停区内，如果在禁停区内，不能还车。 noParkingArea
if(isNoParkingArea(order.getSn(), order.getAreaId())){ if(isNoParkingArea(order.getSn(), order.getAreaId())){
throw new ServiceException("在禁停区内，不能还车"); throw new ServiceException("在禁停区内，不能还车");

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

@ -185,6 +185,9 @@ public class CallbackServiceImpl implements CallbackService {
public void businessHandle(String outTradeNo,AttachVo attachVo,String payType) { public void businessHandle(String outTradeNo,AttachVo attachVo,String payType) {
// 充值成功后的业务处理 // 充值成功后的业务处理
EtOrder order = orderService.selectEtOrderByOutTradeNo(outTradeNo); EtOrder order = orderService.selectEtOrderByOutTradeNo(outTradeNo);
if(order.getPaid().equals(ServiceConstants.ORDER_PAY_STATUS_PAID)){
return;
}
EtOrder order1 = new EtOrder(); EtOrder order1 = new EtOrder();
order1.setOrderId(order.getOrderId()); order1.setOrderId(order.getOrderId());
logger.info("【微信/太米支付回调】订单信息 : " + JSON.toJSONString(order)); logger.info("【微信/太米支付回调】订单信息 : " + JSON.toJSONString(order));