|
|
@@ -169,9 +169,16 @@ public class ChargeOrderInfoServiceImpl extends ServiceImpl<ChargeOrderInfoMappe
|
|
|
Assert.isTrue(userInfo != null, "用户信息不存在");
|
|
|
|
|
|
//判断有没有正在进行中的订单
|
|
|
- Long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(ChargeOrderInfo.class).eq(ChargeOrderInfo::getUserId, userId).in(ChargeOrderInfo::getStatus, SystemConstants.STATUS_ZERO, SystemConstants.STATUS_ONE, SystemConstants.STATUS_TWO));
|
|
|
- Assert.isTrue(count == 0, "您有正在进行中的订单,请等待完成!");
|
|
|
-
|
|
|
+ ChargeOrderInfo selectOne = this.baseMapper.selectOne(Wrappers.lambdaQuery(ChargeOrderInfo.class)
|
|
|
+ .eq(ChargeOrderInfo::getUserId, userId)
|
|
|
+ .in(ChargeOrderInfo::getStatus, SystemConstants.STATUS_ZERO, SystemConstants.STATUS_ONE, SystemConstants.STATUS_TWO)
|
|
|
+ .last("limit 1"));
|
|
|
+ if(null != selectOne){
|
|
|
+ appInvokeChargeVO.setChargeOrderId(selectOne.getId());
|
|
|
+ appInvokeChargeVO.setChargeOrderNo(selectOne.getChargeOrderNo());
|
|
|
+ appInvokeChargeVO.setStatus(selectOne.getStatus());
|
|
|
+ return appInvokeChargeVO;
|
|
|
+ }
|
|
|
//生成系统充电订单号及互联互通充电订单号 startChargeSeq equipAuthSeq (格式"运营商ID+唯一编号")
|
|
|
assert userId != null;
|
|
|
String chargeOrderNo = generateNo(ORDER_NO_PREFIX, userId);
|