|
|
@@ -109,8 +109,8 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
|
|
|
memberName,
|
|
|
account.getBalance(),
|
|
|
Account.NO_DISCOUNT,
|
|
|
- // 本次开机最大消费金额,减去0.5元,防止延时导致超消费
|
|
|
- account.getBalance() - 50);
|
|
|
+ // 本次开机最大消费金额
|
|
|
+ account.getBalance());
|
|
|
// 首次消费:无归属站点的用户自动归属到当前设备所在站点
|
|
|
var userStationId = StpUtil.getSession().getString("stationId");
|
|
|
if (CommUtil.isEmptyOrNull(userStationId)) {
|
|
|
@@ -339,15 +339,15 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
|
|
|
.selectAs(User::getMobilePhone, WashOrderVo::getMobilePhone)
|
|
|
.leftJoin(User.class, User::getId, WashOrder::getUserId)
|
|
|
.eq(WashOrder::getOrderId, orderId);
|
|
|
-
|
|
|
+
|
|
|
WashOrderVo washOrderVo = selectJoinOne(WashOrderVo.class, wrapper);
|
|
|
-
|
|
|
+
|
|
|
if (washOrderVo != null) {
|
|
|
washOrderVo.setStationName(KymCache.INSTANCE.getStationNameById(washOrderVo.getStationId()));
|
|
|
washOrderVo.setUserStationId(KymCache.INSTANCE.getUserStationId(washOrderVo.getUserId()));
|
|
|
washOrderVo.setUserStationName(KymCache.INSTANCE.getStationNameById(washOrderVo.getUserStationId()));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return washOrderVo;
|
|
|
}
|
|
|
|