java/PlayPai.git

			@@ -33,7 +33,7 @@
			a.opponentScore,
			DATE_FORMAT(a.startTime, '%Y-%m-%d %H:%i') as startTime,
			a.matchResult,
			(a.participationIntegral + a.winIntegral) as award
			(a.participationIntegral + a.winIntegral+a.drawIntegral+a.loseIntegral) as award
			from t_world_cup_competitor a
			left join t_world_cup b on (a.worldCupId = b.id)
			where a.matchResult is not null and a.participantId = #{item.id} and a.participantType = #{item.isStudent}
			@@ -351,6 +351,9 @@
			left join t_world_cup_payment b on (a.worldCupPaymentId = b.id)
			left join t_world_cup c on (b.worldCupId = c.id)
			where a.participantId = #{item.id} and b.payStatus = 2 and b.refundTime is null and b.state = 1
			<if test="null != item.name">
			and c.name like CONCAT('%', #{item.name}, '%')
			</if>
			order by a.createTime desc
			</select>
			</mapper>

			@@ -22,6 +22,7 @@
			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.CompetitionUser;
			@@ -288,6 +289,12 @@
			for (int i = 0; i < jsonArray.size(); i++) {
			JSONObject jsonObject = jsonArray.getJSONObject(i);
			Integer id = jsonObject.getInteger("id");

			TStudent tStudent = studentClient.queryById(id);
			if(tStudent==null \|\| tStudent.getIdCard()==null \|\| "".equals(tStudent.getIdCard())){
			return ResultUtil.error("选择人员未进行实名认证!");
			}

			Integer isStudent = jsonObject.getInteger("isStudent");
			UserCompetition userCompetition = new UserCompetition();
			userCompetition.setAppUserId(uid);

			@@ -242,10 +242,9 @@
			@}
			</div>
			</div>

			<div style="font-size: x-large;">赛事比赛板块</div>
			<div style="font-size: x-large; display: none" >赛事比赛板块</div>
			@for(obj in worldCupStores){
			<div class="row">
			<div class="row " style="display: none" >
			<input hidden name="cupId" value="${obj.id}">
			<input hidden name="backgroundImage" value="${obj.backgroundImage}">
			<input hidden name="isOpen" value="${obj.isOpen}">

	cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史