Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundSearchParam.java

@@ -19,6 +19,7 @@ import java.time.LocalDateTime;
 @Data
 public class RefundSearchParam implements Serializable {
     private String orderTicketsId;
+    private String performancesId;
 
     private String orderRefundCode;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderRefundListVo.java

@@ -10,5 +10,5 @@ public class OrderRefundListVo {
     private String orderRefundCode;
     private Integer status;
     private BigDecimal price;
-    private String applicantId;
+    private Integer isMine;
 }

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

@@ -11,8 +11,8 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <label>订单ID：</label>
-                            <input type="text" name="orderTicketsId"/>
+                            <label>演出ID：</label>
+                            <input type="text" name="performancesId"/>
                         </li>
                         <li>
                             <label>订单编号：</label>
@@ -200,8 +200,8 @@
                     title: '退款ID'
                 },
                 {
-                    field: 'orderTicketsId',
-                    title: '订单ID'
+                    field: 'performanceTitle',
+                    title: '演出名称'
                 },
                 {
                     field: 'orderCode',

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

@@ -66,6 +66,8 @@ public class OrderRefundDao implements Serializable {
 
     private String orderCode;
 
+    private String performanceTitle;
+
     public void setStatusName(Integer status){
         this.status=status;
         switch (status){

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml

@@ -34,13 +34,17 @@
         <result column="created_at" property="createdAt"/>
     </resultMap>
     <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
-        SELECT a.*, b.order_code
+        SELECT a.*, b.order_code, b.performance_title
         FROM kylin_order_refunds AS a
         JOIN kylin_order_tickets AS b ON a.order_tickets_id = b.order_tickets_id
+        JOIN kylin_order_ticket_relations AS c ON a.order_tickets_id = c.order_id
         <where>
             <if test="orderTicketsId!=''">
                 AND a.order_tickets_id = #{orderTicketsId}
             </if>
+            <if test="performancesId!=''">
+                AND c.performance_id = #{performancesId}
+            </if>
             <if test="orderCode!=''">
                 AND b.order_code = #{orderCode}
             </if>

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

@@ -208,7 +208,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     data.setOrderRefundsId(item.getOrderRefundsId());
                     data.setStatus(item.getStatus());
                     data.setPrice(item.getPrice());
-                    data.setApplicantId(uid.equals(item.getApplicantId())?"1":"0");
+                    data.setIsMine(uid.equals(item.getApplicantId())?1:0);
                     if (item.getStatus().equals(0) || item.getStatus().equals(1) || item.getStatus().equals(7) || item.getStatus().equals(3) || item.getStatus().equals(4)) {
                         lockPrice = lockPrice.add(item.getPrice());
                     }

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

@@ -225,6 +225,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         info.put("field_name", performancesInfo.getFieldName());
         info.put("title", performancesInfo.getTitle());
         info.put("appStatus", performancesInfo.getAppStatus());
+        info.put("buySwitch", dataUtils.getSwitch());
 
         HashMap result = new HashMap();
         result.put("performancesInfo", info);

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
@@ -432,4 +433,9 @@ public class DataUtils {
         }
     }
 
+    public Integer getSwitch() {
+        Integer i = (Integer) redisUtil.get(AdamRedisConst.SWITCH_BUY_MEMBER);
+        return null == i ? 1 : i;
+    }
+
 }