From fabe5684d31e0c52548b33b7afbfec0855f9880e Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 30 十一月 2023 19:09:01 +0800
Subject: [PATCH] 11.30
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java | 8 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 31 +++
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java | 4
cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml | 13 +
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 4
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 27 +++
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js | 9 +
cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java | 1
cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js | 31 ++++
cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html | 2
cloud-server-competition/src/main/java/com/dsh/competition/mapper/ParticipantMapper.java | 3
cloud-server-management/src/main/webapp/static/modular/system/tCompetitionAudit/tCompetition_info.js | 2
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/TCoupon.js | 2
cloud-server-activity/src/main/resources/mapper/CouponMapper.xml | 3
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 116 ++++++++--------
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html | 11
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 3
cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js | 2
cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js | 18 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 11
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 6
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html | 6
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 6
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 10 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java | 4
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java | 2
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 36 +++++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html | 18 ++
29 files changed, 289 insertions(+), 102 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index 6ec0c70..db0d613 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -607,7 +607,7 @@
coupon.setIllustrate(dataVo.getIllustrate());
coupon.setDistributionMethod(dataVo.getDistributionMethod());
coupon.setRedemptionMethod(dataVo.getExchangeMethod());
- if (dataVo.getExchangeMethod() != null) {
+ if (dataVo.getExchangeMethod() != null&&dataVo.getDistributionMethod()!=4) {
switch (dataVo.getExchangeMethod()) {
case 1:
coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
@@ -764,6 +764,7 @@
}
return true;
} catch (Exception e) {
+ e.printStackTrace();
return false;
}
}
diff --git a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
index bd3c2f5..91cbbbc 100644
--- a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
@@ -97,9 +97,8 @@
WHERE storeId = #{storeId}
UNION ALL
SELECT DISTINCT couponId
-
from t_coupon_city
- WHERE provinceCode = #{cityCode}) o)
+ WHERE cityCode = #{cityCode}) o)
</if>
<if test="name != null">
and `name` like concat('%', #{name}, '%')
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 b5cb1f8..74a0dd4 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
@@ -11,7 +11,9 @@
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.account.AppUserClient;
+import com.dsh.competition.feignclient.account.StudentClient;
import com.dsh.competition.feignclient.account.model.AppUser;
+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.*;
@@ -832,6 +834,40 @@
}
}
+ @Resource
+ private StudentClient studentClient;
+ @PostMapping("/base/competition/getPeopleFromId1")
+ public List<CompetitionUser> getPeopleFromId1(@RequestBody GetPeopleQuery getPeopleQuery) {
+ try {
+ Page<UserCompetition> participantPage = new Page<>(getPeopleQuery.getOffset(), getPeopleQuery.getLimit());
+ List<CompetitionUser> page = participantService.getPeopleFromId1(participantPage, getPeopleQuery.getId(), getPeopleQuery.getState());
+
+ List<CompetitionUser> users = new ArrayList<>();
+ List<UserCompetition> coms = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("competitionId", getPeopleQuery.getId()));
+ for (UserCompetition com : coms) {
+ int number = com.getParticipantId();
+ String numberString = Integer.toString(number);
+ int digitCount = numberString.length();
+ if (digitCount!=9){
+ TStudent tStudent = studentClient.queryById(number);
+ CompetitionUser competitionUser = new CompetitionUser();
+ competitionUser.setName(tStudent.getName());
+ competitionUser.setPhone(tStudent.getPhone());
+ competitionUser.setSex(tStudent.getSex());
+ competitionUser.setIdCard(tStudent.getIdCard());
+ competitionUser.setState(tStudent.getState());
+ users.add(competitionUser);
+ }
+ }
+ page.addAll(users);
+
+ return page;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
@PostMapping("/base/competition/getPeoples")
@ResponseBody
public List<CompetitionUser> getPeoples(@RequestBody GetPeopleQuery getPeopleQuery) {
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/ParticipantMapper.java b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/ParticipantMapper.java
index 712a979..da08f13 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/ParticipantMapper.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/ParticipantMapper.java
@@ -16,5 +16,8 @@
public interface ParticipantMapper extends BaseMapper<Participant> {
Page<CompetitionUser> getPeopleFromId(@Param("participantPage") Page<UserCompetition> participantPage, @Param("id") Integer id, @Param("state") Integer state);
+
+ List<CompetitionUser> getPeopleFromId1(@Param("participantPage") Page<UserCompetition> participantPage, @Param("id") Integer id, @Param("state") Integer state);
+
List<CompetitionUser> getPeoples(@Param("id") Integer id, @Param("state") Integer state);
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java
index 8977796..287ed69 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java
@@ -69,6 +69,7 @@
void saveParticipant(SaveParticipant saveParticipant) throws Exception;
Page<CompetitionUser> getPeopleFromId(Page<UserCompetition> participantPage, Integer id, Integer state);
+ List<CompetitionUser> getPeopleFromId1(Page<UserCompetition> participantPage, Integer id, Integer state);
List<CompetitionUser> getPeoples(Integer id, Integer state);
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
index d7ffe68..99dfffa 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
@@ -266,6 +266,10 @@
public Page<CompetitionUser> getPeopleFromId(Page<UserCompetition> participantPage, Integer id, Integer state) {
return this.baseMapper.getPeopleFromId(participantPage, id, state);
}
+ @Override
+ public List<CompetitionUser> getPeopleFromId1(Page<UserCompetition> participantPage, Integer id, Integer state) {
+ return this.baseMapper.getPeopleFromId1(participantPage, id, state);
+ }
@Override
public List<CompetitionUser> getPeoples(Integer id, Integer state) {
diff --git a/cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml b/cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml
index 6db98c9..fd13ff6 100644
--- a/cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml
@@ -13,6 +13,19 @@
and t3.payStatus =3
</if>
</select>
+
+ <select id="getPeopleFromId1" resultType="com.dsh.competition.feignclient.model.CompetitionUser">
+ select t2.name,t2.gender sex,t2.phone ,t2.idcard idCard ,t3.payStatus state
+ from t_user_competition t1 left join t_participant t2 on t1.participantId = t2.id
+ left join t_payment_competition t3 on t1.paymentCompetitionId = t3.id
+ where t1.competitionId =#{id} and t2.id is not null and t3.id is not null
+ <if test="state !=null and state !='' and state ==1">
+ and t3.payStatus in (1,2)
+ </if>
+ <if test="state !=null and state !='' and state ==3">
+ and t3.payStatus =3
+ </if>
+ </select>
<select id="getPeoples" resultType="com.dsh.competition.feignclient.model.CompetitionUser">
select t2.id, t2.name,t2.gender sex,t2.phone ,t2.idcard idCard ,t3.payStatus state
from t_user_competition t1 left join t_participant t2 on t1.participantId = t2.id
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
index edb5504..37dfdee 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
@@ -107,6 +107,21 @@
}
+
+
+ @ResponseBody
+ @PostMapping("/queryAble")
+ public Integer queryAble(@RequestBody Integer id) {
+
+ int coursePackageId = orderStudentService.count(new QueryWrapper<CoursePackageOrderStudent>().eq("coursePackageId", id));
+ if (coursePackageId>0){
+ return 1;
+ }else {
+ return 0;
+ }
+
+ }
+
//获取学员课时数信息
@RequestMapping("/getInfo")
@ResponseBody
@@ -125,6 +140,8 @@
studentClassInfo.setHasHours(restHours);
studentClassInfo.setInDate(minDate);
System.out.println("===========>" + studentClassInfo);
+
+// appUserClient.queryGift(tStudentId);
return studentClassInfo;
}
@@ -289,7 +306,14 @@
@RequestMapping("/insertBack")
@ResponseBody
- public void insertBack(@RequestBody InsertBackDto insertBackDto) {
+ public Integer insertBack(@RequestBody InsertBackDto insertBackDto) {
+
+ List<MoneyBack> ids = moneyBackService.list(new QueryWrapper<MoneyBack>().eq("ids", insertBackDto.getIds()));
+
+ if (ids!=null){
+ return 1 ;
+ }
+
MoneyBack moneyBack = new MoneyBack();
moneyBack.setStudentId(insertBackDto.getId());
@@ -308,6 +332,7 @@
}
orderStudentService.updateBatchById(pays);
+ return 0;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 0070c14..b3d6120 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -1231,7 +1231,8 @@
List<Map<String, Object>> list = new ArrayList<>();
if (coursePackage.getType()==1){
- list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);}else {
+ list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);
+ }else {
list = this.baseMapper.queryRegistrationRecord1(page, coursePackageId, userIds, studentIds);
}
for (Map<String, Object> map : list) {
@@ -1242,7 +1243,7 @@
if (coursePackage.getType()==1) {
studentId = Integer.valueOf(map.get("studentId").toString());
}else {
- studentId = Integer.valueOf(map.get("studentIds").toString());
+ studentId = Integer.valueOf(map.get("studentIds").toString().split(",")[0]);
}
TAppUser appUser = appuClient.queryAppUser1(appUserId);
@@ -1252,6 +1253,11 @@
map.put("studentName", null != student ? student.getName() : "");
Integer integer = cpsMapper.selectCount(new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId)
.eq("studentId", studentId).eq("coursePackagePaymentId", id).eq("signInOrNot", 2));
+
+ int count = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageId", coursePackageId).eq("studentId", studentId).eq("signInOrNot",2));
+
+ map.put("absencesNumber", count);
+
map.put("already", integer);
}
return list;
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 80f53c0..23d2f84 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -1778,6 +1778,8 @@
}
+ @Autowired
+ private ICoursePackageOrderStudentService orderStudentService;
/**
* 修改数据
*
@@ -1794,65 +1796,67 @@
coursePackageSchedulingQueryWrapper.notIn("id", collect);
}
coursePackageSchedulingService.remove(coursePackageSchedulingQueryWrapper);
+ int coursePackageId = orderStudentService.count(new QueryWrapper<CoursePackageOrderStudent>().eq("coursePackageId", coursePackage.getId()));
+ if (coursePackageId>0) {
+ this.baseMapper.updateById(coursePackage);
- this.baseMapper.updateById(coursePackage);
-
- //生成排课数据
- Date date = null;
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId()).last(" and classDate > now() order by classDate desc limit 0, 1"));
- if (null != coursePackageScheduling) {
- date = sdf1.parse(sdf.format(coursePackageScheduling.getClassDate()) + " 00:00:00");
- } else {
- date = sdf1.parse(sdf.format(new Date()) + " 00:00:00");
- }
- List<String> list = Arrays.asList(coursePackage.getClassWeeks().split(";"));
- String classStartTime = coursePackage.getClassStartTime();
- String[] split = classStartTime.split(":");
- String classEndTime = coursePackage.getClassEndTime();
- String[] split1 = classEndTime.split(":");
- Calendar s = Calendar.getInstance();
- s.setTime(date);
- s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
-
- Calendar e = Calendar.getInstance();
- e.setTime(date);
- if (null != coursePackageScheduling) {
- long time = sdf1.parse(sdf.format(new Date()) + " 00:00:00").getTime();
- int d = Long.valueOf(14L - ((s.getTimeInMillis() - time) / 86400000L)).intValue();
- e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + d);
- } else {
- e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 14);
- }
- long timeInMillis = e.getTimeInMillis();
-
- while (true) {
- int w = s.get(Calendar.DAY_OF_WEEK);
- WeekEnum weekEnum = WeekEnum.getWeekEnum(w);
- if (list.contains(weekEnum.getChineseName())) {
- Calendar classDate = Calendar.getInstance();
- classDate.setTime(s.getTime());
- classDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
- classDate.set(Calendar.MINUTE, Integer.valueOf(split[1]));
- classDate.set(Calendar.SECOND, 0);
-
- Calendar endDate = Calendar.getInstance();
- endDate.setTime(s.getTime());
- endDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split1[0]));
- endDate.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
- endDate.set(Calendar.SECOND, 0);
-
- CoursePackageScheduling coursePackageScheduling1 = new CoursePackageScheduling();
- coursePackageScheduling1.setCoursePackageId(coursePackage.getId());
- coursePackageScheduling1.setClassDate(classDate.getTime());
- coursePackageScheduling1.setEndDate(endDate.getTime());
- coursePackageScheduling1.setStatus(1);
- coursePackageSchedulingService.save(coursePackageScheduling1);
+ //生成排课数据
+ Date date = null;
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId()).last(" and classDate > now() order by classDate desc limit 0, 1"));
+ if (null != coursePackageScheduling) {
+ date = sdf1.parse(sdf.format(coursePackageScheduling.getClassDate()) + " 00:00:00");
+ } else {
+ date = sdf1.parse(sdf.format(new Date()) + " 00:00:00");
}
+ List<String> list = Arrays.asList(coursePackage.getClassWeeks().split(";"));
+ String classStartTime = coursePackage.getClassStartTime();
+ String[] split = classStartTime.split(":");
+ String classEndTime = coursePackage.getClassEndTime();
+ String[] split1 = classEndTime.split(":");
+ Calendar s = Calendar.getInstance();
+ s.setTime(date);
s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
- if (s.getTimeInMillis() > timeInMillis) {
- break;
+
+ Calendar e = Calendar.getInstance();
+ e.setTime(date);
+ if (null != coursePackageScheduling) {
+ long time = sdf1.parse(sdf.format(new Date()) + " 00:00:00").getTime();
+ int d = Long.valueOf(14L - ((s.getTimeInMillis() - time) / 86400000L)).intValue();
+ e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + d);
+ } else {
+ e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 14);
+ }
+ long timeInMillis = e.getTimeInMillis();
+
+ while (true) {
+ int w = s.get(Calendar.DAY_OF_WEEK);
+ WeekEnum weekEnum = WeekEnum.getWeekEnum(w);
+ if (list.contains(weekEnum.getChineseName())) {
+ Calendar classDate = Calendar.getInstance();
+ classDate.setTime(s.getTime());
+ classDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+ classDate.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+ classDate.set(Calendar.SECOND, 0);
+
+ Calendar endDate = Calendar.getInstance();
+ endDate.setTime(s.getTime());
+ endDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split1[0]));
+ endDate.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
+ endDate.set(Calendar.SECOND, 0);
+
+ CoursePackageScheduling coursePackageScheduling1 = new CoursePackageScheduling();
+ coursePackageScheduling1.setCoursePackageId(coursePackage.getId());
+ coursePackageScheduling1.setClassDate(classDate.getTime());
+ coursePackageScheduling1.setEndDate(endDate.getTime());
+ coursePackageScheduling1.setStatus(1);
+ coursePackageSchedulingService.save(coursePackageScheduling1);
+ }
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
+ if (s.getTimeInMillis() > timeInMillis) {
+ break;
+ }
}
}
} catch (Exception e) {
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
index c652760..183c22e 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
@@ -43,6 +43,10 @@
void cancel(Integer id);
@PostMapping("/base/competition/getPeopleFromId")
Page<CompetitionUser> getPeopleFromId(GetPeopleQuery getPeopleQuery);
+
+
+ @PostMapping("/base/competition/getPeopleFromId1")
+ List<CompetitionUser> getPeopleFromId1(@RequestBody GetPeopleQuery getPeopleQuery);
@PostMapping("/base/competition/getPeoples")
List<CompetitionUser> getPeoples(@RequestBody GetPeopleQuery getPeopleQuery);
@PostMapping("/base/competition/listUser")
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java
index d416ef0..57be3cf 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java
@@ -94,6 +94,6 @@
@PostMapping("/courdent/queryIdsByStore")
List<Integer> queryIdsByStore(Integer objectId);
-
-
+ @PostMapping("/courdent/queryAble")
+ Integer queryAble(Integer id);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java
index 7ac96bf..829cf3a 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java
@@ -106,7 +106,7 @@
@PostMapping("/courdent/insertBack")
- void insertBack(@RequestBody InsertBackDto insertBackDto);
+ Integer insertBack(@RequestBody InsertBackDto insertBackDto);
@RequestMapping("/courdent/changeStatus")
void changeStatus(@RequestParam("id")Integer id);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
index 1f3af00..8cd2024 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
@@ -366,6 +366,14 @@
return coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
}
+
+ @RequestMapping(value = "/getCoursePackageType")
+ @ResponseBody
+ public Integer getCoursePackageType(Integer id) {
+ TCoursePackage coursePackage = coursePackageClient.queryById(id);
+ return coursePackage.getType();
+ }
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index 3e96cfd..8a1e9e9 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -31,6 +31,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import sun.rmi.runtime.Log;
+import javax.jws.soap.SOAPBinding;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.DateFormat;
@@ -328,12 +329,12 @@
@RequestMapping(value = "/listUser/{id}")
@ResponseBody
- public Object listUser(@PathVariable Integer id,Integer state) {
+ public Object listUser(@PathVariable Integer id,Integer state, Integer offset,Integer limit) {
try {
- Page<Object> page = new PageFactory<>().defaultPage();
- Page<CompetitionUser> data = competitionClient.getPeopleFromId
- (new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
- return super.packForBT(data);
+// Page<Object> page = new PageFactory<>().defaultPage();
+// Page<CompetitionUser> data = competitionClient.getPeopleFromId(new GetPeopleQuery(limit,offset,id,state));
+ List <CompetitionUser> data = competitionClient.getPeopleFromId1(new GetPeopleQuery(limit,offset,id,state));
+ return data;
}catch (Exception e){
e.printStackTrace();
return ERROR;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index 6121a31..be2db2e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -289,6 +289,12 @@
System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
// model.addAttribute("couponIds", "3,2");
}
+
+
+ Integer able = coursePackageClient.queryAble(id);
+
+ model.addAttribute("able",able);
+
return PREFIX + "coursePackage_edit.html";
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index a01b63e..6abb242 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -39,6 +39,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.management.relation.RelationService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -289,6 +290,11 @@
return PREFIX + "tStudentEdit_first.html";
}
+ @Autowired
+ private IMenuService menuService;
+
+ @Autowired
+ private IRelationService relationService;
@RequestMapping("/tStudent_info/{tStudentId}")
public String tStudentInfo(@PathVariable("tStudentId") Integer tStudentId, Model model) {
System.out.println("======>t"+tStudentId);
@@ -330,6 +336,18 @@
System.out.println("=======controller====studentClassInfo==="+studentClassInfo);
+
+
+ User user = UserExt.getUser();
+
+ List<Relation> list = relationService.list(new QueryWrapper<Relation>().eq("menuid", 391).eq("roleid", user.getRoleid()));
+ if (!list.isEmpty()){
+ model.addAttribute("back",false);
+ }else {
+ model.addAttribute("back",true);
+
+ }
+
return PREFIX + "tStudentEdit.html";
}
@@ -551,11 +569,14 @@
insertBackDto.setIds(ids);
System.out.println("=====insertBackDto========"+insertBackDto);
- courseStuddentClient.insertBack(insertBackDto);
+ Integer i = courseStuddentClient.insertBack(insertBackDto);
+ if (i == 1){
+ return ResultUtil.error("当前课程已在退费申请中");
+ }
//取消排课
- courseStuddentClient.cancel(ids);
- System.out.println("============学员查询接口=========");
+// courseStuddentClient.cancel(ids);
+// System.out.println("============学员查询接口=========");
return ResultUtil.success();
}
@@ -573,7 +594,7 @@
courseStuddentClient.zeroClass(id);
System.out.println("============学员查询接口=========");
- return new ResultUtil<>(0,0,"同意成功",null,null);
+ return new ResultUtil<>(0,0,"已同意",null,null);
}
@RequestMapping("/noStatus/{id}")
@@ -589,7 +610,7 @@
// courseStuddentClient.zeroClass(id);
System.out.println("============学员查询接口=========");
- return new ResultUtil<>(0,0,"同意成功",null,null);
+ return new ResultUtil<>(0,0,"已拒绝",null,null);
}
/**
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
index bd6496a..befcf1d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
@@ -551,6 +551,12 @@
// CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingClient.queryCoursePackageSchedulingById(id);
List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingClient.queryCoursePackageSchedulingsById(id);
+ CoursePackageScheduling coursePackageScheduling1 = coursePackageSchedulings.get(0);
+ Date classDate = coursePackageScheduling1.getEndDate();
+
+ if (new Date().before(classDate)){
+ return ResultUtil.error("课程未结束，无法消课");
+ }
List<Long> integers = new ArrayList<>();
for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
integers.add(coursePackageScheduling.getId());
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
index cf1a7f3..7f1d72d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
@@ -48,6 +48,7 @@
<input type="hidden" id="id" value="${item.id}">
<input type="hidden" id="type" name="type" value="${type}">
<input type="hidden" id="objectType" value="${objectType}">
+ <input type="hidden" id="able" value="${able}">
@if(objectType==1){
<div class="form-group">
<label class="col-sm-3 control-label">*所在省：</label>
@@ -138,7 +139,7 @@
<div class="col-sm-4">
@for(obj in classWeeks){
- <input type="checkbox" name="classWeeks" value="${obj.value}" ${obj.checked ? 'checked' : ''}> ${obj.value}
+ <input type="checkbox" name="classWeeks" value="${obj.value}" ${able==1 ? 'disabled' :'' } ${obj.checked ? 'checked' : ''}> ${obj.value}
@}
<!-- <input class="form-control" id="classStartTime" name="classStartTime" value="${classTime}" placeholder="请选择">-->
</div>
@@ -150,14 +151,14 @@
<div style="display:flex">
- <input class="form-control" value="${time1}" id="classStartTime" name="classStartTime" placeholder="请选择" style="width: 200px;">
- <i class="fa fa-plus-circle" style="font-size: 24px; margin-left: 10px;" onclick="addTime()"></i>
+ <input class="form-control" value="${time1}" id="classStartTime" name="classStartTime" placeholder="请选择" style="width: 200px;" ${able==1 ? 'disabled' :'' }>
+ <i class="fa fa-plus-circle" style="font-size: 24px; margin-left: 10px;" onclick="${able != 1 ? 'addTime()' : ''}" ${able == 1 ? 'disabled' : ''}></i>
</div>
@for(o in times!){
<div style="display:flex">
- <input class="form-control" value="${o}" id="classStartTime" name="classStartTime" placeholder="请选择" style="width: 200px;">
- <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice1(this)"></i>
+ <input class="form-control" value="${o}" id="classStartTime" name="classStartTime" placeholder="请选择" style="width: 200px;" ${able==1 ? 'disabled' :'' }>
+ <i class="fa fa-trash-o" style="font-size:24px" onclick="${able != 1 ? 'removePrice1(this)' : ''}" ${able == 1 ? 'disabled' : ''}></i>
</div>
@}
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
index d6dc004..62d5951 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
@@ -125,7 +125,7 @@
</select>
</div>
</div>
- <div class="form-group">
+ <div class="form-group" id="toHidden">
<label class="col-sm-3 control-label">*课时规格：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="courseTime" name="store" onchange="TQuestion.getCoursePackagePrice(this)">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
index 35dadf3..f67e1d5 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
@@ -50,10 +50,10 @@
@if(type==1){
<div class="form-group">
- <label class="col-sm-3 control-label">*门店类型：</label>
+ <label class="col-sm-3 control-label">*赛事类型：</label>
<div class="col-sm-9">
- <input type="radio" name="type" value="1" onclick="updateType(1)" checked > 平台门店
- <input type="radio" name="type" value="2" onclick="updateType(2)" id="radio1" > 运营商门店
+ <input type="radio" name="type" value="1" onclick="updateType(1)" checked > 平台赛事
+ <input type="radio" name="type" value="2" onclick="updateType(2)" id="radio1" > 运营赛事
</div>
</div>
<div id="yys" hidden>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
index 2c8745f..fb4c1e7 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
@@ -224,7 +224,7 @@
"type": "images",
"id": "u:76216a114f2c",
"name": "images",
- "value":`${images}`,
+ "value":`${images!}`,
"delimiter":";"
},
// {
@@ -772,6 +772,7 @@
"id": "u:e6a3e106fac0",
"tpl": "退费申请：",
"inline": true,
+
"wrapperComponent": "",
"style": {
"paddingBottom": "100",
@@ -855,7 +856,9 @@
"id": "u:38a6f5402e72",
"level": "link"
},
- {
+ @if(shiro.hasPermission("//backpass")){
+
+ {
"type": "button",
"label": "同意",
"onEvent": {
@@ -893,6 +896,8 @@
},
"reload": "pay,crud"
}
+ @}
+
],
"placeholder": "-",
"label": "操作"
@@ -1627,9 +1632,12 @@
"tpl": "        已报名课程：",
"wrapperComponent": ""
},
- {
+ @if(shiro.hasPermission("/bback")){
+
+ {
"type": "button",
"label": "退费",
+ "visible": true,
"actionType": "ajax",
"id": "u:38a6f5402e72",
"onEvent": {
@@ -1650,7 +1658,9 @@
}
}
}
- ],
+ @}
+
+ ],
"itemActions": [
],
"features": [
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
index 441e0cb..b5a5f92 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
@@ -40,6 +40,7 @@
};
TQuestion.close = function() {
parent.layer.close(window.parent.TQuestion.layerIndex);
+ window.close();
}
/**
* 检查是否选中
@@ -366,6 +367,7 @@
layer.closeAll('page');
TQuestion.close();
Feng.success("添加成功");
+ window.close();
}
},
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
index 196f8fc..166f873 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
@@ -18,7 +18,7 @@
{title: '所在省', field: 'province', visible: true, align: 'center', valign: 'middle'},
{title: '所在市', field: 'city', visible: true, align: 'center', valign: 'middle'},
{title: '预约门店', field: 'name', visible: true, align: 'center', valign: 'middle'},
- { title: '预约场地', field: 'nextName', visible: true, align: 'center', valign: 'middle'},
+ { title: '预约场地', field: 'siteName', visible: true, align: 'center', valign: 'middle'},
{ title: '姓名', field: 'booker', visible: true, align: 'center', valign: 'middle'},
{ title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle'},
{ title: '预约时间段', field: 'times', visible: true, align: 'center', valign: 'middle'},
@@ -30,13 +30,13 @@
align: 'center',
valign: 'middle',
formatter: function(value, row) {
- if (row.status === 0 ) {
- if (value) {
- var moneyValues = value.split(',');
-
- var moneyText = moneyValues[0] + '元/' + moneyValues[1] + '币';
- return moneyText;}
- } else {
+ // if (row.status === 0 ) {
+ // if (value) {
+ // var moneyValues = value.split(',');
+ //
+ // var moneyText = moneyValues[0] + '元/' + moneyValues[1] + '币';
+ // return moneyText;}
+ // } else {
console.log("看看支付方式")
console.log(row.payType)
if (row.payType == "手动支付"){
@@ -51,7 +51,7 @@
}
- }
+ // }
}
},
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/TCoupon.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/TCoupon.js
index 1882b94..c9df0c0 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/TCoupon.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/TCoupon.js
@@ -328,7 +328,7 @@
if (!window.parent.document.getElementById("cityCode")== null){
cityCode = window.parent.document.getElementById("cityCode").value;
}
- table.queryParams = {'cityCode': cityCode,
+ table.queryParams = {'cityCode': window.parent.document.getElementById("cityCode").value,
'storeId': window.parent.document.getElementById("storeId").value}
table.height=600
TCoupon.table = table.init();
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js b/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js
index 155328e..f66b120 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js
@@ -399,6 +399,37 @@
}
ajax.set("id",oneId);
ajax.start();
+
+
+
+ var ajax1 = new $ax(Feng.ctxPath + "/cpPayment/getCoursePackageType", function(data){
+ if(data!=null){
+ console.log("data ===="+data)
+ if (data != 1){
+ document.getElementById("toHidden").style.display = "none";
+
+ var selectElement = document.getElementById('courseTime');
+ var selectedOption = selectElement.options[1];
+ console.log("插入")
+ var cashPayment = selectedOption.getAttribute('data-cashpayment');
+ var playPaiCoin = selectedOption.getAttribute('data-playpaicoin');
+ console.log(cashPayment)
+ console.log(playPaiCoin)
+ $("#cashPayment").val(cashPayment);
+ $("#playPaiCoin").val(playPaiCoin);
+
+
+ }else {
+ document.getElementById("toHidden").style.display = "block";
+
+ }
+
+ }
+ });
+
+ ajax1.set("id",oneId);
+ ajax1.start();
+
};
TQuestion.getCoursePackagePrice = function (e) {
var c1 = document.getElementById("c1");
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
index ff7d1a6..ff63c31 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
@@ -12,9 +12,14 @@
* 初始化表格的列
*/
TCompetition.initColumn = function () {
+ var index = 0
+
return [
{field: 'selectItem', radio: true},
- {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
+ {title: '序号', field: 'id', visible: false, align: 'center', valign: 'middle',value:index+1},
+ {title: '序号', valign: 'middle', formatter: function (value, row, index) {
+ return index + 1; // 使用行索引作为序号值
+ }},
{title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'8%',
},
{title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle',
@@ -236,7 +241,7 @@
$(function () {
var defaultColunms = TCompetition.initColumn();
var table = new BSTable(TCompetition.id, "/tCompetition/listUser/"+$("#id").val(), defaultColunms);
- table.setPaginationType("server");
+ table.setPaginationType("client");
TCompetition.table = table.init();
});
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
index 3be94d2..bc9e345 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
@@ -780,7 +780,7 @@
var marker;
//搜索地图
TCarInfoDlg.searchByStationName = function(e,type){
- var keyword="成都";
+ var keyword="";
if(type==2){
keyword = $(e).parent().prev().find("input").val();
}else {
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetitionAudit/tCompetition_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetitionAudit/tCompetition_info.js
index c7bda54..661344e 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetitionAudit/tCompetition_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetitionAudit/tCompetition_info.js
@@ -523,7 +523,7 @@
var marker;
//搜索地图
TCarInfoDlg.searchByStationName = function(e,type){
- var keyword="成都";
+ var keyword="";
if(type==2){
keyword = $(e).parent().prev().find("input").val();
}else {
--
Gitblit v1.7.1