From 430cc48f8df0e6af9e62464fe84bc2f3a2c5a6ed Mon Sep 17 00:00:00 2001 From: yuyang Date: Wed, 16 Feb 2022 14:21:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/api/XhpcPileOrderController.java | 11 +++++-- .../mapper/XhpcHistoryOrderMapper.xml | 8 ++--- .../xhpc/user/mapper/XhpcAppUserMapper.java | 2 +- .../service/impl/XhpcAppUserServiceImpl.java | 31 +++++++++---------- .../resources/mapper/XhpcAppUserMapper.xml | 2 +- .../mapper/XhpcInternetUserMapper.xml | 5 ++- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index 4d39547b..5e3adc9d 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -391,9 +391,14 @@ public class XhpcPileOrderController extends BaseController { } }else{ Map pushOrder = redisService.getCacheMap("pushOrder:"+orderNo); - xhpcHistoryOrder.setInternetSerialNumber(pushOrder.get("internetSerialNumber").toString()); - xhpcHistoryOrder.setOperatorId3rdptyEvcs((String) pushOrder.get("operatorId3rdpty")); - xhpcChargeOrder.setOperatorId3rdptyEvcs((String) pushOrder.get("operatorId3rdpty")); + if(pushOrder !=null){ + if(pushOrder.get("internetSerialNumber") !=null){ + xhpcHistoryOrder.setInternetSerialNumber(pushOrder.get("internetSerialNumber").toString()); + } + if(pushOrder.get("operatorId3rdpty") !=null){ + xhpcHistoryOrder.setOperatorId3rdptyEvcs((String) pushOrder.get("operatorId3rdpty")); + } + } } xhpcHistoryOrder.setType(1); //结算 diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 4b69630b..4d363710 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -86,7 +86,7 @@ serial_number, - + internet_serial_number, @@ -188,7 +188,7 @@ meter_value_start_evcs, - + operator_id3rdpty_evcs, @@ -238,7 +238,7 @@ #{serialNumber,jdbcType=VARCHAR}, - + #{internetSerialNumber,jdbcType=VARCHAR}, @@ -340,7 +340,7 @@ #{meterValueStartEvcs,jdbcType=DOUBLE}, - + #{operatorId3rdptyEvcs,jdbcType=VARCHAR}, diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java index 3e5085af..51755111 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java @@ -64,7 +64,7 @@ public interface XhpcAppUserMapper { * @param phone 手机号 * @return 结果 */ - public XhpcAppUser getAppUserByPhone(@Param("phone") String phone); + public XhpcAppUser getAppUserByPhone(@Param("phone") String phone,@Param("tenantId") String tenantId); /** * openid查询C端用户信息 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java index f0889ffe..94c24333 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java @@ -146,7 +146,7 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU if (!code.equalsIgnoreCase(captcha)) { R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); } - XhpcAppUser info = xhpcAppUserMapper.getAppUserByPhone(phone); + XhpcAppUser info = xhpcAppUserMapper.getAppUserByPhone(phone,tenantId); if (StringUtils.isNotNull(info)) { //判断openid是否存在，不存在重新补充 if (StatusConstants.OPERATION_WX_TYPE.equals(type)) { @@ -225,11 +225,10 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU || username.length() > UserConstants.USERNAME_MAX_LENGTH) { return R.fail(HttpStatus.ERROR_STATUS, "用户名不在指定范围"); } - - R lognUser = userTypeService.getUser(username, null, null, null,tenantId); - if(lognUser !=null && lognUser.getData() !=null){ - String sub = username.substring(0, 2); - if (UserTypeUtil.COMMUNIT.equals(sub) || UserTypeUtil.CUSTOMERS.equals(sub)){ + String sub = username.substring(0, 2); + if (UserTypeUtil.COMMUNIT.equals(sub) || UserTypeUtil.CUSTOMERS.equals(sub)){ + R lognUser = userTypeService.getUser(username, null, null, null,tenantId); + if(lognUser !=null && lognUser.getData() !=null){ Map map = (Map)lognUser.getData(); LoginUser userInfo = new LoginUser(); SysUser sysUser = new SysUser(); @@ -271,9 +270,12 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU redisService.deleteObject("pvToken:" + username); // 获取登录token return R.ok(tokenService.createToken(userInfo)); + }else{ + return R.fail(HttpStatus.DATA_ERROR, "无此账号，请重新输入账号登录"); } - // 查询用户信息 - XhpcAppUser user = xhpcAppUserMapper.getAppUserByPhone(username); + } + //C端用户自动注册 + XhpcAppUser user = xhpcAppUserMapper.getAppUserByPhone(username,tenantId); if (StringUtils.isNull(user)) { //注册 XhpcAppUser xhpcAppUser = new XhpcAppUser(); @@ -290,7 +292,7 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU } xhpcAppUser.setTenantId(tenantId); xhpcAppUserMapper.insert(xhpcAppUser); - user = xhpcAppUserMapper.getAppUserByPhone(username); + user = xhpcAppUserMapper.getAppUserByPhone(username,tenantId); // 获取登录token //return R.ok(tokenService.createToken(userInfo)); //return R.fail(HttpStatus.DATA_ERROR, "登录用户：" + username + " 不存在"); @@ -325,14 +327,11 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU } xhpcAppUserMapper.update(user); redisService.deleteObject("pvToken:" + user.getPhone()); - //添加最后一次登录数据 xhpcAppUserMapper.addUserLoginTime(user.getAppUserId(),username,userInfo.getUserType(),openid,Integer.valueOf(type),UserConstants.LOGIN,tenantId,new Date()); // 获取登录token return R.ok(tokenService.createToken(userInfo)); - }else{ - return R.fail(HttpStatus.DATA_ERROR, "服务器繁忙，请稍后再试"); - } + } /** @@ -354,7 +353,7 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU R user = userTypeService.getUser(null, userid, userType, null,tenantId); if(user !=null && user.getData() !=null){ if(UserTypeUtil.USER_TYPE==userType){ - XhpcAppUser appUser = xhpcAppUserMapper.getAppUserByPhone(username); + XhpcAppUser appUser = xhpcAppUserMapper.getAppUserByPhone(username,tenantId); if (!StringUtils.isNull(appUser)) { if (StatusConstants.OPERATION_WX_TYPE.equals(type)) { appUser.setWeixinLogin(UserConstants.NO_LOGIN); @@ -496,7 +495,7 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU Integer userType = loginUser.getUserType(); String tenantId = loginUser.getTenantId(); if(UserTypeUtil.USER_TYPE.equals(userType)){ - XhpcAppUser xhpcAppUser = xhpcAppUserMapper.getAppUserByPhone(phone); + XhpcAppUser xhpcAppUser = xhpcAppUserMapper.getAppUserByPhone(phone,tenantId); if (StringUtils.isNull(xhpcAppUser)) { return R.fail(HttpStatus.ERROR_STATUS, "用户不存在"); } @@ -541,7 +540,7 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU if(user !=null && user.getData() !=null){ Map map = (Map)user.getData(); if(UserTypeUtil.USER_TYPE.equals(userType)){ - XhpcAppUser appUser = xhpcAppUserMapper.getAppUserByPhone(map.get("phone").toString()); + XhpcAppUser appUser = xhpcAppUserMapper.getAppUserByPhone(map.get("phone").toString(),loginUser.getTenantId()); appUser.setSocProtect(socProtect); appUser.setSoc(soc); xhpcAppUserMapper.update(appUser); diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml index 0285419a..730ac0c4 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml @@ -224,7 +224,7 @@