diff --git a/admin-web/src/utils/cache.js b/admin-web/src/utils/cache.js index e7ce31f07..65b238a00 100644 --- a/admin-web/src/utils/cache.js +++ b/admin-web/src/utils/cache.js @@ -11,14 +11,14 @@ const cacheKeys = { /// 设置 loginToken,分为 accessToken 和 refreshToken export function setLoginToken(accessToken, refreshToken) { - setLocalStorage(cacheKeys.accessTokenKey, accessToken); - setLocalStorage(cacheKeys.refreshTokenKey, refreshToken); + setLocalStorage(cacheKeys.ACCESS_TOKEN, accessToken); + setLocalStorage(cacheKeys.REFRESH_TOKEN, refreshToken); } export function getLoginToken() { const res = {}; - res[cacheKeys.accessTokenKey] = getLocalStorage(cacheKeys.accessTokenKey); - res[cacheKeys.refreshTokenKey] = getLocalStorage(cacheKeys.refreshTokenKey); + res[cacheKeys.ACCESS_TOKEN] = getLocalStorage(cacheKeys.ACCESS_TOKEN); + res[cacheKeys.REFRESH_TOKEN] = getLocalStorage(cacheKeys.REFRESH_TOKEN); return res; } diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java index 22dd66733..38057ff5b 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java @@ -611,7 +611,7 @@ public class OrderServiceImpl implements OrderService { return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_PAY_AMOUNT_ERROR.getCode()).getMessage(); } OrderDO updateOrderObj = new OrderDO() - .setStatus(OrderStatusEnum.ALREADY_SHIPMENT.getValue()) + .setStatus(OrderStatusEnum.WAIT_SHIPMENT.getValue()) .setPayAmount(payAmount) .setPaymentTime(new Date()); int updateCount = orderMapper.updateByIdAndStatus(order.getId(), order.getStatus(), updateOrderObj);