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-06-13 09:26:24 +08:00
parent f80e03d4c7
commit e8c75e2a5a
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java
View File

@ -218,4 +218,24 @@ public class LoginUser implements Serializable
public void setStatus(Integer status) {
this.status = status;
}
@Override
public String toString() {
return "LoginUser{" +
"token='" + token + '\'' +
", userid=" + userid +
", username='" + username + '\'' +
", userType=" + userType +
", userTypeUtil='" + userTypeUtil + '\'' +
", tenantId='" + tenantId + '\'' +
", openId='" + openId + '\'' +
", loginTime=" + loginTime +
", expireTime=" + expireTime +
", ipaddr='" + ipaddr + '\'' +
", permissions=" + permissions +
", roles=" + roles +
", sysUser=" + sysUser +
", status=" + status +
'}';
}
}

7
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java
View File

@ -61,18 +61,17 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I
SysUser sysUser = loginUser.getSysUser();
Long sysUserId = sysUser.getUserId();
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUserId)){
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站
return xhpcTimingChargingModelMapper.list(operatorId,reason,status,startTime,endTime,chargingStationId,logOperatorId, 1,tenantId);
}else{
//查询赋值的场站
return xhpcTimingChargingModelMapper.list(operatorId,reason,status,startTime,endTime,chargingStationId,sysUserId, 1,tenantId);
return xhpcTimingChargingModelMapper.list(operatorId,reason,status,startTime,endTime,chargingStationId,sysUserId, 2,tenantId);
}
}else{
return xhpcTimingChargingModelMapper.list(operatorId,reason,status,startTime,endTime,chargingStationId,sysUserId, 1,tenantId);
return xhpcTimingChargingModelMapper.list(operatorId,reason,status,startTime,endTime,chargingStationId,sysUserId, 0,tenantId);
}
}

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

@ -489,15 +489,18 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
map.put("servicePhone",servicePhone);
//获取最优的活动图片显示
Map<String, Object> objectMap = activityDiscountTime(loginUser.getUserid(), new Date(), loginUser.getUserType(), null, loginUser.getTenantId());
if("1".equals(objectMap.get("state").toString())){
map.put("activity",1);
map.put("activitySize",1);
map.put("activityImg","https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/"+objectMap.get("totalBackgroundUrl").toString());
}else{
map.put("activity",0);
map.put("activitySize",1);
map.put("activityImg","https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/bunengshanchu/1.png");
}
// if("1".equals(objectMap.get("state").toString())){
// map.put("activity",1);
// map.put("activitySize",1);
// map.put("activityImg","https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/"+objectMap.get("totalBackgroundUrl").toString());
// }else{
// map.put("activity",0);
// map.put("activitySize",1);
// map.put("activityImg","https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/bunengshanchu/1.png");
// }
map.put("activity",0);
map.put("activitySize",1);
map.put("activityImg","https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/bunengshanchu/1.png");
map.put("socSize",redisService.getCacheObject("global:"+tenantId+":SOC"));
return AjaxResult.success(map);
}else{