更新bug修改

puzhibing

2024-02-05 640ff18d2d7f4be02ddb7f8f75e899f05545eb98

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java

@@ -1,5 +1,8 @@
package com.dsh.competition.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.UuidUtils;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
@@ -31,7 +34,6 @@
import com.dsh.competition.service.IPaymentCompetitionService;
import com.dsh.competition.service.UserCompetitionService;
import com.dsh.competition.util.*;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -44,7 +46,7 @@

/**
 * <p>
 *  服务实现类
 * 服务实现类
 * </p>
 *
 * @author jqs
@@ -78,7 +80,6 @@
    private PayMoneyUtil payMoneyUtil;



    private String aliAppid = "2021004105665036";//支付宝appid

    private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
@@ -86,10 +87,11 @@
    private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAouYvZ1v4RiydwNOnGcU0Hb4hQu0x6XUooaE2Bi6/atNOobtFdunnATGP6OMOW7yF9DpP8qH5mbFXAiaQD721y/7qlayI50UcV4mngRU4ZcaAVE3bp721Eg2H85RISa+Tb1CiOh+pc9p4l5UBseKsvB2ruHHForfZDPI8FL7AVUKBYCQPsa4zL6KAO2C6KULaTg/lCa+bYQKU0n9ca569VtdsqJUyxB9eSZjVd+9nKl62FLqp2NELGj7cXqiVBgDnBnVS5ZUO3mrBM5z/AxQbw3RwE3JqdkhzUA1BFjejAlT2zIGNOjUFagF8ao0wGElYfuk0bum6Hz5qWAt02QdNNwIDAQAB";//支付宝应用公钥

    private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥

    private String smid = "2088330203191220";//平台支付宝商户号

    /**
     * 获取赛事列表
     *
     * @param content
     * @param registerCondition
     * @param heat
@@ -100,8 +102,8 @@
        List<CompetitionListVo> competitionListVos = this.baseMapper.queryCompetitionList(cityCode, content, registerCondition, heat);

        for (CompetitionListVo competitionListVo : competitionListVos) {
            Integer counts =  this.baseMapper.counts(competitionListVo.getId());
            competitionListVo.setHeat(competitionListVo.getHeat()+counts);
            Integer counts = this.baseMapper.counts(competitionListVo.getId());
            competitionListVo.setHeat(competitionListVo.getHeat() + counts);
        }


@@ -111,6 +113,7 @@

    /**
     * 获取赛事详情
     *
     * @param uid
     * @param id
     * @return
@@ -127,13 +130,13 @@
        competitionInfo.setRegisterCondition(competition.getRegisterCondition());

        // 2.0
        ArrayList<Map<String,Object>> objects = new ArrayList<>();
        if(null != competition.getStoreId()){
        ArrayList<Map<String, Object>> objects = new ArrayList<>();
        if (null != competition.getStoreId()) {
            String storeId = competition.getStoreId();
            for (String s : storeId.split(",")) {
                HashMap<String, Object> map = new HashMap<>();
                Store store = storeClient.queryStoreById(Integer.valueOf(s));
                map.put("name",store.getName());
                map.put("name", store.getName());


                String str = store.getAddress();
@@ -145,14 +148,14 @@
                // 去掉第一个“区”及之前的字符串
                str = str.substring(str.indexOf("区") + 1);

                map.put("address",str);
                map.put("storeLon",store.getLon());
                map.put("storeLat",store.getLat());
                map.put("storeCoverDrawing",store.getCoverDrawing());
                if(ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)){
                map.put("address", str);
                map.put("storeLon", store.getLon());
                map.put("storeLat", store.getLat());
                map.put("storeCoverDrawing", store.getCoverDrawing());
                if (ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)) {
                    Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
                    double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                    map.put("distance",wgs84);
                    map.put("distance", wgs84);
                }
                objects.add(map);
            }
@@ -187,12 +190,12 @@
        competitionInfo.setApply(0);
        competitionInfo.setStatus(competition.getStatus());
        PaymentCompetition one = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("competitionId", id).eq("appUserId", uid).ne("payStatus", 1).orderByDesc("insertTime").last(" limit 1"));
        if(null != one){
        if (null != one) {
            competitionInfo.setApply(1);
            List<ParticipantVo> participant = new ArrayList<>();
            List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", one.getId()));
            List<Integer> collect = list.stream().map(UserCompetition::getParticipantId).collect(Collectors.toList());
            if(collect.size()==0){
            if (collect.size() == 0) {
                collect.add(-1);
            }
            List<Participant> participants = participantService.listByIds(collect);
@@ -207,7 +210,7 @@
                participant.add(participantVo);
            }
            competitionInfo.setParticipant(participant);
            if(one.getPayStatus() == 3){
            if (one.getPayStatus() == 3) {
                competitionInfo.setStatus(4);
            }
        }
@@ -215,9 +218,9 @@
    }



    /**
     * 赛事报名
     *
     * @param uid
     * @param paymentCompetitionVo
     * @return
@@ -226,38 +229,39 @@
    @Override
    public ResultUtil paymentCompetition(Integer uid, PaymentCompetitionVo paymentCompetitionVo) throws Exception {
        AppUser appUser = appUserClient.queryAppUser(uid);
        String[] split = paymentCompetitionVo.getIds().split(";");
        JSONArray jsonArray = JSON.parseArray(paymentCompetitionVo.getIds());
        Competition competition = this.getById(paymentCompetitionVo.getId());

        int competitionId = userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("competitionId", paymentCompetitionVo.getId()));
        if ((competitionId+split.length)>competition.getApplicantsNumber()){
        List<PaymentCompetition> list = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().eq("competitionId", paymentCompetitionVo.getId()).ne("payStatus", 3));
        List<Long> pays = new ArrayList<>();
        for (PaymentCompetition paymentCompetition : list) {
            pays.add(paymentCompetition.getId());
        }

        int competitionId = 0;
        if (!pays.isEmpty()) {
            competitionId = userCompetitionService.count(new QueryWrapper<UserCompetition>().in("paymentCompetitionId", pays));
        }


        if ((competitionId + jsonArray.size()) > competition.getApplicantsNumber()) {
            return ResultUtil.error("报名人数超过最大限制");
        }
        BigDecimal money = null;
        if(paymentCompetitionVo.getPayType() == 1 || paymentCompetitionVo.getPayType() == 2){
            money = new BigDecimal(competition.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
        if (paymentCompetitionVo.getPayType() == 1 || paymentCompetitionVo.getPayType() == 2) {
            money = new BigDecimal(competition.getCashPrice()).multiply(new BigDecimal(jsonArray.size())).setScale(2, RoundingMode.HALF_EVEN);
        }
        if(paymentCompetitionVo.getPayType() == 3){//玩湃币
            money = new BigDecimal(competition.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
            if(money.compareTo(new BigDecimal(appUser.getPlayPaiCoins())) > 0){

                return new ResultUtil(2,"报名失败，玩湃币不足，请充值");
        if (paymentCompetitionVo.getPayType() == 3) {//玩湃币
            money = new BigDecimal(competition.getPlayPaiCoin()).multiply(new BigDecimal(jsonArray.size())).setScale(2, RoundingMode.HALF_EVEN);
            if (money.compareTo(new BigDecimal(appUser.getPlayPaiCoins())) > 0) {
                return new ResultUtil(2, "报名失败，玩湃币不足，请充值");
            }
        }
        if(paymentCompetitionVo.getPayType() == 4){//课程
            money = new BigDecimal(competition.getClassPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
            for (String s : split) {
//                Participant participant = participantService.getById(s);
//                Student student = studentClient.queryStudentByPhone(participant.getPhone());
//                if(null == student){
//                    return ResultUtil.error(participant.getName() + "不是学员，无法使用课时支付。");
//                }
                // 2.0
                Integer integer = coursePackagePaymentClient.queryResidueClassHourById(paymentCompetitionVo.getCoursePaymentId());
                if(new BigDecimal(integer).compareTo(new BigDecimal(competition.getClassPrice())) < 0){
                    return new ResultUtil(3,"剩余课时不足，无法完成支付。");

                }
        if (paymentCompetitionVo.getPayType() == 4) {//课程
            money = new BigDecimal(competition.getClassPrice()).multiply(new BigDecimal(jsonArray.size())).setScale(2, RoundingMode.HALF_EVEN);
            Integer integer = coursePackagePaymentClient.queryResidueClassHourById(paymentCompetitionVo.getCoursePaymentId());
            if (new BigDecimal(integer).compareTo(money) < 0) {
                return new ResultUtil(3, "剩余课时不足，无法完成支付。");
            }
        }

@@ -274,23 +278,36 @@
        paymentCompetition.setInsertTime(new Date());
        paymentCompetitionService.save(paymentCompetition);

        for (String s : split) {
        for (int i = 0; i < jsonArray.size(); i++) {
            JSONObject jsonObject = jsonArray.getJSONObject(i);
            Integer id = jsonObject.getInteger("id");
            Integer isStudent = jsonObject.getInteger("isStudent");
            UserCompetition userCompetition = new UserCompetition();
            userCompetition.setAppUserId(uid);
            userCompetition.setCompetitionId(paymentCompetitionVo.getId());
            userCompetition.setParticipantId(Integer.valueOf(s));
            userCompetition.setParticipantId(id);
            userCompetition.setParticipantType(isStudent == 0 ? 2 : 1);
            userCompetition.setPaymentCompetitionId(paymentCompetition.getId());
            userCompetition.setInsertTime(new Date());
            userCompetitionService.save(userCompetition);
        }
        if(paymentCompetitionVo.getPayType() == 1){//微信
        if (paymentCompetitionVo.getPayType() == 1) {//微信
            return weChatPaymentCompetition(code, money);
        }

        if(paymentCompetitionVo.getPayType() == 2){//支付宝
            return aliPaymentCompetition(code, money);
        if (paymentCompetitionVo.getPayType() == 2) {//支付宝
            // 判断当前赛事属于哪个运营商
            Competition byId = competitionService.getById(paymentCompetitionVo.getId());
            Integer operatorId = byId.getOperatorId();
            if (operatorId == null ){
                // 说明是平台
                return aliPaymentCompetition(smid,code, money);
            }
            // 获取该运营商的商户号
            String smid = storeClient.getSMIDByOperatorId(operatorId);
            return aliPaymentCompetition(smid,code, money);
        }
        if(paymentCompetitionVo.getPayType() == 3){//玩湃币
        if (paymentCompetitionVo.getPayType() == 3) {//玩湃币
            appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() - money.intValue());
            appUserClient.updateAppUser(appUser);

@@ -301,21 +318,26 @@
            paymentCompetition.setPayOrderNo("");
            paymentCompetitionService.updateById(paymentCompetition);

//            competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
            this.updateById(competition);
        }
        if(paymentCompetitionVo.getPayType() == 4){//课程
            for (String s : split) {
//                Participant participant = participantService.getById(s);
//                Student student = studentClient.queryStudentByPhone(participant.getPhone());
        if (paymentCompetitionVo.getPayType() == 4) {//课程
            for (int i = 0; i < jsonArray.size(); i++) {
                JSONObject jsonObject = jsonArray.getJSONObject(i);
                Integer id = jsonObject.getInteger("id");
                Integer isStudent = jsonObject.getInteger("isStudent");
                if(isStudent == 0){
                    continue;
                }
                //扣减课时
                PaymentDeductionClassHour paymentDeductionClassHour = new PaymentDeductionClassHour();
                paymentDeductionClassHour.setId(Integer.valueOf(s));
                paymentDeductionClassHour.setId(id);
                paymentDeductionClassHour.setClassHour(competition.getClassPrice());
                paymentDeductionClassHour.setCode(code);
                paymentDeductionClassHour.setCourseId(paymentCompetitionVo.getCoursePaymentId());
                paymentDeductionClassHour.setUid(uid);
                coursePackagePaymentClient.paymentDeductionClassHour(paymentDeductionClassHour);
            }

            paymentCompetition = paymentCompetitionService.getById(paymentCompetition.getId());
            paymentCompetition.setAppUserId(null);
            paymentCompetition.setPayStatus(2);
@@ -332,30 +354,31 @@

    /**
     * 赛事微信支付
     *
     * @param code
     * @param money
     * @return
     * @throws Exception
     */
    public ResultUtil weChatPaymentCompetition(String code, BigDecimal money) throws Exception{
    public ResultUtil weChatPaymentCompetition(String code, BigDecimal money) throws Exception {
        ResultUtil weixinpay = payMoneyUtil.weixinpay("报名赛事", "", code, money.toString(), "/base/competition/weChatPaymentCompetitionCallback", "APP", "");
        if(weixinpay.getCode() == 200){
        if (weixinpay.getCode() == 200) {
            new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
                        int num = 1;
                        int wait = 0;
                        while (num <= 10){
                        while (num <= 10) {
                            int min = 5000;
                            wait += (min * num);
                            Thread.sleep(wait);
                            PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 1));
                            if(paymentCompetition.getPayStatus() == 2){
                            if (paymentCompetition.getPayStatus() == 2) {
                                break;
                            }
                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
                            if(resultUtil.getCode() == 200 && paymentCompetition.getPayStatus() == 1){
                            if (resultUtil.getCode() == 200 && paymentCompetition.getPayStatus() == 1) {
                                /**
                                 * SUCCESS—支付成功，
                                 * REFUND—转入退款，
@@ -368,13 +391,13 @@
                                Map<String, String> data1 = resultUtil.getData();
                                String s = data1.get("trade_state");
                                String transaction_id = data1.get("transaction_id");
                                if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
                                if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
                                    paymentCompetition.setAppUserId(null);
                                    paymentCompetition.setState(3);
                                    userCompetitionService.remove(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
                                    break;
                                }
                                if("SUCCESS".equals(s)){
                                if ("SUCCESS".equals(s)) {
                                    paymentCompetition.setAppUserId(null);
                                    paymentCompetition.setPayStatus(2);
                                    paymentCompetition.setPayTime(new Date());
@@ -382,12 +405,12 @@
                                    paymentCompetitionService.updateById(paymentCompetition);
                                    break;
                                }
                                if("USERPAYING".equals(s)){
                                if ("USERPAYING".equals(s)) {
                                    num++;
                                }
                            }
                        }
                    }catch (Exception e){
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
@@ -399,30 +422,32 @@

    /**
     * 赛事支付宝支付
     *
     * @param code
     * @param money
     * @return
     * @throws Exception
     */
    public ResultUtil aliPaymentCompetition(String code, BigDecimal money) throws Exception{
        ResultUtil alipay = payMoneyUtil.alipay("报名赛事", "", "", code, money.toString(), "/base/competition/aliPaymentCompetitionCallback");
        if(alipay.getCode() == 200){
    public ResultUtil aliPaymentCompetition(String smid,String code, BigDecimal money) throws Exception {
        ResultUtil alipay = payMoneyUtil.alipay
                (smid,"报名赛事", "", "", code, money.toString(), "/base/competition/aliPaymentCompetitionCallback");
        if (alipay.getCode() == 200) {
            new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
                        int num = 1;
                        int wait = 0;
                        while (num <= 10){
                        while (num <= 10) {
                            int min = 5000;
                            wait += (min * num);
                            Thread.sleep(wait);
                            PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 2));
                            if(paymentCompetition.getPayStatus() == 2){
                            if (paymentCompetition.getPayStatus() == 2) {
                                break;
                            }
                            AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
                            if(resultUtil.getCode().equals("10000") && paymentCompetition.getPayStatus() == 1){
                            if (resultUtil.getCode().equals("10000") && paymentCompetition.getPayStatus() == 1) {
                                /**
                                 * WAIT_BUYER_PAY（交易创建，等待买家付款）、
                                 * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
@@ -435,30 +460,31 @@
                                String tradeNo = resultUtil.getTradeNo();
                                String s = resultUtil.getTradeStatus();

                                if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
                                if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
                                    paymentCompetition.setAppUserId(null);
                                    paymentCompetition.setState(3);
                                    userCompetitionService.remove(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));

                                    break;
                                }
                                if("TRADE_SUCCESS".equals(s)){
                                if ("TRADE_SUCCESS".equals(s)) {
                                    paymentCompetition.setAppUserId(null);
                                    paymentCompetition.setPayStatus(2);
                                    paymentCompetition.setPayTime(new Date());
                                    paymentCompetition.setPayOrderNo(tradeNo);
                                    paymentCompetitionService.updateById(paymentCompetition);

                                    // 结算资金到商户账号
                                    payMoneyUtil.confirm(smid,code,tradeNo,money.toString());
                                    //分账
                                    moneyOut(tradeNo,tradeNo);

//                                    moneyOut(tradeNo, tradeNo,code);
                                    break;
                                }
                                if("WAIT_BUYER_PAY".equals(s)){
                                if ("WAIT_BUYER_PAY".equals(s)) {
                                    num++;
                                }
                            }
                        }
                    }catch (Exception e){
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
@@ -472,14 +498,15 @@

    @Autowired
    private CompetitionService competitionService;
    public void moneyOut(String outNum,String tradeNo) throws AlipayApiException {

    public void moneyOut(String outNum, String tradeNo,String code) throws AlipayApiException {
        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
        AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
        AlipayTradeOrderSettleModel model = new AlipayTradeOrderSettleModel();
        model.setOutRequestNo(outNum);
        model.setTradeNo(tradeNo);
        List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
//


        AlipayTradeRoyaltyRelationBindRequest request1 = new AlipayTradeRoyaltyRelationBindRequest();

@@ -493,10 +520,10 @@
                "      \"memo\":\"分账给测试商户\"," +
                "    }" +
                "  ]," +
                "  \"out_request_no\":\""+tradeNo+"\"" +
                "  \"out_request_no\":\"" + tradeNo + "\"" +
                "}");
        AlipayTradeRoyaltyRelationBindResponse response = alipayClient.execute(request1);
        if(response.isSuccess()){
        if (response.isSuccess()) {
            System.out.println("绑定调用成功");
        } else {
            System.out.println("调用失败");
@@ -504,32 +531,11 @@



//        RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
//        royaltyDetailInfos1.setTransOutType("loginName");
//        royaltyDetailInfos1.setTransOut("happysports@weparklife.com");
//        royaltyDetailInfos1.setTransInType("loginName");
//        royaltyDetailInfos1.setTransIn("19522115070");
////        royaltyDetailInfos1.setAmount("0.01");
//        royaltyDetailInfos1.setAmountPercentage("100");

//        royaltyDetailInfos.add(royaltyDetailInfos1);
        PaymentCompetition code1 = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code));
        Competition byId1 = competitionService.getById(code1.getCompetitionId());


        PaymentCompetition code = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", outNum));
        Competition byId1 = competitionService.getById(code.getCompetitionId());

//        TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());
        OperatorUser operatorUser =  storeClient.queryByStoreId(byId1.getOperatorId());



//        Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
//        Integer siteBookings = siteClient.queryByCode(outTradeNo);
//        List<Integer> stores = new ArrayList<>();
//        stores.add(coursePackagePayments);
//        stores.add(paymentCompetitions);
//        stores.add(siteBookings);
//        OperatorUser operatorUser = siteClient.queryOperator(stores);
        OperatorUser operatorUser = storeClient.queryByStoreId(byId1.getOperatorId());



@@ -537,9 +543,12 @@
        OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
        op.setTransOutType("loginName");
        op.setTransOut("happysports@weparklife.com");
        op.setTransInType("userId");
        op.setTransIn(operatorUser.getAlipayNum());
        op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));
        op.setTransInType("loginName");
//        op.setTransInType("userId");
        op.setTransIn("19522115070");
//        op.setTransIn(operatorUser.getAlipayNum());
//        op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));
        op.setAmountPercentage(100L);

        List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
        ops.add(op);
@@ -549,7 +558,7 @@


        AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
        if(response1.isSuccess()){
        if (response1.isSuccess()) {
            System.out.println("调用成功");
        } else {
            System.out.println("调用失败");
@@ -586,7 +595,25 @@
        // 获取门店id  找出符合这些门店的课包
        String storeId = competition.getStoreId();

        List<PayCourseRes> list = coursePackagePaymentClient.paymentCompetitionCourseList(uid+"_"+storeId);
        List<PayCourseRes> list = coursePackagePaymentClient.paymentCompetitionCourseList(uid + "_" + storeId);
        return ResultUtil.success(list);
    }

    @Override
    public void moneyOut() throws AlipayApiException {
        Date date = new Date();
        List<Competition> list = competitionService.list(new QueryWrapper<Competition>().lt("endTime",date).ne("isOut",1));
        List<Integer> coms = new ArrayList<>();
        for (Competition competition : list) {
            coms.add(competition.getId());
            competition.setIsOut(1);
        }
        List<PaymentCompetition> pays = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().in("competitionId", coms));
        for (PaymentCompetition pay : pays) {
            moneyOut(pay.getPayOrderNo(),pay.getPayOrderNo(),pay.getCode());
        }
        competitionService.updateBatchById(list);


    }
}