From c35f907f1ab5c2cd45a55bf757bb2fc17a5bcf1e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:45:54 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java | 150 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 133 insertions(+), 17 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
index c2e3036..857eda0 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
@@ -10,14 +10,15 @@
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.BillingRequest;
import com.dsh.competition.feignclient.other.StoreClient;
import com.dsh.competition.feignclient.other.model.Store;
+import com.dsh.competition.mapper.CompetitionMapper;
import com.dsh.competition.mapper.PaymentCompetitionMapper;
-import com.dsh.competition.model.CompetitionInfo;
-import com.dsh.competition.model.CompetitionListVo;
-import com.dsh.competition.model.ParticipantVo;
+import com.dsh.competition.model.*;
import com.dsh.competition.service.CompetitionService;
import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.service.IPaymentCompetitionService;
@@ -25,15 +26,13 @@
import com.dsh.competition.util.*;
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;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -66,9 +65,13 @@
@Resource
private StudentClient studentClient;
+ @Autowired
+ private PaymentCompetitionMapper paymentCompetitionMapper;
+ @Resource
+ private CompetitionMapper competitionMapper;
/**
* 获取我的报名赛事记录
@@ -81,8 +84,16 @@
*/
@Override
public List<CompetitionListVo> queryMyCompetitionList(Integer uid, Integer type, Integer pageSize, Integer pageNo) throws Exception {
- pageSize = (pageSize - 1) * pageNo;
- return this.baseMapper.queryMyCompetitionList(uid, type, pageSize, pageNo);
+ pageNo = (pageNo - 1) * pageSize;
+ if(0 == type){
+ type = null;
+ }
+ List<CompetitionListVo> competitionListVos = this.baseMapper.queryMyCompetitionList(uid, type, pageSize, pageNo);
+ for (CompetitionListVo competitionListVo : competitionListVos) {
+ Integer counts = competitionMapper.counts(competitionListVo.getPId());
+ competitionListVo.setHeat(competitionListVo.getHeat()+counts);
+ }
+ return competitionListVos;
}
@@ -102,7 +113,7 @@
competitionInfo.setImgs(competition.getImgs());
competitionInfo.setName(competition.getName());
competitionInfo.setRegisterCondition(competition.getRegisterCondition());
- Store store = storeClient.queryStoreById(competition.getStoreId());
+ Store store = storeClient.queryStoreById(Integer.valueOf(competition.getStoreId().split(",")[0]));
competitionInfo.setStoreName(store.getName());
competitionInfo.setStoreAddress(store.getAddress());
competitionInfo.setStoreLon(store.getLon());
@@ -114,15 +125,66 @@
competitionInfo.setAge(competition.getStartAge() + "-" + competition.getEndAge());
competitionInfo.setProvince(competition.getEntryProvince());
competitionInfo.setCity(competition.getEntryCity());
- competitionInfo.setAddress(competition.getEntryAddress());
- competitionInfo.setPayType(competition.getPayType());
- competitionInfo.setPrice(competition.getPrice().doubleValue());
+
+ String str = competition.getAddress();
+ str = str.substring(str.indexOf("省") + 1);
+
+ // 去掉第一个“市”及之前的字符串
+ str = str.substring(str.indexOf("市") + 1);
+
+ // 去掉第一个“区”及之前的字符串
+ str = str.substring(str.indexOf("区") + 1);
+
+
+ competitionInfo.setAddress(str);
+ competitionInfo.setCashPrice(competition.getCashPrice());
+ competitionInfo.setPlayPaiCoin(competition.getPlayPaiCoin());
+ competitionInfo.setClassPrice(competition.getClassPrice());
competitionInfo.setIntroduction(competition.getIntroduction());
competitionInfo.setRegistrationNotes(competition.getRegistrationNotes());
competitionInfo.setApply(1);
+ 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 store1 = storeClient.queryStoreById(Integer.valueOf(s));
+ map.put("name",store1.getName());
+
+
+ String str1 = store1.getAddress();
+ str1 = str1.substring(str1.indexOf("省") + 1);
+
+ // 去掉第一个“市”及之前的字符串
+ str1 = str1.substring(str1.indexOf("市") + 1);
+
+ // 去掉第一个“区”及之前的字符串
+ str1 = str1.substring(str1.indexOf("区") + 1);
+
+ map.put("address",str1);
+ 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);
+// }
+ objects.add(map);
+ }
+
+ }
+ competitionInfo.setStoreInfos(objects);
+
+
+
List<ParticipantVo> participant = new ArrayList<>();
List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
List<Integer> collect = list.stream().map(UserCompetition::getParticipantId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
List<Participant> participants = participantService.listByIds(collect);
SimpleDateFormat sdf_year = new SimpleDateFormat("yyyy");
for (Participant participant1 : participants) {
@@ -132,13 +194,33 @@
participantVo.setIdcard(participant1.getIdcard());
Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant1.getBirthday()));
participantVo.setAge(age);
+ participantVo.setPhone(participant1.getPhone());
participant.add(participantVo);
}
+
+
+ for (Integer i : collect) {
+ TStudent tStudent = studentClient.queryById(i);
+ if (tStudent!=null) {
+ ParticipantVo participantVo = new ParticipantVo();
+ participantVo.setId(tStudent.getId());
+ participantVo.setName(tStudent.getName());
+ participantVo.setIdcard(tStudent.getIdCard());
+ Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(tStudent.getBirthday()));
+ participantVo.setAge(age);
+ participantVo.setPhone(tStudent.getPhone());
+ participant.add(participantVo);
+ }
+
+ }
+
competitionInfo.setParticipant(participant);
competitionInfo.setStatus(competition.getStatus());
if(paymentCompetition.getPayStatus() == 3){
competitionInfo.setStatus(4);
}
+ competitionInfo.setPayMoney(paymentCompetition.getAmount());
+ competitionInfo.setPayType(paymentCompetition.getPayType());
return competitionInfo;
}
@@ -172,6 +254,10 @@
String refund_id = map.get("refund_id");
paymentCompetition.setRefundOrderNo(refund_id);
this.updateById(paymentCompetition);
+
+ storeClient.addBackRecord(paymentCompetition.getAmount()+"_"+paymentCompetition.getAppUserId());
+
+
}
if(paymentCompetition.getPayType() == 2){//支付宝支付
Map<String, String> map = payMoneyUtil.aliRefund(payOrderNo, amount.toString());
@@ -183,6 +269,7 @@
paymentCompetition.setRefundOrderNo(refund_id);
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setPayStatus(3);
+ paymentCompetition.setAppUserId(null);
this.updateById(paymentCompetition);
competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -196,6 +283,7 @@
paymentCompetition.setRefundOrderNo("");
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setPayStatus(3);
+ paymentCompetition.setAppUserId(null);
this.updateById(paymentCompetition);
competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -204,11 +292,11 @@
if(paymentCompetition.getPayType() == 4){//课程支付
List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
for (UserCompetition userCompetition : list) {
- Participant participant = participantService.getById(userCompetition.getId());
- Student student = studentClient.queryStudentByPhone(participant.getPhone());
+// Participant participant = participantService.getById(userCompetition.getId());
+// Student student = studentClient.queryStudentByPhone(participant.getPhone());
PaymentDeductionClassHour paymentDeductionClassHour = new PaymentDeductionClassHour();
- paymentDeductionClassHour.setId(student.getId());
- paymentDeductionClassHour.setClassHour(competition.getPrice().intValue());
+ paymentDeductionClassHour.setId(userCompetition.getParticipantId());
+ paymentDeductionClassHour.setClassHour(competition.getClassPrice());
paymentDeductionClassHour.setCode(code);
coursePackagePaymentClient.rollbackPaymentDeductionClassHour(paymentDeductionClassHour);
}
@@ -216,6 +304,7 @@
paymentCompetition.setRefundOrderNo("");
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setPayStatus(3);
+ paymentCompetition.setAppUserId(null);
this.updateById(paymentCompetition);
competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -223,4 +312,31 @@
}
return ResultUtil.success();
}
+
+ @Override
+ public List<BillingRequest> queryDatas(Integer appUserId, String monthStart, String monthEnd) {
+ return this.baseMapper.queryDatas(appUserId,monthStart,monthEnd);
+ }
+
+ @Override
+ public List<BillingRequest> queryCancelDatas(Integer appUserId, String monthStart, String monthEnd) {
+ return this.baseMapper.queryCancelDatas(appUserId,monthStart,monthEnd);
+ }
+
+ @Override
+ public List<PaymentCompetition> listAll(CompetitionQuery query) {
+ String STime = null;
+ String ETime = null;
+ if (StringUtils.hasLength(query.getTime())) {
+ STime = query.getTime().split(" - ")[0] + " 00:00:00";
+ ETime = query.getTime().split(" - ")[1] + " 23:59:59";
+ }
+
+ return paymentCompetitionMapper.listAll(query,STime,ETime,query.getAmount());
+ }
+
+ @Override
+ public Integer queryByCode(String code) {
+ return this.baseMapper.queryBycode(code);
+ }
}
--
Gitblit v1.7.1