From 8e38bf000cd65a3326041500d5e13429418e5314 Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Mon, 22 Apr 2019 21:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E5=9B=9E=E8=B0=83=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=EF=BC=8C=E9=94=99=E8=AF=AF=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-web/src/utils/cache.js                              | 8 ++++----
 .../iocoder/mall/order/biz/service/OrderServiceImpl.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

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);