Memory_LG 1 settimana fa
parent
commit
1f642c4a1a

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

@@ -16,12 +16,17 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-site-add">
+
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-2 control-label is-required">名称:</label>
+                <label class="col-sm-2 control-label is-required">场馆名称:</label>
                 <div class="col-sm-4">
-                    <input name="name" class="form-control" type="text" required>
+                    <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">
                     <select name="siteType" class="form-control" th:with="type=${@dict.getType('site_type')}">
@@ -29,48 +34,51 @@
                                 th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
+
+
             </div>
         </div>
+
         <div class="col-xs-12">
             <div class="form-group">
-                <label class="col-sm-2 control-label is-required">价格:</label>
+                <label class="col-sm-2 control-label is-required">名称:</label>
                 <div class="col-sm-4">
-                    <input name="price" class="form-control" type="text" required>
+                    <input name="name" class="form-control" type="text" required>
                 </div>
-                <label class="col-sm-2 control-label is-required">温馨提示:</label>
+                <label class="col-sm-2 control-label is-required">监控点:</label>
                 <div class="col-sm-4">
-                    <input name="warmReminder" class="form-control" type="text" required>
+                    <input name="cameraIndexCode" class="form-control" type="text" required>
                 </div>
             </div>
         </div>
 
         <div class="col-xs-12">
             <div class="form-group">
-                <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 is-required">监控点:</label>
-                <div class="col-sm-4">
-                    <input name="cameraIndexCode" class="form-control" type="text" required>
+                <label class="col-sm-2 control-label is-required">温馨提示:</label>
+                <div class="col-sm-10">
+                    <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-2 control-label">封面:</label>
-                <div class="col-sm-4">
-                    <div id="image-upload-container"></div>
-                </div>
-
                 <label class="col-sm-2 control-label">简介:</label>
-                <div class="col-sm-4">
+                <div class="col-sm-10">
                     <input type="hidden" class="form-control" name="intro">
                     <div class="summernote" id="intro"></div>
                 </div>
+
+            </div>
+        </div>
+
+
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-2 control-label">封面:</label>
+                <div class="col-sm-10">
+                    <div id="image-upload-container"></div>
+                </div>
             </div>
         </div>
     </form>

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

@@ -79,10 +79,10 @@
                     title: '简介',
                     visible: false
                 },
-                {
-                    field: 'price',
-                    title: '价格'
-                },
+                // {
+                //     field: 'price',
+                //     title: '价格'
+                // },
                 {
                     field: 'warmReminder',
                     title: '温馨提示'

+ 6 - 0
qmjszx-business/src/main/java/beilv/vipCardLog/service/impl/VipCardLogServiceImpl.java

@@ -448,6 +448,9 @@ public class VipCardLogServiceImpl implements IVipCardLogService {
         Map<String, String> paymentType = DictUtils.getDictCacheToMap("payment_type");
 
         List<Map<String, Object>> maps = vipCardLogMapper.selectYueQiuList(vipCardLog);
+        if(maps.isEmpty()){
+            return maps;
+        }
 
         maps.forEach(map -> {
             map.put("orderTypeLabel", MapUtils.getString(orderType, MapUtils.getString(map, "orderType")));
@@ -462,6 +465,9 @@ public class VipCardLogServiceImpl implements IVipCardLogService {
     @Override
     public List<Map<String, Object>> selectCanSaiList(VipCardLog vipCardLog) {
         List<Map<String, Object>> maps = vipCardLogMapper.selectCanSaiList(vipCardLog);
+        if(maps.isEmpty()){
+            return maps;
+        }
         Map<String, String> orderType = DictUtils.getDictCacheToMap("order_type");
         Map<String, String> paymentType = DictUtils.getDictCacheToMap("payment_type");
         Map<String, String> competitionState = DictUtils.getDictCacheToMap("competition_state");