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 | 257 ++++++++++++++++++++++++++++++--------------------
1 files changed, 154 insertions(+), 103 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 9b1b269..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
@@ -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;
@@ -19,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;
@@ -31,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;
@@ -75,6 +81,10 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
+
+
+ @Autowired
+ private CompetitionService cttService;
private String aliAppid = "2021004105665036";//支付宝appid
@@ -226,10 +236,11 @@
@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());
- List<PaymentCompetition> list = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().eq("competitionId", paymentCompetitionVo.getId()).ne("payStatus", 3));
+ 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());
@@ -241,33 +252,24 @@
}
- if ((competitionId + split.length) > competition.getApplicantsNumber()) {
+ 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);
+ 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);
+ 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, "剩余课时不足，无法完成支付。");
-
- }
+ 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, "剩余课时不足，无法完成支付。");
}
}
@@ -284,31 +286,73 @@
paymentCompetition.setInsertTime(new Date());
paymentCompetitionService.save(paymentCompetition);
- for (String s : split) {
+ 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);
userCompetition.setCompetitionId(paymentCompetitionVo.getId());
- userCompetition.setParticipantId(Integer.valueOf(s));
-// userCompetition.setParticipantType();
+ userCompetition.setParticipantId(id);
+ userCompetition.setParticipantType(isStudent == 0 ? 2 : 1);
userCompetition.setPaymentCompetitionId(paymentCompetition.getId());
userCompetition.setInsertTime(new Date());
userCompetitionService.save(userCompetition);
}
if (paymentCompetitionVo.getPayType() == 1) {//微信
- return weChatPaymentCompetition(code, money);
+ Competition byId = competitionService.getById(paymentCompetitionVo.getId());
+ String[] split = byId.getStoreId().split(",");
+
+ Store store = storeClient.queryStoreById(Integer.valueOf(split[0]));
+ Integer operatorId = store.getOperatorId();
+ if (operatorId!=null && operatorId != 0){
+ // 运营商
+ 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", "");
+ }
+
}
if (paymentCompetitionVo.getPayType() == 2) {//支付宝
+ String resSmid=smid;
// 判断当前赛事属于哪个运营商
Competition byId = competitionService.getById(paymentCompetitionVo.getId());
- Integer operatorId = byId.getOperatorId();
- if (operatorId == null ){
+ String[] split = byId.getStoreId().split(",");
+
+ Store store = storeClient.queryStoreById(Integer.valueOf(split[0]));
+ Integer operatorId = store.getOperatorId();
+ if (operatorId == null || operatorId == 0 ){
// 说明是平台
- return aliPaymentCompetition(smid,code, money);
+ return aliPaymentCompetition(operatorId,smid,code, money);
}
// 获取该运营商的商户号
- String smid = storeClient.getSMIDByOperatorId(operatorId);
- return aliPaymentCompetition(smid,code, money);
+ String smid = storeClient.getmerchantNumberAliByOperatorId(operatorId);
+ if (!StringUtils.hasLength(smid)){
+ return ResultUtil.error("运营商未配置支付宝商户号，获取支付失败!");
+ }
+ return aliPaymentCompetition(operatorId,smid,code, money);
}
if (paymentCompetitionVo.getPayType() == 3) {//玩湃币
appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() - money.intValue());
@@ -321,21 +365,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());
+ 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);
@@ -349,7 +398,6 @@
return ResultUtil.success();
}
-
/**
* 赛事微信支付
*
@@ -358,63 +406,16 @@
* @return
* @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) {
- 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) || "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)) {
- paymentCompetition.setAppUserId(null);
- paymentCompetition.setPayStatus(2);
- paymentCompetition.setPayTime(new Date());
- paymentCompetition.setPayOrderNo(transaction_id);
- paymentCompetitionService.updateById(paymentCompetition);
- break;
- }
- if ("USERPAYING".equals(s)) {
- num++;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
- }
+ public ResultUtil weChatPaymentCompetition(String code, BigDecimal money,Integer isFenZhang,Integer operatorId) throws Exception {
+//
+// payMoneyUtil.weixinpayV3(WxV3PayConfig.smidVx,"报名赛事",code,
+// "/base/competition/weChatPaymentCompetitionCallback1",
+// Long.valueOf(money.toString()));
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("报名赛事"+"-"+isFenZhang, "", code, money.toString(),
+ "/base/competition/weChatPaymentCompetitionCallback", "APP", "");
return weixinpay;
+
+
}
@@ -426,7 +427,8 @@
* @return
* @throws Exception
*/
- public ResultUtil aliPaymentCompetition(String smid,String code, BigDecimal money) 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) {
@@ -471,10 +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());
- //分账
-// moneyOut(tradeNo, tradeNo,code);
+ Thread.sleep(30000);
+ payMoneyUtil.confirm(resSmid,code,tradeNo,money.toString());
break;
}
if ("WAIT_BUYER_PAY".equals(s)) {
@@ -490,7 +494,52 @@
}
return alipay;
}
-
+ private void extracted(Integer operatorId, BigDecimal money, String tradeNo) throws Exception {
+ // 分账
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+ "2021004105665036",
+ "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==",
+ "json", "GBK",
+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB",
+ "RSA2");
+ AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
+ String randomCode = UUIDUtil.getRandomCode(16);
+ String proportionByOperatorId = storeClient.getProportionByOperatorId(operatorId);
+ // 支付宝分账比例
+ String s1 = proportionByOperatorId.split(",")[1];
+ double i = Double.parseDouble(s1);
+ double v = i * 0.01;
+ BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(v));
+ BigDecimal cashPayment = money;
+ // 分账金额
+ BigDecimal bigDecimal2 = cashPayment.multiply(bigDecimal1).setScale(2, RoundingMode.DOWN);
+ request.setBizContent("{" +
+ " \"out_request_no\":\"" + randomCode + "\"," +
+ " \"trade_no\":\"" + tradeNo + "\"," +
+ " \"royalty_parameters\":[" +
+ " {" +
+ " \"royalty_type\":\"transfer\"," +
+ " \"trans_out\":\"" + storeClient.getSMIDByOperatorId(operatorId) + "\"," +
+ " \"trans_out_type\":\"userId\"," +
+ " \"trans_in_type\":\"userId\"," +
+ " \"trans_in\":\"" + smid + "\"," +
+ " \"amount\":" + bigDecimal2 + "," +
+ " \"desc\":\"平台服务费\"," +
+ " \"royalty_scene\":\"平台服务费\"," +
+ " }" +
+ " ]," +
+ " \"extend_params\":{" +
+ " \"royalty_finish\":\"true\"" +
+ " }," +
+ " \"royalty_mode\":\"async\"" +
+ "}");
+ AlipayTradeOrderSettleResponse response = alipayClient.execute(request);
+ if (response.isSuccess()) {
+ System.out.println("调用成功");
+ } else {
+ System.out.println("调用失败");
+ }
+ }
// @Autowired
//private IPaymentCompetitionService paymentCompetitionService;
@@ -601,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