Merge branch 'dev' into test

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

 package com.liquidnet.service.kylin.dto.param;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,13 +15,32 @@ import java.time.LocalDateTime;
 
 @Data
 public class RefundCallbackParam implements Serializable {
-    @ApiModelProperty(value = "状态", example = "")
+    /**
+     * 0失败 1成功
+     */
     private Integer status;
 
+    /**
+     * 订单表数据
+     */
     private String order_code;
 
     private String code;
 
+    private String type;
+
+    private double price;
+
+    private String payment_type;
+
+    private String payment_at;
+
+    private String payment_id;
+
+
+    /**
+     * 退款表数据
+     */
     private String order_refund_code;
 
     private String refund_code;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -138,12 +138,17 @@ public class PerformanceVoUtils {
                         }
                     }
 
+                    if(kylinTicketVoItem.getStatus()==7){
+                        status = 7;
+                    }
                     //修改票状态
                     KylinTicketStatus changeStatus = new KylinTicketStatus();
                     changeStatus.setStatus(status);
                     if (surplusGeneral != -1) {
                         changeStatus.setSurplusGeneral(surplusGeneral);
                     }
+
+
                     ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", kylinTicketVoItem.getTicketsId()));
                     kylinTicketVoItem.setStatus(status);
 
@@ -159,6 +164,11 @@ public class PerformanceVoUtils {
                     }
                 }
             }
+
+            if(vo.getAppStatus()==7){
+                appStatus=7;
+            }
+
             //修改演出状态
             KylinPerformanceStatus changeStatus = new KylinPerformanceStatus();
             changeStatus.setStatus(appStatus);

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

@@ -42,7 +42,7 @@
         <where>
             AND a.order_tickets_id = #{orderTicketsId}
             AND a.status = ${orderRefundStatus}
-            AND b.order_ticket_entities_id = #{orderTicketEntitiesId}
+            AND b.order_ticket_entities_id = #{entitiesId}
         </where>
     </select>
 </mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -653,7 +653,7 @@ CREATE TABLE `kylin_order_refunds`
     `mid`                       int unsigned   NOT NULL AUTO_INCREMENT,
     `order_refunds_id`          varchar(255)   NOT NULL DEFAULT '' COMMENT 'order_refunds_id',
     `order_tickets_id`          varchar(255)   NOT NULL DEFAULT '' COMMENT '票务订单id',
-    `order_refund_code`         varchar(50)    NOT NULL COMMENT '退款编号',
+    `order_refund_code`         varchar(50)    NOT NULL COMMENT '退款编号 order_code + 001编号',
     `order_refund_batches_id`   varchar(255)   NOT NULL DEFAULT '' COMMENT '批量退款id',
     `refund_code`               varchar(50)    NOT NULL DEFAULT '' COMMENT '退款中心退款编号',
     `refund_at`                 timestamp      NULL     DEFAULT NULL COMMENT '成功退款时间',

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

@@ -187,7 +187,7 @@ public class DataImpl {
                         performancePartnerVo.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(performances.getTimeStart()));
                         performancePartnerVo.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(performances.getTimeEnd()));
                         performancePartnerVo.setFieldId(performanceRelations.getFieldId());
-//                        performancePartnerVo.setFieldName(performances.getFieldName());
+                        performancePartnerVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + orderTicketRelations.getPerformanceId(), "name"));
                         performancePartnerVo.setNotice(performances.getNotice());
                         performancePartnerVo.setSponsorId(performances.getSponsorId());
                         performancePartnerVo.setSponsorType(performances.getSponsorType());

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

@@ -192,7 +192,6 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
         kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
         kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
-        kylinOrderRefunds.setRefundError(refundCallbackParam.getRefund_error());
         kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
         kylinOrderRefundsMapper.update(
                 kylinOrderRefunds,

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

@@ -146,6 +146,10 @@ public class PerformanceVoTask {
                         }
                     }
 
+                    if(kylinTicketVoItem.getStatus()==7){
+                        status = 7;
+                    }
+
                     //修改票状态
                     KylinTicketStatus changeStatus = new KylinTicketStatus();
                     changeStatus.setStatus(status);