Merge branch 'pre' into 'master'

Pre

See merge request !53

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

@@ -36,6 +36,7 @@
                             WHERE 1 > 0
                               and kotr.performance_id = ${performanceId}
                             and kots.`status` in (1, 3, 6)
+                            and kots.transfer_status in('0','1','3','5')
                             and kot.coupon_type = 'no'
                             group by kotr.performance_id,ca.province
                         ) x order by x.total_number desc
@@ -55,6 +56,7 @@
                                     left join sys_dict_id_card_area ca on substr(kote.enter_id_code,1,6) = ca.code
                             WHERE 1>0 and kotr.performance_id = #{performanceId}
                               and kots.`status` in(1,3,6)
+                              and kots.transfer_status in('0','1','3','5')
                               and kot.coupon_type ='no'
                             group by kotr.performance_id,ca.pre_city
                         ) x order by x.total_number desc
@@ -72,6 +74,7 @@
                           WHERE 1 > 0
                             and kotr.performance_id = #{performanceId}
                             and kots.`status` in (1, 3, 6)
+                            and kots.transfer_status in('0','1','3','5')
                             and kot.coupon_type = 'no'
                             and length(kote.enter_id_code)=18
                           group by kotr.performance_id, substr(curdate(), 1, 4) - substr(kote.enter_id_code, 7, 4)
@@ -89,6 +92,7 @@
                                                     WHERE 1 > 0
                                                       and kotr.performance_id  = ${performanceId}
                                                       and kots.`status` in (1, 3, 6)
+                                                      and kots.transfer_status in('0','1','3','5')
                                                       and kot.coupon_type = 'no'
                                                       and length(kote.enter_id_code)=18
                                                 )x group by x.sex

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -201,10 +201,11 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
         if (1 == shotMemberOrderVo.getState() || 3 == shotMemberOrderVo.getState()) {
             return ResponseDto.failure(ErrorMapping.get("10502"), parameter);
         }
-        if (parameter.getPrice().compareTo(shotMemberOrderVo.getPrice()) != 0) {
-            // 订单金额比对
-            return ResponseDto.failure(ErrorMapping.get("10503"), parameter);
-        }
+        // 因不同阶段用户购买金额不一样，这里不方便判断实际取值，停用金额校验
+//        if (parameter.getPrice().compareTo(shotMemberOrderVo.getPrice()) != 0) {
+//            // 订单金额比对
+//            return ResponseDto.failure(ErrorMapping.get("10503"), parameter);
+//        }
         AdamMemberPriceVo memberPriceVo = adamRdmService.getMemberPriceVoByPriceId(
                 shotMemberOrderVo.getMemberId(), shotMemberOrderVo.getMemberPriceId());
         if (null == memberPriceVo) {