Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -128,7 +128,7 @@
                                             <span th:text="${dict2.title}"></span>
                                         </div>
                                         <div>
-                                            <span>使用日期：</span>
+                                            <span>适用日期：</span>
                                             <span th:text="${dict2.useStart}"></span>
                                             <span> - </span>
                                             <span th:text="${dict2.useEnd}"></span>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/memberInfo.html

@@ -126,9 +126,9 @@
                 </div>
             </table>
         </div>
-        <button type="button" class="btn btn-w-m btn-success">
-            审核记录
-        </button>
+<!--        <button type="button" class="btn btn-w-m btn-success">-->
+<!--            审核记录-->
+<!--        </button>-->
         <button type="button" class="btn btn-w-m btn-success" th:if="*{isSubmit==0}" onclick="submitHandler()">
             提交审核
         </button>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceOrderStatisticalDao.java

@@ -22,6 +22,7 @@ public class PerformanceOrderStatisticalDao {
     private BigDecimal price;
     private Integer type;
     private String useStart;
+    private String useEnd;
     private BigDecimal totalGeneral = BigDecimal.ZERO;
     private BigDecimal saleGeneral = BigDecimal.ZERO;
     private BigDecimal surplusGeneral = BigDecimal.ZERO;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -1342,6 +1342,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     orderRefundsVoBase.getStatus(), orderRefundsVoBase.getUpdatedAt(), orderRefundsId
             });
 
+            dataUtils.delOrderRefundVo(orderRefundsId);
+            dataUtils.delOrderRefundVoByOrderId(orderTicketsId);
+
             sqls.add(SqlMapping.get("kylin_order_ticket_status.withDraw"));
             sqls.add(SqlMapping.get("kylin_order_ticket_entities.withDraw"));
             sqls.add(SqlMapping.get("kylin_order_refund.withDraw"));

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -316,8 +316,8 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
                     info.setAppStatus(11);
                 }
 
-                // 票状态 6票可购买 8售罄 9未开始 10结束 11停售
-                if (info.getAppStatus() != 8 && info.getAppStatus() != 11 && 7 != info.getAppStatus() && 1 != isEnd) { // 个别状态无需再判断
+                // 票状态 3预览 6票可购买 8售罄 9未开始 10结束 11停售
+                if (3 != info.getAppStatus() && info.getAppStatus() != 8 && info.getAppStatus() != 11 && 7 != info.getAppStatus() && 1 != isEnd) { // 个别状态无需再判断
                     String sellTime = info.getSellTime();
                     if (1 == DateUtil.compareStrDay(sellTime, nowTimeStr)) {// 未开始
                         info.setAppStatus(9);
@@ -385,7 +385,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
                 }
 
                 // 票状态 6票可购买 8售罄 9未开始 10结束 11停售
-                if (7 != info.getAppStatus() && 1 != isEnd) { // 演出已结束、未上线 不展示
+                if (3 != info.getAppStatus() && 7 != info.getAppStatus() && 1 != isEnd) { // 演出已结束、未上线 不展示
                     String sellTime = info.getSellTime();
                     if (1 == DateUtil.compareStrDay(sellTime, nowTimeStr)) {// 未开始
                         info.setAppStatus(9);
@@ -442,7 +442,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             }
 
             // 票状态 6票可购买 8售罄 9未开始 10结束 11停售
-            if (info.getAppStatus() != 8 && info.getAppStatus() != 11 && 7 != info.getAppStatus()) { // 个别状态无需再判断
+            if (3 != info.getAppStatus() && info.getAppStatus() != 8 && info.getAppStatus() != 11 && 7 != info.getAppStatus()) { // 个别状态无需再判断
                 String sellTime = info.getSellTime();
                 if (1 == DateUtil.compareStrDay(sellTime, nowTimeStr)) {// 未开始
                     info.setAppStatus(9);