Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamUserInfoParam.java

@@ -39,6 +39,6 @@ public class AdamUserInfoParam implements java.io.Serializable {
     @Size(max = 255)
     private String signature;
     @ApiModelProperty(position = 18, required = true, value = "标签[500]", example = "[{\"val\":\"MMS01\",\"desc\":\"民歌\",\"tagVos\":[{\"val\":\"MMS0101\",\"desc\":\"A\"},{\"val\":\"MMS0102\",\"desc\":\"B\"}]},{\"val\":\"MMS02\",\"desc\":\"house\",\"tagVos\":[{\"val\":\"MMS0201\",\"desc\":\"C\"}]}]")
-    @NotNull
+//    @NotNull
     private List<AdamTagParentVo> tagMe;
 }

liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-handler-service/src/main/java/com/liquidnet/common/exception/RestControllerAdviceHandler.java

@@ -56,7 +56,7 @@ public class RestControllerAdviceHandler {
         if (rex instanceof MethodArgumentNotValidException) {
             MethodArgumentNotValidException ygex = (MethodArgumentNotValidException) rex;
             FieldError fieldError = ygex.getBindingResult().getFieldErrors().get(0);
-            String message = fieldError.getField() + fieldError.getDefaultMessage();
+            String message = fieldError.getField() + " " + fieldError.getDefaultMessage();
             return new ResponseEntity<Error>(new Error(ErrorCode.HTTP_PARAM_ERROR.getCode(), message), HttpStatus.OK);
         }
         if (rex instanceof LiquidnetFeignException) {

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

@@ -381,8 +381,8 @@
                 SELECT
                     kotr.performance_id AS 'performance_id',
                     kotr.ticket_id,
-                    sum(kot.number) AS 'total_sale_general' ,
-                    sum(kot.price_actual) AS 'total_sale_price',
+                    (sum(kot.number)- sum(kot.refund_number)) AS 'total_sale_general' ,
+                    (sum(kot.price_actual) - sum(kot.price_refund)) AS 'total_sale_price',
                     sum(kot.refund_number) as 'total_refund_general',
                     sum(kot.price_refund) as 'total_refund_price',
                     sum(case when kotr.is_member = 1 then kot.number else 0 end) total_member_number,
@@ -391,7 +391,9 @@
                     kylin_order_ticket_relations kotr
                         inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
                         inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
-                WHERE kotr.performance_id = ${performancesId} and (kots.`status` = 0 OR kots.`status` = 1)
+                WHERE 1>0 and kotr.performance_id = ${performancesId}
+                  and kots.`status` in(1,3,4) and kot.coupon_type ='no'
+                group by kotr.performance_id,kotr.ticket_id
             ) AS ot ON ot.performance_id = kp.performances_id
                 inner join kylin_tickets kt on kt.tickets_id = ot.ticket_id
                 inner join kylin_ticket_status kts on kts.ticket_id = kt.tickets_id