xiaoyong931011
2023-07-26 6107adebd5fa13f30b78ca965dbff1cd3c1745bf
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -8,6 +8,7 @@
import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.dto.ApiRechargeWalletDto;
import cc.mrbird.febs.mall.dto.RechargeWalletMessageSendDto;
import cc.mrbird.febs.mall.dto.WxUpCodeDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
@@ -15,6 +16,7 @@
import cc.mrbird.febs.pay.model.*;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.pay.util.WechatEventUtil;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.StrFormatter;
@@ -65,7 +67,13 @@
    private MallMemberWithdrawMapper mallMemberWithdrawMapper;
    private final IMallMoneyFlowService mallMoneyFlowService;
    @Autowired
    WechatEventUtil wechatEventUtil;
    @Autowired
    RedisUtils redisUtils;
    @Autowired
    private MallGoodsMapper mallGoodsMapper;
    @Autowired
    private MallTeamLeaderMapper mallTeamLeaderMapper;
    private final SpringContextHolder springContextHolder;
@@ -79,8 +87,12 @@
        String productNames = "小程序充值";
        MallMember mallMember = mallMemberMapper.selectById(apiRechargeWalletDto.getMemberId());
        String rechargeNo = apiRechargeWalletDto.getRechargeNo();
        Long agentApplyId = apiRechargeWalletDto.getAgentApplyId() == null ? 0L : apiRechargeWalletDto.getAgentApplyId();
        Boolean debug = xcxProperties.getDebug();
        String attrStr = "{'rechargeNo':"+rechargeNo+",'memberId':"+mallMember.getId()+",'type':"+apiRechargeWalletDto.getType()+"}";
        String attrStr = "{'rechargeNo':"+rechargeNo
                +",'memberId':"+mallMember.getId()
                +",'agentApplyId':"+agentApplyId
                +",'type':"+apiRechargeWalletDto.getType()+"}";
        if (debug) {
            payData = weixinServiceUtil.createRechargeWallet("[测试]" + productNames, rechargeNo,
                    1, mallMember.getOpenId(), attrStr);
@@ -179,6 +191,32 @@
//            return new FebsResponse().fail().data("获取二维码失败");
//        }
        return new FebsResponse().success();
    }
    @Override
    public FebsResponse getUpCode(WxUpCodeDto wxUpCodeDto) {
        String qRcode = null;
        if(ObjectUtil.isEmpty(wxUpCodeDto.getInviteId())){
            return new FebsResponse().fail().message("邀请码不存在");
        }
        String inviteId = wxUpCodeDto.getInviteId();
        MallMember mallMember = mallMemberMapper.selectInfoByInviteId(inviteId);
        if(ObjectUtil.isEmpty(mallMember)){
            return new FebsResponse().fail().message("邀请码不存在");
        }
        String sessionKey = mallMember.getSessionKey();
        if(ObjectUtil.isEmpty(sessionKey)){
            String ticket = wechatEventUtil.getTicket(inviteId);
            if(StrUtil.isEmpty(ticket)){
                return new FebsResponse().fail().message("临时带参二维码ticket失败");
            }
            qRcode = wechatEventUtil.getQRcode(ticket);
            mallMember.setSessionKey(qRcode);
            mallMemberMapper.updateById(mallMember);
        }else{
            qRcode = sessionKey;
        }
        return new FebsResponse().success().data(qRcode);
    }
    @Override
@@ -285,11 +323,6 @@
        }
        return wxTemplates;
    }
    @Autowired
    private MallGoodsMapper mallGoodsMapper;
    @Autowired
    private MallTeamLeaderMapper mallTeamLeaderMapper;
    @Override
    public FebsResponse generateQrCode(WxGenerateQrCodeDto wxGenerateQrCodeDto) {