From 4a055748da8c4e8baf002dff7b74e12ec150610a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 20:24:59 +0800
Subject: [PATCH] 11.10
---
cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java | 2 +
cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml | 7 +++
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuCourseResp.java | 4 ++
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 1
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 13 +++---
cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java | 1
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 12 +++--
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 32 +++++++++++++++-
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java | 32 ++++++++++++++--
9 files changed, 86 insertions(+), 18 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuCourseResp.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuCourseResp.java
index 080b041..029bade 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuCourseResp.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuCourseResp.java
@@ -28,4 +28,8 @@
private String periodOfValidity;
@ApiModelProperty(value = "是否过滤分配课时")
private Integer isAble;
+ @ApiModelProperty(value = "课程类型")
+ private Integer courseType;
+
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 8e5de5e..f2f3726 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -321,6 +321,7 @@
course.setRemainingNums(ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums());
course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity());
course.setIsAble(tCoursePackagePayment.getIsAble());
+ course.setCourseType(tCoursePackagePayment.getCourseType());
courseList.add(course);
}
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index dd4a567..4ba2cd2 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -13,6 +13,7 @@
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
+import com.dsh.activity.feignclient.other.model.StoreInfoDto;
import com.dsh.activity.feignclient.other.model.TOperatorCity;
import com.dsh.activity.model.CoachChangeStateVO;
import com.dsh.activity.model.PointMerchandiseIncomeVo;
@@ -903,7 +904,7 @@
detailsResponse.setUseStatus(3);
}
- } else if (merchandise.getCardType()==3) {
+ } else if (merchandise.getCardType()==3){
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.setTime(pointsMerchandise.getInsertTime());
@@ -980,12 +981,17 @@
}
+@Autowired
+private PointsMerchandiseStoreService storeService;
+
@ResponseBody
@PostMapping("/base/pointMerchars/getSpecificsOfGoods")
public PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
PointDetailsVo detailsVo = new PointDetailsVo();
UserPointsMerchandise byId = upmseService.getById(speMercharsId);
+
+ List<PointsMerchandiseStore> stores = storeService.list(new QueryWrapper<PointsMerchandiseStore>().eq("pointsMerchandiseId", byId.getPointsMerchandiseId()));
if (ToolUtil.isNotEmpty(byId)){
PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());
@@ -1006,6 +1012,22 @@
case 3:
List<String> list10 = Arrays.asList(StrUtils.splitStr2StrArr(pmdsServiceById.getProductImages(), ","));
ArrayList<String> list2 = new ArrayList<>(list10);
+
+
+ SimpleDateFormat dateFormat5 = new SimpleDateFormat("yyyy-MM-dd");
+
+
+ for (PointsMerchandiseStore store : stores) {
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(store.getStoreId());
+ detailsVo.setBelongs(courseOfStore.getStoreName());
+ }
+
+ String format = dateFormat5.format(byId.getInsertTime());
+ detailsVo.setOrderTime(format);
+
+
+
+
list2.add(pmdsServiceById.getCover());
detailsVo.setPics(list2);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
@@ -1054,6 +1076,9 @@
} else if (pmdsServiceById.getCardType()==2) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+
+
Calendar calendar = Calendar.getInstance();
calendar.setTime(byId.getInsertTime());
calendar.add(Calendar.DAY_OF_MONTH, 31);
@@ -1070,6 +1095,9 @@
} else if (pmdsServiceById.getCardType()==3) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+
+
Calendar calendar = Calendar.getInstance();
calendar.setTime(byId.getInsertTime());
calendar.add(Calendar.DAY_OF_MONTH, 93);
@@ -1158,7 +1186,7 @@
}else {
detailsVo.setUseType(1);
detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
- StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getVerifiStoreId());
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
detailsVo.setWriteOffName(courseOfStore.getStoreName());
}
switch (pmdsServiceById.getUseScope()){
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index 81ca00b..3b78c2c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -89,19 +89,20 @@
LocalDateTime currentTime = LocalDateTime.now();
- LocalDateTime oneMinuteAgo = currentTime.minusSeconds(30);
+ LocalDateTime oneMinuteAgo = currentTime.minusSeconds(120);
+
+
List<UserCoupon> list = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", uid).ge("insertTime", oneMinuteAgo));
List<Integer> ids = new ArrayList<>();
for (UserCoupon userCoupon : list) {
ids.add(userCoupon.getCouponId());
}
+ List<Coupon> userId = new ArrayList<>();
+ if (ids.size()>0) {
-// if (ids.size()>0){
- List<Coupon> userId = couponService.list(new QueryWrapper<Coupon>().in("id",ids));
-// return userId;
-//
-// }
+ userId = couponService.list(new QueryWrapper<Coupon>().in("id", ids));
+ }
for (Coupon coupon : userId) {
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
index 95271a8..0167849 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
@@ -41,4 +41,6 @@
List<PaymentCompetition> listAll(@Param("query")CompetitionQuery query, @Param("sTime")String sTime, @Param("eTime")String eTime, @Param("amount") BigDecimal amount);
Integer queryBycode(String code);
+
+ Integer counts(@Param("id") Long id);
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java
index c919df1..21a352e 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionListVo.java
@@ -31,4 +31,5 @@
private Integer heat;
@ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
private Integer status;
+ private Long pId;
}
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 d060cd8..796705b 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,11 +10,13 @@
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.*;
import com.dsh.competition.service.CompetitionService;
@@ -68,6 +70,8 @@
+ @Resource
+ private CompetitionMapper competitionMapper;
/**
* 获取我的报名赛事记录
@@ -84,7 +88,12 @@
if(0 == type){
type = null;
}
- return this.baseMapper.queryMyCompetitionList(uid, type, pageSize, pageNo);
+ 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;
}
@@ -188,6 +197,21 @@
participantVo.setPhone(participant1.getPhone());
participant.add(participantVo);
}
+
+ for (Integer i : collect) {
+ TStudent tStudent = studentClient.queryById(i);
+ 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){
@@ -266,10 +290,10 @@
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.setId(userCompetition.getParticipantId());
paymentDeductionClassHour.setClassHour(competition.getClassPrice());
paymentDeductionClassHour.setCode(code);
coursePackagePaymentClient.rollbackPaymentDeductionClassHour(paymentDeductionClassHour);
diff --git a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
index a5c2c8c..cc1ba45 100644
--- a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
@@ -11,9 +11,10 @@
b.city as cityName,
b.registerCondition,
b.introduction,
+ b.id as pId,
DATE_FORMAT(b.registerEndTime, '%Y-%m-%d %H:%i') as registerEndTime,
CONCAT(b.startAge, '-', b.endAge) as age,
- b.baseNumber + b.applicantsNumber as heat,
+ b.baseNumber as heat,
if(a.payStatus = 3, 4, b.status) as status
from t_payment_competition a
left join t_competition b on (a.competitionId = b.id)
@@ -80,4 +81,8 @@
LEFT JOIN t_course_package cp ON py.coursePackageId = cp.id
WHERE py.code = #{code}
</select>
+ <select id="counts" resultType="java.lang.Integer">
+ select count(1)
+ from t_user_competition where competitionId = #{id}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 85654ee..9b277fb 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -551,11 +551,13 @@
.in("id", collect));
list.forEach(vo -> {
StuSessionDetailsVo detVo = new StuSessionDetailsVo();
- detVo.setSessionid(vo.getId());
- detVo.setSessionName(vo.getName());
- String afterDayDate = DateUtil.getAfterDayDate2(vo.getInsertTime(),vo.getValidDays() + "");
- detVo.setPeriodOfValidity(afterDayDate);
- detailsVos.add(detVo);
+ if (vo.getType()!=2) {
+ detVo.setSessionid(vo.getId());
+ detVo.setSessionName(vo.getName());
+ String afterDayDate = DateUtil.getAfterDayDate2(vo.getInsertTime(), vo.getValidDays() + "");
+ detVo.setPeriodOfValidity(afterDayDate);
+ detailsVos.add(detVo);
+ }
});
}
return detailsVos;
--
Gitblit v1.7.1