玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-09-24 61bbd595ee2bc3c67b40878894dcc07174c6eea6 
 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java


@@ -25,16 +25,14 @@


import com.dsh.competition.service.IParticipantService;


import com.dsh.competition.service.IPaymentCompetitionService;


import com.dsh.competition.service.UserCompetitionService;


import com.dsh.competition.util.PayMoneyUtil;


import com.dsh.competition.util.ResultUtil;


import com.dsh.competition.util.TokenUtil;


import com.dsh.competition.util.ToolUtil;


import com.dsh.competition.util.*;


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;




import lombok.Synchronized;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.util.StringUtils;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


@@ -42,6 +40,7 @@


import javax.servlet.http.HttpServletResponse;


import java.io.OutputStream;


import java.io.PrintWriter;


import java.math.BigDecimal;


import java.text.DateFormat;


import java.text.SimpleDateFormat;


import java.util.*;


@@ -110,11 +109,12 @@


        // 获取到赛事id集合 去重


        List<Integer> collect = comIds.stream().distinct().collect(Collectors.toList());


        // 根据赛事id 查询赛事支付记录 获取用户ids


        if (collect.size() == 0) {


        if (collect.isEmpty()) {


            return new ArrayList<>();


        } else {


            List<Integer> userIds = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()


                    .in("competitionId", collect)).stream()


                    .in("competitionId", collect)


                            .eq("payStatus",2)).stream()


                    .map(PaymentCompetition::getAppUserId).collect(Collectors.toList());


            return userIds;


        }


@@ -133,6 +133,20 @@


            List<Integer> operatorId = cttService.list(new QueryWrapper<Competition>()


                    .eq("operatorId", operatorId1)).stream().map(Competition::getId).collect(Collectors.toList());


            query.setUserIds(operatorId);


        } else if (query.getStoreId() != null) {


            List<Competition> list = cttService.list(new QueryWrapper<Competition>());


            List<Integer> integers = new ArrayList<>();


            for (Competition competition : list) {


                for (String s : competition.getStoreId().split(",")) {


                    if (s.equals(""+query.getStoreId())){


                        integers.add(competition.getId());


                    }


                }


            }


            if (integers.isEmpty()){


                integers.add(-1);


            }


            query.setUserIds(integers);


        }


        List<PaymentCompetition> paymentCompetitions = paymentCompetitionService.listAll(query);


        List<PaymentCompetition> result = new ArrayList<>();


@@ -789,6 +803,29 @@




                String payOrderNo = paymentCompetition.getPayOrderNo();


                if (paymentCompetition.getPayType() == 1) {//微信支付


                    if (StringUtils.hasLength(paymentCompetition.getFenzhangNo())){


                        // 是分账订单 如果分账金额不为0 那么回退分账金额


                        if (paymentCompetition.getFenzhangAmount()!=null && paymentCompetition.getFenzhangAmount().compareTo(BigDecimal.ZERO)>0){


                            String randomCode = UUIDUtil.getRandomCode(16);


                            String randomCode1 = UUIDUtil.getRandomCode(16);


                            if (competition.getOperatorId()!=null && competition.getOperatorId()!=0){


                                // 微信商户号


                                String s2 =storeClient.getmerchantNumberByOperatorId(competition.getOperatorId());


                                ResultUtil resultUtil = payMoneyUtil.fenzhangRefund(paymentCompetition.getFenzhangNo(), paymentCompetition.getFenzhangAmount(), s2, randomCode, randomCode1);


                                if (!resultUtil.getCode().equals(500)){


                                    System.err.println("分账回退失败 原因是:"+resultUtil.getMsg());


                                }else{


                                    paymentCompetition.setFenzhangRefundNo(resultUtil.getMsg());


                                    paymentCompetitionService.updateById(paymentCompetition);


                                }




                            }


                        }


                    }










                    Map<String, String> map = payMoneyUtil.wxRefund(payOrderNo, code, amount.toString(), amount.toString(),


                            "/base/competition/weChatCancelPaymentCompetitionCallback");


                    String return_code = map.get("return_code");