Merge branch 'dev_local' into dev

# 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
2026-04-23 04:25:21 +08:00 · 2023-11-21 11:31:42 +08:00
parent f3f67ddace de57827206
commit 342b6e4c26
39 changed files with 578 additions and 148 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -160,10 +160,10 @@ public class MemberService {
 			memberBasicInfo.setOpenId(openId);

 			// 首次新建会员，同时新建会员钱包
-			MemberWalletInfo memberWalletInfo = MemberWalletInfo.builder().memberId(memberId).build();
+			// MemberWalletInfo memberWalletInfo = MemberWalletInfo.builder().memberId(memberId).build();
 			MemberTransactionDTO memberTransactionDTO = MemberTransactionDTO.builder()
 					.memberBasicInfo(memberBasicInfo)
-					.memberWalletInfo(memberWalletInfo)
+					// .memberWalletInfo(memberWalletInfo)
 					.build();
 			transactionService.createMember(memberTransactionDTO);
 		} else {
@@ -325,7 +325,7 @@ public class MemberService {
 		dto.setEndDate(lastDay);

 		// 查询会员钱包信息表，获取 本金余额
-		MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId());
+		MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId(), null);
 		if (memberWalletInfo == null) {
 			// 用户未注册小程序
 			throw new BusinessException(ReturnCodeEnum.CODE_AUTHENTICATION_ERROR);
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -39,12 +39,13 @@ import com.jsowell.pile.dto.*;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.service.orderlogic.AbstractOrderLogic;
 import com.jsowell.pile.service.orderlogic.OrderLogicFactory;
+import com.jsowell.pile.util.UserUtils;
 import com.jsowell.pile.vo.base.OrderAmountDetailVO;
 import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
 import com.jsowell.pile.vo.base.PileInfoVO;
 import com.jsowell.pile.vo.base.StationInfoVO;
-import com.jsowell.pile.vo.uniapp.*;
 import com.jsowell.pile.vo.uniapp.InvoiceRecordVO;
+import com.jsowell.pile.vo.uniapp.*;
 import com.jsowell.pile.vo.web.*;
 import com.jsowell.wxpay.response.WechatPayNotifyParameter;
 import org.apache.commons.collections4.CollectionUtils;
@@ -666,7 +667,7 @@ public class OrderService {
            return false;
        }
        // 当前登录用户，是否可以结算该订单
-        AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
+        AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
        if (authorizedMap == null) {
            log.info("人工结算订单-当前登录管理员无权限");
            return false;
--- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
@@ -210,7 +210,7 @@ public class PileService {
 		CompletableFuture<List<BillingPriceVO>> billingPriceFuture = CompletableFuture.supplyAsync(() -> pileBillingTemplateService.queryBillingPrice(pileInfoVO.getStationId()));

 		// 查询运营商信息
-		CompletableFuture<MerchantInfoVO> merchantInfoVOFuture = CompletableFuture.supplyAsync(() -> pileMerchantInfoService.getMerchantInfo(pileInfoVO.getMerchantId()));
+		CompletableFuture<MerchantInfoVO> merchantInfoVOFuture = CompletableFuture.supplyAsync(() -> pileMerchantInfoService.getMerchantInfoVO(pileInfoVO.getMerchantId()));

 		CompletableFuture<Void> all = CompletableFuture.allOf(connectorInfoListFuture, merchantInfoVOFuture, billingPriceFuture);
 		// .join()和.get()都会阻塞并获取线程的执行情况
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java
@@ -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<>();
        }
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
@@ -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;