From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug：文档内容修改
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 291 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 216 insertions(+), 75 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 01fbc2a..266c167 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.poi.excel.ExcelUtil;
+import cn.mb.cloud.common.core.exception.BusinessException;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,28 +22,32 @@
import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
import com.dsh.competition.feignclient.model.*;
import com.dsh.competition.feignclient.other.StoreClient;
+import com.dsh.competition.feignclient.other.model.Store;
import com.dsh.competition.model.*;
import com.dsh.competition.service.CompetitionService;
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 com.dsh.competition.util.wx.WxV3PayConfig;
+import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
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;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -110,11 +116,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;
}
@@ -151,17 +158,7 @@
}
return result;
} else if (query.getStoreId() != null) {
- for (PaymentCompetition paymentCompetition : paymentCompetitions) {
- Integer competitionId = paymentCompetition.getCompetitionId();
- Competition byId = cttService.getById(competitionId);
- if (byId != null) {
- String storeId = byId.getStoreId();
- if (storeId.contains(query.getStoreId().toString())) {
- result.add(paymentCompetition);
- }
- }
- }
- return result;
+ return paymentCompetitions;
}
return paymentCompetitions;
}
@@ -426,6 +423,61 @@
* @param response
*/
@ResponseBody
+ @PostMapping("/base/competition/weChatPaymentCompetitionCallback1")
+ public void weChatPaymentCompetitionCallback1(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ System.err.println("微信回调");
+ System.err.println("请求" + request);
+ BufferedReader reader = request.getReader();
+ String string1 = reader.toString();
+ System.err.println("请求reader" + string1);
+ StringBuilder requestBody = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ requestBody.append(line);
+ }
+ System.err.println("全部请求体" + requestBody);
+ JSONObject jsonObject = JSONObject.parseObject(requestBody.toString());
+ JSONObject resource = jsonObject.getJSONObject("resource");
+
+ AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
+ String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
+ resource.getString("ciphertext"));
+ System.err.println("微信解密的字符串信息" + decryptedData);
+ JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData);
+ String code = jsonInfo.getString("out_trade_no");
+ String transaction_id = jsonInfo.getString("transaction_id");
+ String trade_state = jsonInfo.getString("trade_state");
+ if (trade_state.equals("SUCCESS")) {
+ PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 1));
+ if (paymentCompetition.getPayStatus() == 1) {
+ 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);
+ }
+
+
+ PrintWriter out = response.getWriter();
+ out.write("SUCCESS");
+ out.flush();
+ out.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ /**
+ * 报名赛事微信支付回调
+ *
+ * @param request
+ * @param response
+ */
+ @ResponseBody
@PostMapping("/base/competition/weChatPaymentCompetitionCallback")
public void weChatPaymentCompetitionCallback(HttpServletRequest request, HttpServletResponse response) {
try {
@@ -570,8 +622,9 @@
String code = map.get("out_refund_no");
String refund_id = map.get("refund_id");
String result = map.get("result");
- PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 1));
- if (paymentCompetition.getPayStatus() == 1) {
+ PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>()
+ .eq("code", code).eq("payType", 1));
+ if (paymentCompetition.getPayStatus() == 2) {
paymentCompetition.setPayStatus(3);
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setRefundOrderNo(refund_id);
@@ -581,9 +634,68 @@
Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
cttService.updateById(competition);
+
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ /**
+ * 取消已报名赛事后微信回退金额回调微信V3服务商版本
+ *
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/base/competition/weChatCancelPaymentCompetitionCallback1")
+ public void weChatCancelPaymentCompetitionCallback1(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ System.err.println("微信回调");
+ System.err.println("请求" + request);
+ BufferedReader reader = request.getReader();
+ String string1 = reader.toString();
+ System.err.println("请求reader" + string1);
+ StringBuilder requestBody = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ requestBody.append(line);
+ }
+ System.err.println("全部请求体" + requestBody);
+ JSONObject jsonObject = JSONObject.parseObject(requestBody.toString());
+ JSONObject resource = jsonObject.getJSONObject("resource");
+
+ AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
+ String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
+ resource.getString("ciphertext"));
+ System.err.println("微信解密的字符串信息" + decryptedData);
+ JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData);
+ String code = jsonInfo.getString("out_trade_no");
+ String transaction_id = jsonInfo.getString("transaction_id");
+ String refund_status = jsonInfo.getString("refund_status");
+ String out_refund_no = jsonInfo.getString("out_refund_no");
+ if (refund_status.equals("SUCCESS")) {
+ PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>()
+ .eq("code", code).eq("payType", 1));
+ if (paymentCompetition.getPayStatus() == 2) {
+ paymentCompetition.setPayStatus(3);
+ paymentCompetition.setRefundTime(new Date());
+ paymentCompetition.setRefundOrderNo(out_refund_no);
+ paymentCompetition.setAppUserId(null);
+ paymentCompetitionService.updateById(paymentCompetition);
+
+ Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
+ competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
+ cttService.updateById(competition);
+ storeClient.addBackRecord(paymentCompetition.getAmount() + "_" + paymentCompetition.getAppUserId());
+
}
PrintWriter out = response.getWriter();
- out.write(result);
+ out.write("SUCCESS");
out.flush();
out.close();
}
@@ -634,7 +746,8 @@
wrapper.ne(Competition::getAuditStatus,2);
}
wrapper.in(Competition::getStoreId,listQuery.getIds());
- wrapper.orderByDesc(Competition::getInsertTime);
+ wrapper.orderByDesc(Competition::getInsertTime)
+ .orderByDesc(Competition::getId);
Page<Competition> page = cttService.page(competitionPage, wrapper);
for (Competition record : page.getRecords()) {
// 查询当前赛事有多少人报名了
@@ -677,7 +790,8 @@
integers.add(1);
integers.add(3);
wrapper.in(Competition::getAuditStatus, integers);
- wrapper.orderByDesc(Competition::getInsertTime);
+ wrapper.orderByDesc(Competition::getInsertTime)
+ .orderByDesc(Competition::getId);
Page<Competition> page = cttService.page(competitionPage, wrapper);
return page;
@@ -726,41 +840,14 @@
}
}
+ /**
+ * 更新活动配置。
+ *
+ * @param competition 管理端提交的活动信息
+ */
@PostMapping("/base/competition/update")
- public void update(@RequestBody Competition competition) {
- try {
- if (competition.getStartTime().after(new Date())) {
- competition.setStatus(1);
- }
- if (competition.getStartTime().before(new Date())) {
- if (competition.getEndTime().after(new Date())) {
- competition.setStatus(2);
- } else {
- competition.setStatus(3);
- }
-
- if(competition.getStatus() == 2){
- //添加勋章数据
- List<PaymentCompetition> list = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
- .eq("competitionId", competition.getId()).eq("payStatus", 2).eq("state", 1));
- Set<Integer> collect = list.stream().map(PaymentCompetition::getAppUserId).collect(Collectors.toSet());
- for (Integer integer : collect) {
- int count = paymentCompetitionService.count(new QueryWrapper<PaymentCompetition>()
- .eq("appUserId", integer).eq("payStatus", 2).eq("state", 1));
- StudentHonor studentHonor = new StudentHonor();
- studentHonor.setAppUserId(integer);
- studentHonor.setHonorType(2);
- studentHonor.setNumber(count);
- studentHonorClient.saveStudentHonor(studentHonor);
- }
- }
- }
- cttService.updateById(competition);
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
+ public void update(@RequestBody Competition competition) throws BusinessException {
+ cttService.updateCompetition(competition);
}
@Resource
@@ -783,21 +870,32 @@
String code = paymentCompetition.getCode();
Double amount = paymentCompetition.getAmount();
Competition competition = competitionService.getById(paymentCompetition.getCompetitionId());
-
-
+ Store store = storeClient.queryStoreById(Integer.valueOf(competition.getStoreId().split(",")[0]));
String payOrderNo = paymentCompetition.getPayOrderNo();
if (paymentCompetition.getPayType() == 1) {//微信支付
- Map<String, String> map = payMoneyUtil.wxRefund(payOrderNo, code, amount.toString(), amount.toString(), "/base/competition/weChatCancelPaymentCompetitionCallback");
- String return_code = map.get("return_code");
- if (!"SUCCESS".equals(return_code)) {
+ if (store.getOperatorId()!=null && store.getOperatorId()!=0){
+ String smidVx= storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
+ if (!StringUtils.hasLength(smidVx)){
+ System.err.println("运营商未配置微信商户号，获取支付失败!");
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String codeRefund = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);// 退款单号
+ // 运营商退款
+ payMoneyUtil.weixinRefundV3(smidVx, codeRefund, pay.getPayOrderNo(), pay.getAmount().toString(), "/base/competition/weChatCancelPaymentCompetitionCallback1");
+ }else {
+ Map<String, String> map = payMoneyUtil.wxRefund(payOrderNo, code, amount.toString(), amount.toString(),
+ "/base/competition/weChatCancelPaymentCompetitionCallback");
+ String return_code = map.get("return_code");
+ if (!"SUCCESS".equals(return_code)) {
// return ResultUtil.error(map.get("return_msg"));
- continue;
+ continue;
+ }
+ String refund_id = map.get("refund_id");
+ paymentCompetition.setRefundOrderNo(refund_id);
+ paymentCompetition.setAppUserId(null);
+ paymentCompetitionService.updateById(paymentCompetition);
+ storeClient.addBackRecord(paymentCompetition.getAmount() + "_" + paymentCompetition.getAppUserId());
}
- String refund_id = map.get("refund_id");
- paymentCompetition.setRefundOrderNo(refund_id);
- paymentCompetitionService.updateById(paymentCompetition);
- storeClient.addBackRecord(paymentCompetition.getAmount() + "_" + paymentCompetition.getAppUserId());
-
}
if (paymentCompetition.getPayType() == 2) {//支付宝支付
Map<String, String> map = payMoneyUtil.aliRefund(payOrderNo, amount.toString());
@@ -996,13 +1094,11 @@
// 年
ArrayList<Integer> years = new ArrayList<>();
ArrayList<Integer> yearsUser = new ArrayList<>();
- Integer operatorId = vo.getOperatorId();
- List<Integer> operatorId1 = cttService.list(new QueryWrapper<Competition>().eq("operatorId", operatorId))
- .stream().map(Competition::getId).collect(Collectors.toList());
for (Object o : collect) {
String s = o.toString();
- int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).eq(Competition::getOperatorId, vo.getOperatorId()));
- int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime, s));
+ List<Integer> competitionIds = listCompetitionIds(vo, s);
+ int count = competitionIds.size();
+ int count1 = countUserCompetitions(vo, s, competitionIds);
years.add(count);
yearsUser.add(count1);
}
@@ -1020,8 +1116,9 @@
m = "0" + i;
}
String s = year + "-" + m;
- int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).eq(Competition::getOperatorId, operatorId));
- int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime, s));
+ List<Integer> competitionIds = listCompetitionIds(vo, s);
+ int count = competitionIds.size();
+ int count1 = countUserCompetitions(vo, s, competitionIds);
months.add(count);
monthsUser.add(count1);
}
@@ -1029,6 +1126,51 @@
map.put("monthsUser", monthsUser);
return map;
+ }
+
+ private List<Integer> listCompetitionIds(CompetionVO vo, String dateText) {
+ return cttService.list(buildCompetitionCountWrapper(vo, dateText))
+ .stream()
+ .map(Competition::getId)
+ .collect(Collectors.toList());
+ }
+
+ private int countUserCompetitions(CompetionVO vo, String dateText, List<Integer> competitionIds) {
+ if (competitionIds.isEmpty()) {
+ return 0;
+ }
+ return ucttService.count(new LambdaQueryWrapper<UserCompetition>()
+ .in(UserCompetition::getAppUserId, vo.getIds())
+ .in(UserCompetition::getCompetitionId, competitionIds)
+ .like(UserCompetition::getInsertTime, dateText));
+ }
+
+ private LambdaQueryWrapper<Competition> buildCompetitionCountWrapper(CompetionVO vo, String dateText) {
+ LambdaQueryWrapper<Competition> wrapper = new LambdaQueryWrapper<Competition>()
+ .like(Competition::getInsertTime, dateText)
+ .eq(Competition::getOperatorId, vo.getOperatorId());
+ appendStoreIdFilter(wrapper, vo.getStoreIds());
+ return wrapper;
+ }
+
+ private void appendStoreIdFilter(LambdaQueryWrapper<Competition> wrapper, List<Integer> storeIds) {
+ if (storeIds == null || storeIds.isEmpty()) {
+ return;
+ }
+
+ List<Integer> validStoreIds = storeIds.stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ if (validStoreIds.isEmpty()) {
+ return;
+ }
+
+ wrapper.and(item -> {
+ item.apply("FIND_IN_SET({0}, storeId)", validStoreIds.get(0));
+ for (int i = 1; i < validStoreIds.size(); i++) {
+ item.or().apply("FIND_IN_SET({0}, storeId)", validStoreIds.get(i));
+ }
+ });
}
@@ -1044,4 +1186,3 @@
return list1.stream().map(PaymentCompetition::getAppUserId).collect(Collectors.toList());
}
}
-
--
Gitblit v1.7.1