场地管理增加观看点配置

赛事发布关联场地信息

qmjszx-admin/src/main/java/beilv/web/controller/bootacourse/bootACourseController.java

@@ -202,7 +202,6 @@ public class bootACourseController extends BaseController {
      */
     @PostMapping("/remofeCourse")
     public AjaxResult remofeCourse(@RequestBody BootACourseBO courseBo) {
-        courseBo.setUserId(courseBo.getUserId());
         //通过orderId查询订单信息
         BootACourse course = courseService.getCourseInfo(courseBo);
 
@@ -224,16 +223,15 @@ public class bootACourseController extends BaseController {
             ticketService.updateBeilvAdmissionTicket(admissionTicket);
 
             //修改订单信息状态为退款,
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             course.setRefundTime(new Date());
             course.setRefundInstructions(courseBo.getRefundInstructions());
             course.setPaymentStatus("payment_status_refunded");
             return toAjax(courseService.updateCourse(course));
         } else {
-            if (course.getRefund().after(new Date())) {
-                return AjaxResult.error("当前订单超过最晚退单时间, 不允许退单");
-            } else if ("payment_status_verification".equals(course.getPaymentStatus())) {
+            if ("payment_status_verification".equals(course.getPaymentStatus())) {
                 return AjaxResult.error("订单已核销");
+            } else if (course.getRefund().after(new Date())) {
+                return AjaxResult.error("当前订单超过最晚退单时间, 不允许退单");
             }
             return AjaxResult.error("未知原因退款失败!");
         }

qmjszx-admin/src/main/java/beilv/web/controller/competition/CompetitionController.java

@@ -7,6 +7,8 @@ import java.util.stream.Collectors;
 
 import beilv.competition.domain.Competition;
 import beilv.competition.service.ICompetitionService;
+import beilv.site.domain.BeilvSite;
+import beilv.site.service.IBeilvSiteService;
 import beilv.stadium.domain.Stadium;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,9 @@ public class CompetitionController extends BaseController {
     @Autowired
     private ICompetitionService competitionService;
 
+    @Autowired
+    private IBeilvSiteService siteService;
+
     @RequiresPermissions("system:competition:view")
     @GetMapping()
     public String competition() {
@@ -69,7 +74,9 @@ public class CompetitionController extends BaseController {
      */
     @RequiresPermissions("system:competition:add")
     @GetMapping("/add")
-    public String add() {
+    public String add( ModelMap mmap) {
+        List<BeilvSite> allToList = siteService.getAllToList();
+        mmap.put("siteList",allToList);
         return prefix + "/add";
     }
 

qmjszx-admin/src/main/resources/templates/competition/add.html

@@ -43,8 +43,11 @@
                 </div>
                 <label class="col-sm-2 control-label">场地：</label>
                 <div class="col-sm-4">
-                    <input name="competitionPlace" class="form-control" type="text" placeholder="请输入场地名称" maxlength="50">
+                    <select name="competitionPlace" class="form-control">
+                        <option th:each="site : ${siteList}" th:value="${site.id}" th:text="${site.name}"></option>
+                    </select>
                 </div>
+                    <!--<input name="competitionPlace" class="form-control" type="text" placeholder="请输入场地名称" maxlength="50">-->
             </div>
         </div>
         <div class="col-xs-12">

qmjszx-admin/src/main/resources/templates/system/site/add.html

@@ -18,16 +18,12 @@
     <form class="form-horizontal m" id="form-site-add">
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">名称：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label is-required">名称：</label>
+                <div class="col-sm-4">
                     <input name="name" class="form-control" type="text" required>
                 </div>
-            </div>
-        </div>
-        <div class="col-xs-12">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">分类：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">分类：</label>
+                <div class="col-sm-4">
                     <select name="siteType" class="form-control" th:with="type=${@dict.getType('site_type')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                 th:value="${dict.dictValue}"></option>
@@ -37,52 +33,49 @@
         </div>
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">价格：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label is-required">价格：</label>
+                <div class="col-sm-4">
                     <input name="price" class="form-control" type="text" required>
                 </div>
-            </div>
-        </div>
-        <div class="col-xs-12">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">温馨提示：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label is-required">温馨提示：</label>
+                <div class="col-sm-4">
                     <input name="warmReminder" class="form-control" type="text" required>
                 </div>
             </div>
         </div>
+
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">场馆名称：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label is-required">场馆名称：</label>
+                <div class="col-sm-4">
                     <select name="venueId" class="form-control">
                         <option th:each="post:${beilvSitesList}" th:value="${post.id}"
                                 th:text="${post.venueName}"></option>
                     </select>
                 </div>
+                <label class="col-sm-2 control-label">监控点：</label>
+                <div class="col-sm-4">
+                    <input name="cameraIndexCode" class="form-control" type="text">
+                </div>
             </div>
         </div>
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-3 control-label">封面：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">封面：</label>
+                <div class="col-sm-4">
                     <input type="hidden" name="cover">
                     <div class="file-loading">
                         <input class="form-control file-upload" id="cover" name="file" type="file" >
                     </div>
                 </div>
-            </div>
-        </div>
-        <div class="col-xs-12">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">简介：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">简介：</label>
+                <div class="col-sm-4">
                     <input type="hidden" class="form-control" name="intro">
                     <div class="summernote" id="intro"></div>
                 </div>
             </div>
         </div>
-
     </form>
 </div>
 <th:block th:include="include :: footer"/>

qmjszx-admin/src/main/resources/templates/system/site/edit.html

@@ -20,16 +20,12 @@
         <input name="id" th:field="*{id}" type="hidden">
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">名称：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label is-required">名称：</label>
+                <div class="col-sm-4">
                     <input name="name" th:field="*{name}" class="form-control" type="text" required>
                 </div>
-            </div>
-        </div>
-        <div class="col-xs-12">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">分类：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">分类：</label>
+                <div class="col-sm-4">
                     <select name="siteType" class="form-control" th:with="type=${@dict.getType('site_type')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
                                 th:field="*{siteType}"></option>
@@ -40,24 +36,20 @@
 
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">价格：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label is-required">价格：</label>
+                <div class="col-sm-4">
                     <input name="price" th:field="*{price}" class="form-control" type="text" required>
                 </div>
-            </div>
-        </div>
-        <div class="col-xs-12">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">温馨提示：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label is-required">温馨提示：</label>
+                <div class="col-sm-4">
                     <input name="warmReminder" th:field="*{warmReminder}" class="form-control" type="text" required>
                 </div>
             </div>
         </div>
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">场馆名称：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label is-required">场馆名称：</label>
+                <div class="col-sm-4">
                     <select name="venueId" class="form-control" th:value="${beilvSite.venueId}">
                         <option th:each="post:${beilvSitesList}"
                                 th:value="${post.id}"
@@ -66,23 +58,23 @@
                         </option>
                     </select>
                 </div>
+                <label class="col-sm-2 control-label">监控点：</label>
+                <div class="col-sm-4">
+                    <input name="cameraIndexCode" th:field="*{cameraIndexCode}" class="form-control" type="text">
+                </div>
             </div>
         </div>
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-3 control-label">封面：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">封面：</label>
+                <div class="col-sm-4">
                     <input type="hidden" name="cover" th:field="*{cover}">
                     <div class="file-loading">
                         <input class="form-control file-upload" id="cover" name="file" type="file">
                     </div>
                 </div>
-            </div>
-        </div>
-        <div class="col-xs-12">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">简介：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">简介：</label>
+                <div class="col-sm-4">
                     <input type="hidden" class="form-control" th:field="*{intro}">
                     <div class="summernote" id="intro"></div>
                 </div>

qmjszx-business/src/main/java/beilv/stadium/domain/Stadium.java

@@ -84,5 +84,6 @@ public class Stadium {
     private String viewingTicket;
     private String competitionImg;
     private String paymentStatusLabel;
-
+    private String competitionPlace;
+    private String cameraIndexCode;
 }

qmjszx-business/src/main/resources/mapper/competition/CompetitionMapper.xml

@@ -33,16 +33,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCompetitionVo">
-        select id, competition_title, competition_type, person_max, team_max,
-               competition_place, apply_start_time, apply_end_time, apply_before_time,
-               competition_maximum, competition_expense, viewing_ticket,
-               competition_details, registration_notes, competition_state,
-               create_time, create_by, create_name, update_time, update_by, update_name, publish_time, publish_by, publish_name,competition_img
-        from beilv_competition
+        select a.id, a.competition_title, a.competition_type, a.person_max, a.team_max,
+               a.competition_place, a.apply_start_time, a.apply_end_time, a.apply_before_time,
+               a.competition_maximum, a.competition_expense, a.viewing_ticket,
+               a.competition_details, a.registration_notes, a.competition_state,
+               a.create_time, a.create_by, a.create_name, a.update_time, a.update_by, a.update_name, a.publish_time, a.publish_by, a.publish_name, a.competition_img
+        from beilv_competition a
     </sql>
 
     <select id="selectCompetitionList" parameterType="Competition" resultMap="CompetitionResult">
-        <include refid="selectCompetitionVo"/>
+        select a.id, a.competition_title, a.competition_type, a.person_max, a.team_max,
+        bs.name as competition_place, a.apply_start_time, a.apply_end_time, a.apply_before_time,
+        a.competition_maximum, a.competition_expense, a.viewing_ticket,
+        a.competition_details, a.registration_notes, a.competition_state,
+        a.create_time, a.create_by, a.create_name, a.update_time, a.update_by, a.update_name, a.publish_time, a.publish_by, a.publish_name, a.competition_img
+        from beilv_competition a
+        left join beilv_site bs on a.competition_place = bs.id
         <where>  
             <if test="competitionTitle != null  and competitionTitle != ''"> and competition_title like concat('%', #{competitionTitle}, '%')</if>
             <if test="competitionType != null  and competitionType != ''"> and competition_type = #{competitionType}</if>

qmjszx-business/src/main/resources/mapper/stadium/StadiumMapper.xml

@@ -24,6 +24,8 @@
         <result property="competitionExpense" column="competition_expense"/>
         <result property="viewingTicket" column="viewing_ticket"/>
         <result property="competitionImg" column="competition_img"/>
+        <result property="competitionPlace" column="competition_place"/>
+        <result property="cameraIndexCode" column="camera_index_code"/>
     </resultMap>
 
 
@@ -83,9 +85,11 @@
         select
         ar.id, ar.user_id, ar.contact_people, ar.contact_number, ar.registration_time, ar.payment_time,
         ar.cancellation_time, ar.refund_time, ar.payment_status, ar.order_id, ar.competition_id, ar.order_type, ar.refund_instructions,
-        ar.verification_time, ar.amount_actually_paid ,bc.competition_title, bc.competition_expense, bc.viewing_ticket, bc.competition_img
+        ar.verification_time, ar.amount_actually_paid ,bc.competition_title, bc.competition_expense, bc.viewing_ticket, bc.competition_img,
+        bs.name as competition_place, bs.camera_index_code
         from beilv_book_a_race ar
         left join beilv_competition bc on ar.competition_id = bc.id
+        left join beilv_site bs on bc.competition_place = bs.id
         <where>
             <if test="userId != null and userId != ''">
                 and ar.user_id = #{userId}