From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 149 +++++++++++++++++++++++++++++--------------------
1 files changed, 88 insertions(+), 61 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index ccf0e10..82db581 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -31,6 +31,7 @@
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;
@@ -43,7 +44,7 @@
/**
* <p>
- * 服务实现类
+ * 服务实现类
* </p>
*
* @author jqs
@@ -77,7 +78,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==";//支付宝开发者应用私钥
@@ -89,6 +89,7 @@
/**
* 获取赛事列表
+ *
* @param content
* @param registerCondition
* @param heat
@@ -99,8 +100,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);
}
@@ -110,6 +111,7 @@
/**
* 获取赛事详情
+ *
* @param uid
* @param id
* @return
@@ -126,13 +128,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();
@@ -144,14 +146,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);
}
@@ -186,12 +188,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);
@@ -206,7 +208,7 @@
participant.add(participantVo);
}
competitionInfo.setParticipant(participant);
- if(one.getPayStatus() == 3){
+ if (one.getPayStatus() == 3) {
competitionInfo.setStatus(4);
}
}
@@ -214,9 +216,9 @@
}
-
/**
* 赛事报名
+ *
* @param uid
* @param paymentCompetitionVo
* @return
@@ -227,22 +229,34 @@
AppUser appUser = appUserClient.queryAppUser(uid);
String[] split = paymentCompetitionVo.getIds().split(";");
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));
+ }
+
+
+// int competitionId = userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("competitionId", paymentCompetitionVo.getId()));
+ if ((competitionId + split.length) > competition.getApplicantsNumber()) {
return ResultUtil.error("报名人数超过最大限制");
}
BigDecimal money = null;
- if(paymentCompetitionVo.getPayType() == 1 || paymentCompetitionVo.getPayType() == 2){
+ 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() == 3){//玩湃币
+ 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 (money.compareTo(new BigDecimal(appUser.getPlayPaiCoins())) > 0) {
+ return new ResultUtil(2, "报名失败，玩湃币不足，请充值");
}
}
- if(paymentCompetitionVo.getPayType() == 4){//课程
+ 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);
@@ -252,8 +266,8 @@
// }
// 2.0
Integer integer = coursePackagePaymentClient.queryResidueClassHourById(paymentCompetitionVo.getCoursePaymentId());
- if(new BigDecimal(integer).compareTo(new BigDecimal(competition.getClassPrice())) < 0){
- return new ResultUtil(3,"剩余课时不足，无法完成支付。");
+ if (new BigDecimal(integer).compareTo(new BigDecimal(competition.getClassPrice())) < 0) {
+ return new ResultUtil(3, "剩余课时不足，无法完成支付。");
}
}
@@ -281,14 +295,14 @@
userCompetition.setInsertTime(new Date());
userCompetitionService.save(userCompetition);
}
- if(paymentCompetitionVo.getPayType() == 1){//微信
+ if (paymentCompetitionVo.getPayType() == 1) {//微信
return weChatPaymentCompetition(code, money);
}
- if(paymentCompetitionVo.getPayType() == 2){//支付宝
+ if (paymentCompetitionVo.getPayType() == 2) {//支付宝
return aliPaymentCompetition(code, money);
}
- if(paymentCompetitionVo.getPayType() == 3){//玩湃币
+ if (paymentCompetitionVo.getPayType() == 3) {//玩湃币
appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() - money.intValue());
appUserClient.updateAppUser(appUser);
@@ -302,7 +316,7 @@
// competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
this.updateById(competition);
}
- if(paymentCompetitionVo.getPayType() == 4){//课程
+ if (paymentCompetitionVo.getPayType() == 4) {//课程
for (String s : split) {
// Participant participant = participantService.getById(s);
// Student student = studentClient.queryStudentByPhone(participant.getPhone());
@@ -330,30 +344,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—转入退款，
@@ -366,13 +381,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());
@@ -380,12 +395,12 @@
paymentCompetitionService.updateById(paymentCompetition);
break;
}
- if("USERPAYING".equals(s)){
+ if ("USERPAYING".equals(s)) {
num++;
}
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -397,30 +412,31 @@
/**
* 赛事支付宝支付
+ *
* @param code
* @param money
* @return
* @throws Exception
*/
- public ResultUtil aliPaymentCompetition(String code, BigDecimal money) 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){
+ 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（未付款交易超时关闭，或支付完成后全额退款）、
@@ -433,13 +449,13 @@
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());
@@ -447,16 +463,16 @@
paymentCompetitionService.updateById(paymentCompetition);
//分账
- moneyOut(tradeNo,tradeNo);
+ moneyOut(tradeNo, tradeNo);
break;
}
- if("WAIT_BUYER_PAY".equals(s)){
+ if ("WAIT_BUYER_PAY".equals(s)) {
num++;
}
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -470,7 +486,8 @@
@Autowired
private CompetitionService competitionService;
- public void moneyOut(String outNum,String tradeNo) throws AlipayApiException {
+
+ public void moneyOut(String outNum, String tradeNo) 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();
@@ -491,15 +508,14 @@
" \"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("调用失败");
}
-
// RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
@@ -517,8 +533,7 @@
Competition byId1 = competitionService.getById(code.getCompetitionId());
// TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());
- OperatorUser operatorUser = storeClient.queryByStoreId(byId1.getOperatorId());
-
+ OperatorUser operatorUser = storeClient.queryByStoreId(byId1.getOperatorId());
// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
@@ -528,8 +543,6 @@
// stores.add(paymentCompetitions);
// stores.add(siteBookings);
// OperatorUser operatorUser = siteClient.queryOperator(stores);
-
-
OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
@@ -547,7 +560,7 @@
AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
- if(response1.isSuccess()){
+ if (response1.isSuccess()) {
System.out.println("调用成功");
} else {
System.out.println("调用失败");
@@ -557,11 +570,25 @@
/**
* 定时任务修改赛事状态
*/
+
@Override
public void taskSetStatus() {
this.baseMapper.taskSetStatusStart();
this.baseMapper.taskSetStatusEnd();
- this.baseMapper.deleteTenMinutes();
+
+ Date currentTime = new Date();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(currentTime);
+ calendar.add(Calendar.MINUTE, -10);
+ Date tenMinutesAgo = calendar.getTime();
+ List<PaymentCompetition> payStatus = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().eq("payStatus", 1).le("insertTime", tenMinutesAgo));
+ List<Long> pays = new ArrayList<>();
+ for (PaymentCompetition status : payStatus) {
+ pays.add(status.getId());
+ }
+ if (!pays.isEmpty()) {
+ this.baseMapper.deleteTenMinutes(pays);
+ }
}
@Override
@@ -570,7 +597,7 @@
// 获取门店id 找出符合这些门店的课包
String storeId = competition.getStoreId();
- List<PayCourseRes> list = coursePackagePaymentClient.paymentCompetitionCourseList(uid+"_"+storeId);
+ List<PayCourseRes> list = coursePackagePaymentClient.paymentCompetitionCourseList(uid + "_" + storeId);
return ResultUtil.success(list);
}
}
--
Gitblit v1.7.1