diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderServiceImpl.java
index 8959ed0..4dbad93 100644
--- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderServiceImpl.java
+++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderServiceImpl.java
@@ -531,7 +531,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         BeanUtils.copyProperties(order, orderDetailVo);
         orderDetailVo.setAmount(order.getOrderAmount());
         OrderDetail orderDetail = orderDetailDao.selectOne(new LambdaQueryWrapper<OrderDetail>().eq(OrderDetail::getOrderId, order.getPkId()));
-        BeanUtils.copyProperties(orderDetail, orderDetailVo);
+        if(ObjectUtils.isNotEmpty(orderDetail)){
+            BeanUtils.copyProperties(orderDetail, orderDetailVo);
+        }
         return new Result<OrderDetailVo>().success(orderDetailVo);
     }
 
diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/LoginServiceImpl.java b/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/LoginServiceImpl.java
index 3538f8a..59c4a58 100644
--- a/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/LoginServiceImpl.java
+++ b/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/LoginServiceImpl.java
@@ -1,11 +1,14 @@
 package com.evotech.hd.wechat.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import cn.hutool.crypto.digest.HMac;
 import cn.hutool.crypto.digest.HmacAlgorithm;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.evotech.hd.common.core.Dto.Result;
 import com.evotech.hd.common.core.constant.HDConstant;
 import com.evotech.hd.common.core.dao.wechat.WechatUserDao;
@@ -132,18 +135,18 @@ public class LoginServiceImpl implements LoginService {
 	@Override
 	public Map<String, String> tokenBuilder(String wuid) {
 		//获取redis中的token
-//		String wxToken = ((redisUtil.hasKey(HDConstant.wxToken + wuid) && !ObjectUtils.isEmpty(redisUtil.get(HDConstant.wxToken + wuid))) ? String.valueOf(redisUtil.get(HDConstant.wxToken + wuid)) : null);
-//		if(StringUtils.isEmpty(wxToken)) {
-//			String randomStr = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_FORMATTER);
-//			wxToken = XCXUtil.wechatToken(wuid, randomStr);
-//			redisUtil.set(HDConstant.tokenRandomStr + wuid, randomStr, 0);
-//			// 缓存数据
-//		}
+		String wxToken = ((redisUtil.hasKey(HDConstant.wxToken + wuid) && !ObjectUtils.isEmpty(redisUtil.get(HDConstant.wxToken + wuid))) ? String.valueOf(redisUtil.get(HDConstant.wxToken + wuid)) : null);
+		if(StringUtils.isEmpty(wxToken)) {
+			String randomStr = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_FORMATTER);
+			wxToken = XCXUtil.wechatToken(wuid, randomStr);
+			redisUtil.set(HDConstant.tokenRandomStr + wuid, randomStr, 0);
+			// 缓存数据
+		}
 //		//刷新token
-//		redisUtil.set(HDConstant.wxToken + wuid, wxToken, 0);
+		redisUtil.set(HDConstant.wxToken + wuid, wxToken, 0);
 		Map<String, String> m = new HashMap<String, String>();
 		m.put("wuid", wuid);
-//		m.put("wxToken", wxToken);
+		m.put("wxToken", wxToken);
 		return m;
 	}