autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-13 18:48:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Guoqs
2026-02-03 15:25:56 +08:00
parent 80f53d9f51
commit 4aacf8b873
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@@ -68,7 +69,6 @@ import com.jsowell.pile.vo.uniapp.business.BusinessOrderListVO;
import com.jsowell.pile.vo.uniapp.business.BusinessOrderQueryResultVO; import com.jsowell.pile.vo.uniapp.business.BusinessOrderQueryResultVO;
import com.jsowell.pile.vo.uniapp.customer.*; import com.jsowell.pile.vo.uniapp.customer.*;
import com.jsowell.pile.vo.web.*; import com.jsowell.pile.vo.web.*;
import com.jsowell.pile.vo.web.OrderStatisticsVO;
import com.jsowell.wxpay.common.WeChatPayParameter; import com.jsowell.wxpay.common.WeChatPayParameter;
import com.jsowell.wxpay.response.WechatPayRefundRequest; import com.jsowell.wxpay.response.WechatPayRefundRequest;
import com.jsowell.wxpay.response.WechatPayRefundResponse; import com.jsowell.wxpay.response.WechatPayRefundResponse;
@@ -292,6 +292,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
} }
dto.setStationDeptIds(authorizedMap.getStationDeptIds()); dto.setStationDeptIds(authorizedMap.getStationDeptIds());
dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds()); dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
if (Objects.nonNull(SecurityUtils.getLoginUser())) {
dto.setParams(ImmutableMap.of("roleId", SecurityUtils.getLoginUser().getUserId()));
}
return selectOrderBasicInfoList(dto); return selectOrderBasicInfoList(dto);
} }

1
jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java
View File

@@ -107,6 +107,7 @@ public class UserUtils {
if (Objects.isNull(loginUser)) { if (Objects.isNull(loginUser)) {
return resultVO; return resultVO;
} }
resultVO.setLoginUser(loginUser);
// 获取登录用户对应的user对象 // 获取登录用户对应的user对象
SysUser user = loginUser.getUser(); SysUser user = loginUser.getUser();
if (Objects.isNull(user)) { if (Objects.isNull(user)) {

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.pile.vo.base; package com.jsowell.pile.vo.base;
import com.jsowell.common.core.domain.model.LoginUser;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@@ -11,6 +12,10 @@ import java.util.List;
@Getter @Getter
@Setter @Setter
public class LoginUserDetailVO { public class LoginUserDetailVO {
/**
* 登录用户
*/
LoginUser loginUser;
/** /**
* 有权限的一级运营商idList * 有权限的一级运营商idList
* 平台级账号有多个一级运营商权限 * 平台级账号有多个一级运营商权限

3
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -2004,6 +2004,9 @@
<if test="vinCode != null and vinCode != ''"> <if test="vinCode != null and vinCode != ''">
and t1.vin_code = #{vinCode,jdbcType=VARCHAR} and t1.vin_code = #{vinCode,jdbcType=VARCHAR}
</if> </if>
<if test="params != null and params.roleId != null and params.roleId > 2">
and t1.review_flag = '1'
</if>
<if test="plateNumber != null and plateNumber != ''"> <if test="plateNumber != null and plateNumber != ''">
and t1.plate_number = #{plateNumber,jdbcType=VARCHAR} and t1.plate_number = #{plateNumber,jdbcType=VARCHAR}
</if> </if>