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-05-06 16:41:09 +08:00
parent fb2ab3b72e
commit 843c74b175
4 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/XhpcUserPrivilegeController.java
View File

@ -58,7 +58,7 @@ public class XhpcUserPrivilegeController extends BaseController {
//选择用户拥有的数据权限 //选择用户拥有的数据权限
ajax.put("dataCheckedKeys", iXhpcUserPrivilegeService.dataCheckedKeys(userId)); ajax.put("dataCheckedKeys", iXhpcUserPrivilegeService.dataCheckedKeys(userId));
//登录用户拥有的数据权限树 //登录用户拥有的数据权限树
ajax.put("dataList", iXhpcUserPrivilegeService.dataList(SecurityUserId)); //ajax.put("dataList", iXhpcUserPrivilegeService.dataList(SecurityUserId));
return ajax; return ajax;
} }

2
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/IMechanismServiceImpl.java
View File

@ -58,7 +58,7 @@ public class IMechanismServiceImpl implements IMechanismService {
return regionTree(logUserId,type,tenantId); return regionTree(logUserId,type,tenantId);
}else if(status==1){ }else if(status==1){
return operatorTree(logUserId,type,tenantId); return operatorTree(logUserId,type,tenantId);
}else if(status==1){ }else if(status==2){
return operatorRegionTree(logUserId,type,tenantId); return operatorRegionTree(logUserId,type,tenantId);
}else{ }else{
return tenantOperatorTree(logUserId,type); return tenantOperatorTree(logUserId,type);

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

@ -457,41 +457,43 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
//根据不同的用户类型查询不同的信息 //根据不同的用户类型查询不同的信息
Long userid = loginUser.getUserid(); Long userid = loginUser.getUserid();
Integer userType = loginUser.getUserType(); Integer userType = loginUser.getUserType();
R user = xhpcCommonController.getMechanism(null, loginUser.getUserid(), loginUser.getUserType(), null, tenantId); R user = xhpcCommonController.getMechanism(null, userid, userType, null, tenantId);
if(user !=null && user.getData() !=null){ if(user !=null && user.getData() !=null){
Map<String, Object> map = (Map<String, Object>)user.getData(); Map<String, Object> map = (Map<String, Object>)user.getData();
//发票、留言板、版本、客服电话 //发票、留言板、版本、客服电话
Long invoice =null; // Long invoice =null;
String globalInvoice="global:invoice:"+ tenantId +":"; // String globalInvoice="global:invoice:"+ tenantId +":";
if(UserTypeUtil.USER_TYPE.equals(userType)){ // if(UserTypeUtil.USER_TYPE.equals(userType)){
invoice = redisService.getCacheObject(globalInvoice + UserTypeUtil.USER + userid); // invoice = redisService.getCacheObject(globalInvoice + UserTypeUtil.USER + userid);
}else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){ // }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){
invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.INTERNET+userid); // invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.INTERNET+userid);
}else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ // }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){
invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.COMMUNIT+userid); // invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.COMMUNIT+userid);
}else{ // }else{
invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.CUSTOMERS+userid); // invoice = redisService.getCacheObject(globalInvoice+UserTypeUtil.CUSTOMERS+userid);
} // }
if(invoice==null){ // if(invoice==null){
// map.put("invoiceNumber","0");
// }else{
// map.put("invoiceNumber",invoice);
// }
map.put("invoiceNumber","0"); map.put("invoiceNumber","0");
}else{ // Integer guestbook =null;
map.put("invoiceNumber",invoice); // if(UserTypeUtil.USER_TYPE.equals(userType)){
} // guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.USER_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId());
Integer guestbook =null; // }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){
if(UserTypeUtil.USER_TYPE.equals(userType)){ // guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.INTERNET_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId());
guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.USER_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId()); // }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){
}else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){ // guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.COMMUNIT_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId());
guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.INTERNET_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId()); // }else{
}else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ // guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.CUSTOMERS_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId());
guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.COMMUNIT_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId()); // }
}else{ // if(guestbook==null){
guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.CUSTOMERS_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId()); // map.put("guestbook","0");
} // }else{
if(guestbook==null){ // map.put("guestbook",guestbook);
// }
map.put("guestbook","0"); map.put("guestbook","0");
}else{
map.put("guestbook",guestbook);
}
map.put("version",version); map.put("version",version);
map.put("servicePhone",servicePhone); map.put("servicePhone",servicePhone);
map.put("activity",0); map.put("activity",0);

4
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java
View File

@ -24,6 +24,8 @@ import com.xhpc.user.service.XhpcInvoiceService;
import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.order.domain.XhpcHistoryOrder;
import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.domain.SysUser;
import com.xhpc.system.api.model.LoginUser; import com.xhpc.system.api.model.LoginUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -363,7 +365,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService {
LoginUser loginUser = tokenService.getLoginUser(); LoginUser loginUser = tokenService.getLoginUser();
getCreatorRead(loginUser.getUserid(),loginUser.getUserType(),loginUser.getTenantId()); getCreatorRead(loginUser.getUserid(),loginUser.getUserType(),loginUser.getTenantId());
}catch (Exception e){ }catch (Exception e){
e.printStackTrace();
} }
return invoicedOrderResponse; return invoicedOrderResponse;