9 changed files with 18 additions and 49 deletions
--- a/src/main/java/com/jwl/driver/server/controller/AppletPayController.java
+++ b/src/main/java/com/jwl/driver/server/controller/AppletPayController.java
@ -1,9 +1,7 @@
 package com.jwl.driver.server.controller;

 import com.jwl.driver.server.config.WechatPayConfig;
-import com.jwl.driver.server.entity.OrderPayInfo;
 import com.jwl.driver.server.response.BaseResponse;
-import com.jwl.driver.server.service.IOrderPayInfoService;
 import com.jwl.driver.server.util.WechatPayUtil;
 import com.jwl.driver.server.vo.AppletPayVo;
 import com.wechat.pay.java.core.Config;
@ -15,14 +13,12 @@ import com.wechat.pay.java.service.payments.model.Transaction;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

 import javax.annotation.Resource;
-import java.math.BigDecimal;

 /**
 * 微信支付小程序 接口
@ -36,27 +32,23 @@ public class AppletPayController {
    @Resource
    private WechatPayConfig wechatPayConfig;

-    @Autowired
-    private IOrderPayInfoService orderPayInfoService;
-
    //生成预支付订单
    @ApiOperation("生成预支付订单")
    @PostMapping("/prepay")
    public BaseResponse createPrepay(@RequestBody AppletPayVo payDto){
        // 构建service
        JsapiServiceExtension service = createService();
-        OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(payDto.getMoney(),payDto.getUserId(), payDto.getDescription(), payDto.getOutTradeNo(), "applet");

       // 请求下单参数
        PrepayRequest request = new PrepayRequest();
        Amount amount = new Amount();
-        amount.setTotal(Integer.valueOf((payDto.getMoney().multiply(new BigDecimal("100")).setScale(0).toString())+""));
+        amount.setTotal(Integer.valueOf((payDto.getMoney()*100)+""));
        request.setAmount(amount);
        request.setAppid(wechatPayConfig.getAppId());
        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()));
--- a/src/main/java/com/jwl/driver/server/controller/H5PayController.java
+++ b/src/main/java/com/jwl/driver/server/controller/H5PayController.java
@ -46,7 +46,7 @@ public class H5PayController {
        // 构建service
        H5Service service = createService();
        //在order_pay_info里新增一条数据
-        OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(payVo.getMoney(),payVo.getUserId(),payVo.getDescription(), payVo.getOutTradeNo(), "h5");
+        OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(payVo);

        // 请求下单参数
        PrepayRequest request = new PrepayRequest();
--- a/src/main/java/com/jwl/driver/server/controller/TdMemberController.java
+++ b/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));
    }
 }
--- a/src/main/java/com/jwl/driver/server/service/IOrderPayInfoService.java
+++ b/src/main/java/com/jwl/driver/server/service/IOrderPayInfoService.java
@ -4,8 +4,6 @@ import com.jwl.driver.server.entity.OrderPayInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jwl.driver.server.vo.H5PayVo;

-import java.math.BigDecimal;
-
 /**
 * <p>
 * 支付表 服务类
@ -18,14 +16,10 @@ public interface IOrderPayInfoService extends IService<OrderPayInfo> {

    /**
     * 微信支付创建预支付申请
-     * @param money
-     * @param userIdStr
-     * @param description
-     * @param outTradeNo
-     * @param payType
+     * @param payVo
     * @return
     */
-    OrderPayInfo createOrderPayInfo(BigDecimal money,String userIdStr,String description,String outTradeNo,String payType);
+    OrderPayInfo createOrderPayInfo(H5PayVo payVo);

    /**
     * 支付结果
--- a/src/main/java/com/jwl/driver/server/service/ITdMemberService.java
+++ b/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);
 }
--- a/src/main/java/com/jwl/driver/server/service/impl/OrderPayInfoServiceImpl.java
+++ b/src/main/java/com/jwl/driver/server/service/impl/OrderPayInfoServiceImpl.java
@ -46,24 +46,23 @@ public class OrderPayInfoServiceImpl extends ServiceImpl<OrderPayInfoMapper, Ord
    private Snowflake snowflake;

    @Override
-    public OrderPayInfo createOrderPayInfo(BigDecimal money,String userIdStr,String description,String outTradeNo,String payType) {
-        Long userId = StrUtil.isNotBlank(userIdStr) ? Long.parseLong(userIdStr) : SecurityUtil.getUserId();
+    public OrderPayInfo createOrderPayInfo(H5PayVo payVo) {
+        Long userId = StrUtil.isNotBlank(payVo.getUserId()) ? Long.parseLong(payVo.getUserId()) : SecurityUtil.getUserId();
        TdSysUser user = userService.getById(userId);
        if (Objects.isNull(user)) {
            log.error("数据异常,用户不存在" + userId);
            throw new BusinessException("数据缺失");
        }
-        TdMember member = memberService.getById(Integer.parseInt(outTradeNo));
+        TdMember member = memberService.getById(Integer.parseInt(payVo.getOutTradeNo()));
        if (Objects.isNull(member) || StrUtil.equals(Constants.IS_ACTIVE_FALSE, member.getIsActive())) {
-            log.error("数据异常,会员不存在或者已过期" + outTradeNo);
+            log.error("数据异常,会员不存在或者已过期" + payVo.getOutTradeNo());
            throw new BusinessException("数据缺失");
        }
        OrderPayInfo orderPayInfo = new OrderPayInfo()
                .setPayId(snowflake.nextId())
-                .setMemberId(Integer.parseInt(outTradeNo))
-                .setMoney(money)
+                .setMemberId(Integer.parseInt(payVo.getOutTradeNo()))
+                .setMoney(payVo.getMoney())
                .setPaymentType(Constants.WECHAT_PAY)
-                .setPayType(payType)
                .setDescription(user.getUserName() + "-" + member.getMemberName())
                .setPayStatus(PayStatus.NOT.getValue())
                .setDeleteStatus(0)
--- a/src/main/java/com/jwl/driver/server/service/impl/TdMemberServiceImpl.java
+++ b/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<>();
-        try {
-            if (StrUtil.isNotBlank(TokenThreadUtil.getToken())){
-                userMemberList = queryUserMember(queryDto,SecurityUtil.getUserId());
-            }
-        }catch (Exception e){
-            log.info("===================>用户没有登录");
-        }
-
+        List<MemberVo> userMemberList = queryUserMember(queryDto);
        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) {
-        return this.getBaseMapper().queryUserMember(queryDto,userId);
+    public List<MemberVo> queryUserMember(MemberQueryDto queryDto) {
+        return this.getBaseMapper().queryUserMember(queryDto,SecurityUtil.getUserId());
    }

 }
--- a/src/main/java/com/jwl/driver/server/vo/AppletPayVo.java
+++ b/src/main/java/com/jwl/driver/server/vo/AppletPayVo.java
@ -4,14 +4,12 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import java.math.BigDecimal;
-
@Data
@ApiModel("微信支付")
 public class AppletPayVo {

    @ApiModelProperty("支付金额")
-    private BigDecimal money;//金额
+    private Double money;//金额

    @ApiModelProperty("小程序端 获取的code")
    private String code;//小程序端 获取的code
@ -25,4 +23,4 @@ public class AppletPayVo {
    @ApiModelProperty("商户系统的订单号")
    private String outTradeNo;

-}
+}
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@ -50,7 +50,6 @@ driver:
      - /tdQuestion/queryQuestion
      - /tdQuestion/getTestQuestion
      - /tdQuestion/questionCategory
-      - /tdMember/queryMember

    # 需要权限校验url集合
    needAuthEndPoints: