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

Merge branch 'dev_local' into dev

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
#	jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
This commit is contained in:
autumn.g@foxmail.com
2023-11-21 11:31:42 +08:00
parent f3f67ddace de57827206
commit 342b6e4c26
39 changed files with 578 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java
View File

@@ -21,6 +21,8 @@ import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO;
import com.jsowell.pile.service.IMemberBasicInfoService;
import com.jsowell.pile.service.IMemberPlateNumberRelationService;
import com.jsowell.pile.service.IMemberTransactionRecordService;
import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.base.LoginUserDetailVO;
import com.jsowell.pile.vo.base.MerchantInfoVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.uniapp.MemberWalletLogVO;
@@ -67,13 +69,18 @@ public class MemberBasicInfoController extends BaseController {
/**
* 获取当前会员表中存在的运营商列表
* http://localhost:8080/member/info/getMerchantListByAuth
* @return
*/
@GetMapping("/getMerchantListByAuth")
public RestApiResponse<?> getMerchantListByAuth() {
RestApiResponse<?> response = null;
List<String> deptIds = getDeptIds();
List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth(deptIds);
// List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth(deptIds);
// List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth();
// List<MerchantInfoVO> list = UserUtils.getMerchantListByAuth();
LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail));
List<MerchantInfoVO> list = loginUserDetail.getMerchantInfoVOList();
if (CollectionUtils.isEmpty(list)) {
list = new ArrayList<>();
}

8
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -8,7 +8,6 @@ import com.jsowell.common.core.page.TableDataInfo;
import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PileMerchantInfo;
@@ -19,6 +18,7 @@ import com.jsowell.pile.dto.QueryOrderDTO;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.IPileMerchantInfoService;
import com.jsowell.pile.service.IPileStationInfoService;
import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.service.OrderService;
import org.apache.commons.collections4.CollectionUtils;
@@ -58,7 +58,7 @@ public class OrderBasicInfoController extends BaseController {
@GetMapping("/order/list")
public TableDataInfo list(QueryOrderDTO dto) {
// 权限过滤
AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
if (authorizedMap == null) {
// 为空表示没有权限，返回空数组
return new TableDataInfo();
@@ -81,7 +81,7 @@ public class OrderBasicInfoController extends BaseController {
@GetMapping("/order/totalData")
public AjaxResult getOrderTotalData(QueryOrderDTO dto) {
// 权限过滤
AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
if (authorizedMap == null) {
// 为空表示没有权限，返回空数组
return new AjaxResult();
@@ -110,7 +110,7 @@ public class OrderBasicInfoController extends BaseController {
@PostMapping("/order/export")
public void export(HttpServletResponse response, QueryOrderDTO orderBasicInfo) {
// 权限过滤
AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
if (authorizedMap == null) {
// 为空表示没有权限，返回空数组
return;