src/main/java/com/jwl/driver/server/controller/AppletPayController.java

@@ -56,7 +56,7 @@ public class AppletPayController {
         request.setMchid(wechatPayConfig.getMchId());
         request.setDescription(payDto.getDescription());
         request.setNotifyUrl(wechatPayConfig.getPayNoticeUrl());
-        request.setOutTradeNo(orderPayInfo.getPayId().toString());
+        request.setOutTradeNo(payDto.getOutTradeNo());
 
         Payer payer = new Payer();
         payer.setOpenid(WechatPayUtil.getOpenId(wechatPayConfig.getAppId(), wechatPayConfig.getAppSecret(), payDto.getCode()));

src/main/java/com/jwl/driver/server/controller/TdMemberController.java

@@ -5,7 +5,6 @@ import com.jwl.driver.server.dto.MemberQueryDto;
 import com.jwl.driver.server.exception.BusinessException;
 import com.jwl.driver.server.response.BaseResponse;
 import com.jwl.driver.server.service.ITdMemberService;
-import com.jwl.driver.server.util.SecurityUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -47,6 +46,6 @@ public class TdMemberController {
     @PostMapping("/queryUserMember")
     public BaseResponse queryUserMember(@RequestBody MemberQueryDto queryDto) {
         log.info("获取用户会员列表======>queryDto:{}", queryDto);
-        return BaseResponse.success(memberService.queryUserMember(queryDto, SecurityUtil.getUserId()));
+        return BaseResponse.success(memberService.queryUserMember(queryDto));
     }
 }

src/main/java/com/jwl/driver/server/service/ITdMemberService.java

@@ -27,8 +27,7 @@ public interface ITdMemberService extends IService<TdMember> {
     /**
      * 获取用户开通的会员
      * @param queryDto
-     * @param userId
      * @return
      */
-    List<MemberVo> queryUserMember(MemberQueryDto queryDto,Long userId);
+    List<MemberVo> queryUserMember(MemberQueryDto queryDto);
 }

src/main/java/com/jwl/driver/server/service/impl/TdMemberServiceImpl.java

@@ -9,9 +9,7 @@ import com.jwl.driver.server.mapper.TdMemberMapper;
 import com.jwl.driver.server.service.ITdMemberService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jwl.driver.server.util.SecurityUtil;
-import com.jwl.driver.server.util.TokenThreadUtil;
 import com.jwl.driver.server.vo.MemberVo;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -26,7 +24,6 @@ import java.util.stream.Collectors;
  * @since 2023-08-10
  */
 @Service
-@Slf4j
 public class TdMemberServiceImpl extends ServiceImpl<TdMemberMapper, TdMember> implements ITdMemberService {
 
     @Override
@@ -35,15 +32,7 @@ public class TdMemberServiceImpl extends ServiceImpl<TdMemberMapper, TdMember> i
         List<MemberVo> resultList = new ArrayList<>();
 
         //获取用户已开通且未到期的会员（即使该会员已不售卖了）
-        List<MemberVo> userMemberList = new ArrayList<>();
+        List<MemberVo> userMemberList = queryUserMember(queryDto);
-        try {
-            if (StrUtil.isNotBlank(TokenThreadUtil.getToken())){
-                userMemberList = queryUserMember(queryDto,SecurityUtil.getUserId());
-            }
-        }catch (Exception e){
-            log.info("===================>用户没有登录");
-        }
-
         Map<Integer, MemberVo> userMemberMap = userMemberList.stream().collect(Collectors.toMap(MemberVo::getMemberId, v -> v, (v1, v2) -> v1));
 
         //将用户购买的已停售但未过期的会员放在最前面
@@ -68,8 +57,8 @@ public class TdMemberServiceImpl extends ServiceImpl<TdMemberMapper, TdMember> i
     }
 
     @Override
-    public List<MemberVo> queryUserMember(MemberQueryDto queryDto,Long userId) {
+    public List<MemberVo> queryUserMember(MemberQueryDto queryDto) {
-        return this.getBaseMapper().queryUserMember(queryDto,userId);
+        return this.getBaseMapper().queryUserMember(queryDto,SecurityUtil.getUserId());
     }
 
 }

src/main/resources/application.yml

@@ -50,7 +50,6 @@ driver:
       - /tdQuestion/queryQuestion
       - /tdQuestion/getTestQuestion
       - /tdQuestion/questionCategory
-      - /tdMember/queryMember
 
     # 需要权限校验url集合
     needAuthEndPoints: