hbyt/cloud-battery-manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
andy 2025-08-30 14:10:54 +08:00
parent 285c46024b
commit f51c0df5f7
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderServiceImpl.java
View File

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

21
wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/LoginServiceImpl.java
View File

@ -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;
}