From b27efc697f2f81e0d0f247a2708e58af52a5df9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 23 十月 2025 15:14:33 +0800
Subject: [PATCH] bug修改,后台新增修改用户积分
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 155 +++++++++++++++++++++------------------------------
1 files changed, 63 insertions(+), 92 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 54ef1fc..0a35d62 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
@@ -22,6 +22,7 @@
import com.dsh.competition.feignclient.account.StudentClient;
import com.dsh.competition.feignclient.account.model.AppUser;
import com.dsh.competition.feignclient.account.model.Student;
+import com.dsh.competition.feignclient.account.model.TStudent;
import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
import com.dsh.competition.feignclient.model.CompetitionUser;
@@ -34,8 +35,10 @@
import com.dsh.competition.service.IPaymentCompetitionService;
import com.dsh.competition.service.UserCompetitionService;
import com.dsh.competition.util.*;
+import com.dsh.competition.util.wx.WxV3PayConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -283,9 +286,23 @@
paymentCompetition.setInsertTime(new Date());
paymentCompetitionService.save(paymentCompetition);
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy");
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
Integer id = jsonObject.getInteger("id");
+
+ TStudent tStudent = studentClient.queryById(id);
+ if(tStudent==null || tStudent.getIdCard()==null || "".equals(tStudent.getIdCard())){
+ return ResultUtil.error("选择人员未进行实名认证!");
+ }
+
+
+ if (competition.getStartAge() > (Integer.valueOf(sdf1.format(new Date())) - Integer.valueOf(sdf1.format(tStudent.getBirthday())))) {
+ return ResultUtil.error("【" + tStudent.getName() + "】年龄不符合要求");
+ }
+ if (competition.getEndAge() < (Integer.valueOf(sdf1.format(new Date())) - Integer.valueOf(sdf1.format(tStudent.getBirthday())))) {
+ return ResultUtil.error("【" + tStudent.getName() + "】年龄不符合要求");
+ }
Integer isStudent = jsonObject.getInteger("isStudent");
UserCompetition userCompetition = new UserCompetition();
userCompetition.setAppUserId(uid);
@@ -298,24 +315,43 @@
}
if (paymentCompetitionVo.getPayType() == 1) {//微信
Competition byId = competitionService.getById(paymentCompetitionVo.getId());
- Integer operatorId = byId.getOperatorId();
- int temp = 0;
+ String[] split = byId.getStoreId().split(",");
+
+ Store store = storeClient.queryStoreById(Integer.valueOf(split[0]));
+ Integer operatorId = store.getOperatorId();
if (operatorId!=null && operatorId != 0){
- temp =1;
+ // 运营商
+ String s = storeClient.getmerchantNumberByOperatorId(operatorId);
+ if(!StringUtils.hasLength(s)){
+ return ResultUtil.error("运营商未配置微信商户号，获取支付失败!");
+ }
+ return payMoneyUtil.weixinpayV3(s,"报名赛事",code,
+ "/base/competition/weChatPaymentCompetitionCallback1",
+ money.toString());
+ }else{
+ return payMoneyUtil.weixinpay("报名赛事", "", code, money.toString(),
+ "/base/competition/weChatPaymentCompetitionCallback", "APP", "");
}
- return weChatPaymentCompetition(code, money,temp,operatorId);
+
}
if (paymentCompetitionVo.getPayType() == 2) {//支付宝
+ String resSmid=smid;
// 判断当前赛事属于哪个运营商
Competition byId = competitionService.getById(paymentCompetitionVo.getId());
- Integer operatorId = byId.getOperatorId();
+ String[] split = byId.getStoreId().split(",");
+
+ Store store = storeClient.queryStoreById(Integer.valueOf(split[0]));
+ Integer operatorId = store.getOperatorId();
if (operatorId == null || operatorId == 0 ){
// 说明是平台
return aliPaymentCompetition(operatorId,smid,code, money);
}
// 获取该运营商的商户号
- String smid = storeClient.getSMIDByOperatorId(operatorId);
+ String smid = storeClient.getmerchantNumberAliByOperatorId(operatorId);
+ if (!StringUtils.hasLength(smid)){
+ return ResultUtil.error("运营商未配置支付宝商户号，获取支付失败!");
+ }
return aliPaymentCompetition(operatorId,smid,code, money);
}
if (paymentCompetitionVo.getPayType() == 3) {//玩湃币
@@ -362,7 +398,6 @@
return ResultUtil.success();
}
-
/**
* 赛事微信支付
*
@@ -372,69 +407,15 @@
* @throws Exception
*/
public ResultUtil weChatPaymentCompetition(String code, BigDecimal money,Integer isFenZhang,Integer operatorId) throws Exception {
- ResultUtil weixinpay = payMoneyUtil.weixinpay("报名赛事"+"-"+isFenZhang, "", code, money.toString(),
+//
+// payMoneyUtil.weixinpayV3(WxV3PayConfig.smidVx,"报名赛事",code,
+// "/base/competition/weChatPaymentCompetitionCallback1",
+// Long.valueOf(money.toString()));
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("报名赛事"+"-"+isFenZhang, "", code, money.toString(),
"/base/competition/weChatPaymentCompetitionCallback", "APP", "");
- if (weixinpay.getCode() == 200) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- int num = 1;
- int wait = 0;
- 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) {
- break;
- }
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
- if (resultUtil.getCode() == 200 && paymentCompetition.getPayStatus() == 1) {
- /**
- * SUCCESS—支付成功，
- * REFUND—转入退款，
- * NOTPAY—未支付，
- * CLOSED—已关闭，
- * REVOKED—已撤销（刷卡支付），
- * USERPAYING--用户支付中，
- * PAYERROR--支付失败(其他原因，如银行返回失败)
- */
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("trade_state");
- String transaction_id = data1.get("transaction_id");
- if ("REFUND".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)) {
- paymentCompetition.setAppUserId(null);
- paymentCompetition.setPayStatus(2);
- paymentCompetition.setPayTime(new Date());
- paymentCompetition.setPayOrderNo(transaction_id);
- paymentCompetitionService.updateById(paymentCompetition);
-
- Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
- competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
- cttService.updateById(competition);
-
- break;
- }
- if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
- num++;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
- }
return weixinpay;
+
+
}
@@ -447,6 +428,7 @@
* @throws Exception
*/
public ResultUtil aliPaymentCompetition(Integer operatorId,String smid,String code, BigDecimal money) throws Exception {
+ String resSmid=smid;
ResultUtil alipay = payMoneyUtil.alipay
(smid,"报名赛事", "", "", code, money.toString(), "/base/competition/aliPaymentCompetitionCallback");
if (alipay.getCode() == 200) {
@@ -491,25 +473,12 @@
paymentCompetition.setPayTime(new Date());
paymentCompetition.setPayOrderNo(tradeNo);
paymentCompetitionService.updateById(paymentCompetition);
-
Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
cttService.updateById(competition);
-
// 结算资金到商户账号
- payMoneyUtil.confirm(smid,code,tradeNo,money.toString());
- if (operatorId == null || operatorId == 0){
- // 属于平台的赛事 资金不做冻结 不做分账处理
- payMoneyUtil.confirm1(smid,code,tradeNo,money.toString());
- }else{
- // 资金冻结
- payMoneyUtil.confirm(smid,code,tradeNo,money.toString());
- // 分账处理
- extracted(operatorId, money, tradeNo);
- }
- // 结算资金到商户账号
- //分账
-// moneyOut(tradeNo, tradeNo,code);
+ Thread.sleep(30000);
+ payMoneyUtil.confirm(resSmid,code,tradeNo,money.toString());
break;
}
if ("WAIT_BUYER_PAY".equals(s)) {
@@ -681,16 +650,18 @@
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);
+ if(list.size() > 0){
+ 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);
}
- 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);
}
--
Gitblit v1.7.1