From 4a4bdacb8a76f732a54e083c8015ae8a3339ba48 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Sat, 9 Dec 2023 23:16:35 +0800 Subject: [PATCH 1/3] fix --- .../bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java index bcc7c5c..4caf79a 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java @@ -1,10 +1,13 @@ package com.bonus.zlpt.order.service.impl; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; 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.utils.StringUtils; +import com.bonus.zlpt.common.core.utils.uuid.UUID; import com.bonus.zlpt.common.security.utils.SecurityUtils; import com.bonus.zlpt.order.mapper.OrderDetailsMapper; import com.bonus.zlpt.system.api.model.LoginUser; @@ -26,6 +29,7 @@ import javax.annotation.Resource; public class OrderInfoServiceImpl implements IOrderInfoService { private final Integer ORDER_ATTACHMENT_DIC_ID = 21; + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @Resource private OrderInfoMapper orderInfoMapper; @Resource @@ -65,6 +69,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService public int insertOrderInfo(OrderInfoVo orderInfo) { orderInfo.setOrderUser(SecurityUtils.getUserId()); + orderInfo.setCode(UUID.randomUUID().toString()); + orderInfo.setTime(dateFormat.format(new Date())); orderInfoMapper.insertOrderInfo(orderInfo); Long orderId = orderInfoMapper.selectLastInsertId(); orderInfo.setOrderId(orderId); From edfe1dbd25e71d99328f3211bc288217dd4b8a1e Mon Sep 17 00:00:00 2001 From: mashuai Date: Sat, 9 Dec 2023 23:17:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java | 2 +- .../main/java/com/bonus/zlpt/auth/service/SysLoginService.java | 2 ++ .../com/bonus/zlpt/common/security/service/TokenService.java | 1 + .../src/main/resources/mapper/system/SysUserMapper.xml | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java index d91d6d5..033ad59 100644 --- a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java +++ b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java @@ -6,7 +6,7 @@ public class UserVo { //用户id - private String userId; + private Long userId; //用户手机号 private String phonenumber; diff --git a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java index b188269..56414d5 100644 --- a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java +++ b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java @@ -115,6 +115,8 @@ public class SysLoginService recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); Long userId = user.getUserId(); R userVoR = remoteUserService.selectUserVo(userId); + userVoR.getData().setPhonenumber(user.getPhonenumber()); + userVoR.getData().setUserId(userId); userInfo.setUserVo(userVoR.getData()); return userInfo; } diff --git a/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java b/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java index ef431d2..739a381 100644 --- a/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java +++ b/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java @@ -67,6 +67,7 @@ public class TokenService Map rspMap = new HashMap(); rspMap.put("access_token", JwtUtils.createToken(claimsMap)); rspMap.put("expires_in", expireTime); + rspMap.put("user",loginUser.getUserVo()); return rspMap; } diff --git a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml index ba5d764..9689440 100644 --- a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + From a52d35b367aad492648070a865df9bf7094699d0 Mon Sep 17 00:00:00 2001 From: zfhai <15856818120@163.com> Date: Sat, 9 Dec 2023 23:36:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java index 172133b..6f3c306 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java @@ -86,13 +86,13 @@ public class DevInfoServiceImpl implements IDevInfoService List addressList = devInfoMapper.getBaseAddress(); 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()); } - if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getId()))) { + if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getCode()))) { 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()); } } @@ -186,7 +186,7 @@ public class DevInfoServiceImpl implements IDevInfoService // if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) { // 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()); } // if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) {