yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改小程序用戶獲取信息

Browse Source
This commit is contained in:
yuyang 2022-08-24 11:24:11 +08:00
parent 8afe372b62
commit e78536738f
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
View File

@ -504,13 +504,14 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
//终端信息 //终端信息
XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(connectorId,null); XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(connectorId,null);
if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) {
r.setCode(1); r.setCode(500);
String pilePrompt = redisService.getCacheObject("pilePrompt:000000"); // String pilePrompt = redisService.getCacheObject("pilePrompt:000000");
if(!"".equals(pilePrompt) && pilePrompt !=null){ // if(!"".equals(pilePrompt) && pilePrompt !=null){
r.setMsg(pilePrompt); // r.setMsg(pilePrompt);
}else{ // }else{
r.setMsg("因限电该桩已停用,请选择其他桩进行充电"); // r.setMsg("因限电该桩已停用,请选择其他桩进行充电");
} // }
r.setMsg("因限电该桩已停用请选择其他桩进行充电");
return r; return r;
} }
//终端状态是否空闲 //终端状态是否空闲

4
xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos: nacos:
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 172.31.183.135:8848 server-addr: mse-e2a05960-nacos-ans.mse.aliyuncs.com:8848
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 172.31.183.135:8848 server-addr: mse-e2a05960-nacos-ans.mse.aliyuncs.com:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

41
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
View File

@ -430,24 +430,28 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
*/ */
@Override @Override
public R<?> voluntaryLogin(Map<String, Object> map) { public R<?> voluntaryLogin(Map<String, Object> map) {
String type = StringUtils.valueOf(map.get("type")); try{
String openid = StringUtils.valueOf(map.get("openid")); String type = StringUtils.valueOf(map.get("type"));
String tenantId = StringUtils.valueOf(map.get("tenantId")); String openid = StringUtils.valueOf(map.get("openid"));
logger.info("<<<<<<<<<<openid>>>>>>>>>>>>"); String tenantId = StringUtils.valueOf(map.get("tenantId"));
logger.info("<<<<<<<<<<自动登录openid>>>>>>>>>>>>"+openid); logger.info("<<<<<<<<<<openid>>>>>>>>>>>>");
logger.info("<<<<<<<<<<openid>>>>>>>>>>>>"); logger.info("<<<<<<<<<<自动登录openid>>>>>>>>>>>>"+openid);
Map<String, Object> userLoginTime = xhpcAppUserMapper.getUserLoginTime(Integer.valueOf(type), openid,tenantId); logger.info("<<<<<<<<<<openid>>>>>>>>>>>>");
if(userLoginTime ==null){ Map<String, Object> userLoginTime = xhpcAppUserMapper.getUserLoginTime(Integer.valueOf(type), openid,tenantId);
return R.fail(HttpStatus.USER_LOGIN, "请重新登录"); if(userLoginTime ==null){
} return R.fail(HttpStatus.USER_LOGIN, "请重新登录");
logger.info("-------userLoginTime---" + userLoginTime); }
if(userLoginTime.get("status") == null){ logger.info("-------userLoginTime---" + userLoginTime);
return R.fail(HttpStatus.USER_LOGIN, "请重新登录"); if(userLoginTime.get("status") == null){
} else if(UserTypeUtil.NO_LOGIN.equals(userLoginTime.get("status").toString())){ return R.fail(HttpStatus.USER_LOGIN, "请重新登录");
return R.fail(HttpStatus.USER_LOGIN, "请重新登录"); } else if(UserTypeUtil.NO_LOGIN.equals(userLoginTime.get("status").toString())){
} return R.fail(HttpStatus.USER_LOGIN, "请重新登录");
logger.info("-------status---"+userLoginTime.get("status").toString()); }
return appLogin(userLoginTime.get("account").toString(), type, openid, tenantId); logger.info("-------status---"+userLoginTime.get("status").toString());
return appLogin(userLoginTime.get("account").toString(), type, openid, tenantId);
}catch (Exception e){
return R.fail(HttpStatus.USER_LOGIN, "请重新登录");
}
} }
/** /**
@ -525,6 +529,7 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
logger.info("-------appInfo----请重新登录---");
return AjaxResult.error("请重新登录",HttpStatus.USER_LOGIN); return AjaxResult.error("请重新登录",HttpStatus.USER_LOGIN);
} }
} }