bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
nmy 2023-12-09 23:53:07 +08:00
parent c2fa5fab87 a52d35b367
commit 10c1848c09
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
View File

@ -6,7 +6,7 @@ public class UserVo {
//用户id //用户id
private String userId; private Long userId;
//用户手机号 //用户手机号
private String phonenumber; private String phonenumber;

2
zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
View File

@ -115,6 +115,8 @@ public class SysLoginService
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
Long userId = user.getUserId(); Long userId = user.getUserId();
R<UserVo> userVoR = remoteUserService.selectUserVo(userId); R<UserVo> userVoR = remoteUserService.selectUserVo(userId);
userVoR.getData().setPhonenumber(user.getPhonenumber());
userVoR.getData().setUserId(userId);
userInfo.setUserVo(userVoR.getData()); userInfo.setUserVo(userVoR.getData());
return userInfo; return userInfo;
} }

1
zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java
View File

@ -67,6 +67,7 @@ public class TokenService
Map<String, Object> rspMap = new HashMap<String, Object>(); Map<String, Object> rspMap = new HashMap<String, Object>();
rspMap.put("access_token", JwtUtils.createToken(claimsMap)); rspMap.put("access_token", JwtUtils.createToken(claimsMap));
rspMap.put("expires_in", expireTime); rspMap.put("expires_in", expireTime);
rspMap.put("user",loginUser.getUserVo());
return rspMap; return rspMap;
} }

8
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
View File

@ -86,13 +86,13 @@ public class DevInfoServiceImpl implements IDevInfoService
List<BaseAddress> addressList = devInfoMapper.getBaseAddress(); List<BaseAddress> addressList = devInfoMapper.getBaseAddress();
for (BaseAddress address : addressList) { for (BaseAddress address : addressList) {
if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) { if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getCode()))) {
devInfoVo.setProvinceStr(address.getName()); devInfoVo.setProvinceStr(address.getName());
} }
if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getId()))) { if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getCode()))) {
devInfoVo.setCityStr(address.getName()); devInfoVo.setCityStr(address.getName());
} }
if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) { if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getCode()))) {
devInfoVo.setAreaStr(address.getName()); devInfoVo.setAreaStr(address.getName());
} }
} }
@ -186,7 +186,7 @@ public class DevInfoServiceImpl implements IDevInfoService
// if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) { // if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) {
// devInfoVo.setProvinceStr(address.getName()); // devInfoVo.setProvinceStr(address.getName());
// } // }
if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getId()))) { if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getCode()))) {
devInfoVo.setCityStr(address.getName()); devInfoVo.setCityStr(address.getName());
} }
// if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) { // if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) {

6
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java
View File

@ -1,10 +1,13 @@
package com.bonus.zlpt.order.service.impl; package com.bonus.zlpt.order.service.impl;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
import com.bonus.zlpt.common.core.domain.order.dto.FileInfoDto; import com.bonus.zlpt.common.core.domain.order.dto.FileInfoDto;
import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo; import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
import com.bonus.zlpt.common.core.utils.StringUtils; import com.bonus.zlpt.common.core.utils.StringUtils;
import com.bonus.zlpt.common.core.utils.uuid.UUID;
import com.bonus.zlpt.common.security.utils.SecurityUtils; import com.bonus.zlpt.common.security.utils.SecurityUtils;
import com.bonus.zlpt.order.mapper.OrderDetailsMapper; import com.bonus.zlpt.order.mapper.OrderDetailsMapper;
import com.bonus.zlpt.system.api.model.LoginUser; import com.bonus.zlpt.system.api.model.LoginUser;
@ -26,6 +29,7 @@ import javax.annotation.Resource;
public class OrderInfoServiceImpl implements IOrderInfoService public class OrderInfoServiceImpl implements IOrderInfoService
{ {
private final Integer ORDER_ATTACHMENT_DIC_ID = 21; private final Integer ORDER_ATTACHMENT_DIC_ID = 21;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Resource @Resource
private OrderInfoMapper orderInfoMapper; private OrderInfoMapper orderInfoMapper;
@Resource @Resource
@ -65,6 +69,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService
public int insertOrderInfo(OrderInfoVo orderInfo) public int insertOrderInfo(OrderInfoVo orderInfo)
{ {
orderInfo.setOrderUser(SecurityUtils.getUserId()); orderInfo.setOrderUser(SecurityUtils.getUserId());
orderInfo.setCode(UUID.randomUUID().toString());
orderInfo.setTime(dateFormat.format(new Date()));
orderInfoMapper.insertOrderInfo(orderInfo); orderInfoMapper.insertOrderInfo(orderInfo);
Long orderId = orderInfoMapper.selectLastInsertId(); Long orderId = orderInfoMapper.selectLastInsertId();
orderInfo.setOrderId(orderId); orderInfo.setOrderId(orderId);