From 6d7fdf8edc3d4e2f91bbf438fa785504caa94eb5 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 26 九月 2023 22:21:51 +0800
Subject: [PATCH] 后台修改
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 192 +++++++++++++++++++++++++++++++++--------------
1 files changed, 135 insertions(+), 57 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 8b5074a..57f39c4 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
@@ -8,13 +8,10 @@
import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
-import com.dsh.competition.feignclient.model.GetPeopleQuery;
-import com.dsh.competition.feignclient.model.GetStuSourseList;
-import com.dsh.competition.feignclient.model.ListQuery;
-import com.dsh.competition.feignclient.model.PurchaseRecordVo;
-import com.dsh.competition.model.CompetitionInfo;
-import com.dsh.competition.model.CompetitionListVo;
-import com.dsh.competition.model.PaymentCompetitionVo;
+import com.dsh.competition.feignclient.account.AppUserClient;
+import com.dsh.competition.feignclient.account.model.AppUser;
+import com.dsh.competition.feignclient.model.*;
+import com.dsh.competition.model.*;
import com.dsh.competition.service.CompetitionService;
import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.service.IPaymentCompetitionService;
@@ -72,35 +69,51 @@
@Autowired
private IParticipantService participantService;
+ @Autowired
+ private AppUserClient appUserClient;
+ /**
+ * 获取赛事报名记录
+ */
+ @ResponseBody
+ @RequestMapping("/base/competition/listAllPayment")
+ public List<PaymentCompetition> listAllPayment(@RequestBody CompetitionQuery query){
+ return paymentCompetitionService.listAll(query);
+ }
+ @ResponseBody
@PostMapping("/base/competition/getPayedCompetitions")
- public List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody Integer appUserId){
- List<Integer> integers = new ArrayList<>();
- integers.add(1);
- integers.add(2);
- return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
- .in("payType",integers)
- .eq("appUserId",appUserId)
- .eq("payStatus",2));
+ public BillingRequestVo getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo){
+ BillingRequestVo billingRequestVo = new BillingRequestVo();
+ List<BillingRequest> integers = new ArrayList<>();
+ integers = paymentCompetitionService.queryDatas(requestVo.getAppUserId(),requestVo.getMonthStart(),requestVo.getMonthEnd());
+ System.out.println(integers);
+ if (integers.size() > 0 ){
+ billingRequestVo.setRequests(integers);
+ }
+ return billingRequestVo;
}
-
+ @ResponseBody
@PostMapping("/base/competition/getCancelOrderOfUserPay")
- public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId){
- List<Integer> integers = new ArrayList<>();
- integers.add(1);
- integers.add(2);
- return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
- .in("payType",integers)
- .eq("appUserId",appUserId)
- .eq("payStatus",3));
+ public BillingRequestVo getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo requestVo){
+ BillingRequestVo billingRequestVo = new BillingRequestVo();
+ List<BillingRequest> integers = new ArrayList<>();
+ integers = paymentCompetitionService.queryCancelDatas(requestVo.getAppUserId(),requestVo.getMonthStart(),requestVo.getMonthEnd());
+ System.out.println(integers);
+ if (integers.size() > 0 ){
+ billingRequestVo.setRequests(integers);
+ }
+ return billingRequestVo;
}
@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){
+ ArrayList<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
- .eq("payType",3)
+ .in("payType",integers)
.eq("appUserId",appUserId)
.eq("payStatus",3));
}
@@ -112,24 +125,31 @@
List<PurchaseRecordVo> recordVos = new ArrayList<>();
- List<Competition> list = cttService.list(new QueryWrapper<Competition>()
- .eq("payType",3 )
- .eq("auditStatus",2));
- List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList());
- List<UserCompetition> userCompetitions = ucttService.list(new QueryWrapper<UserCompetition>()
- .between("insertTime", sourseList.getStartTime(),sourseList.getEndTime() )
- .eq("userId", sourseList.getAppUserId())
- .in("competitionId",comIds ));
- if (userCompetitions.size() > 0){
- userCompetitions.forEach(coms ->{
- PurchaseRecordVo recordVo = new PurchaseRecordVo();
- recordVo.setPurchaseType("报名赛事");
- recordVo.setPurchaseTime(dateFormat.format(coms.getInsertTime()));
- PaymentCompetition paymentCompetition = paymentCompetitionService.getById(coms.getPaymentCompetitionId());
- recordVo.setPurchaseAmount("-"+paymentCompetition.getAmount());
- recordVos.add(recordVo);
- });
+ ArrayList<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
+ List<PaymentCompetition> list = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .in("payType",integers )
+ .eq("appUserId", sourseList.getAppUserId())
+ .eq("state",1));
+ if (list.size() > 0){
+ List<Long> comIds = list.stream().map(PaymentCompetition::getId).collect(Collectors.toList());
+ List<UserCompetition> userCompetitions = ucttService.list(new QueryWrapper<UserCompetition>()
+ .between("insertTime", sourseList.getStartTime(),sourseList.getEndTime() )
+ .eq("appUserId", sourseList.getAppUserId())
+ .in("paymentCompetitionId",comIds ));
+ if (userCompetitions.size() > 0){
+ userCompetitions.forEach(coms ->{
+ PurchaseRecordVo recordVo = new PurchaseRecordVo();
+ recordVo.setPurchaseType("报名赛事");
+ recordVo.setPurchaseTime(dateFormat.format(coms.getInsertTime()));
+ PaymentCompetition paymentCompetition = paymentCompetitionService.getById(coms.getPaymentCompetitionId());
+ recordVo.setPurchaseAmount("-"+paymentCompetition.getAmount());
+ recordVos.add(recordVo);
+ });
+ }
}
+
return recordVos;
}
@@ -189,6 +209,7 @@
@ApiOperation(value = "赛事报名", tags = {"APP-赛事活动列表"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+
})
public ResultUtil paymentCompetition(PaymentCompetitionVo paymentCompetitionVo){
try {
@@ -197,6 +218,27 @@
return ResultUtil.tokenErr();
}
return cttService.paymentCompetition(uid, paymentCompetitionVo);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/competition/paymentCompetitionCourseList")
+ @ApiOperation(value = "赛事报名--支付可用课时列表", tags = {"APP-赛事活动列表"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "赛事id", name = "id", dataType = "int", required = true),
+ })
+ public ResultUtil paymentCompetitionCourseList(Integer id){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return cttService.paymentCompetitionCourseList(uid, id);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -382,7 +424,7 @@
@PostMapping("/base/competition/queryById")
- public Competition queryById(Integer id){
+ public Competition queryById(@RequestBody Integer id){
try {
return cttService.getById(id);
}catch (Exception e){
@@ -411,12 +453,49 @@
wrapper.lt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59");
}
if(ToolUtil.isNotEmpty(listQuery.getState())){
- wrapper.eq(Competition::getState,listQuery.getState());
+ wrapper.eq(Competition::getStatus,listQuery.getState());
}
if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){
wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition());
}
wrapper.in(Competition::getStoreId,listQuery.getIds());
+ wrapper.eq(Competition::getAuditStatus,2);
+ wrapper.orderByDesc(Competition::getInsertTime);
+
+ Page<Competition> page = cttService.page(competitionPage, wrapper);
+ return page;
+ }catch (Exception e){
+ e.printStackTrace();
+ return new Page<Competition>();
+ }
+ }
+ @PostMapping("/base/competition/listAudit")
+ public Page<Competition> listAudit(@RequestBody ListQuery listQuery){
+ try {
+ Page<Competition> competitionPage = new Page<>(listQuery.getOffset(),listQuery.getLimit());
+ LambdaQueryWrapper<Competition> wrapper = new LambdaQueryWrapper<>();
+ if(ToolUtil.isNotEmpty(listQuery.getProvinceCode())){
+ wrapper.eq(Competition::getProvinceCode,listQuery.getProvinceCode());
+ }
+ if(ToolUtil.isNotEmpty(listQuery.getCityCode())){
+ wrapper.eq(Competition::getProvinceCode,listQuery.getCityCode());
+ }
+ if(ToolUtil.isNotEmpty(listQuery.getEventName())){
+ wrapper.like(Competition::getName,listQuery.getEventName());
+ }
+ if(ToolUtil.isNotEmpty(listQuery.getState())){
+ wrapper.eq(Competition::getAuditStatus,listQuery.getState());
+ }
+ if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){
+ wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition());
+ }
+ wrapper.in(Competition::getStoreId,listQuery.getIds());
+ ArrayList<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(3);
+ wrapper.in(Competition::getAuditStatus,integers);
+ wrapper.orderByDesc(Competition::getInsertTime);
+
Page<Competition> page = cttService.page(competitionPage, wrapper);
return page;
}catch (Exception e){
@@ -429,6 +508,7 @@
@PostMapping("/base/competition/add")
public void add(@RequestBody Competition competition){
try {
+ competition.setInsertTime(new Date());
cttService.save(competition);
}catch (Exception e){
e.printStackTrace();
@@ -456,19 +536,17 @@
}
-// @PostMapping("/base/competition/getPeopleFromId")
-// public Page<Participant> getPeopleFromId(@RequestBody GetPeopleQuery getPeopleQuery){
-// try {
-// Page<Participant> participantPage = new Page<>();
-// LambdaQueryWrapper<Participant> participantLambdaQueryWrapper = new LambdaQueryWrapper<>();
-// if(getPeopleQuery.getState()!=null){
-// participantLambdaQueryWrapper.eq(Participant::getState)
-// }
-// participantService.page()
-// }catch (Exception e){
-// return null;
-// }
-// }
+ @PostMapping("/base/competition/getPeopleFromId")
+ public Page<CompetitionUser> getPeopleFromId(@RequestBody GetPeopleQuery getPeopleQuery){
+ try {
+ Page<UserCompetition> participantPage = new Page<>(getPeopleQuery.getOffset(),getPeopleQuery.getLimit());
+ Page<CompetitionUser> page = participantService.getPeopleFromId(participantPage,getPeopleQuery.getId(),getPeopleQuery.getState());
+ return page;
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
}
--
Gitblit v1.7.1