Merge branch 'test'

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

@@ -89,9 +89,13 @@ public class AdamMemberOrderController {
             return ResponseDto.failure(ErrorMapping.get("10213"));
         }
 
+        AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
+        if (null == userMemberVo || !userMemberVo.isActive()) {
+            // 当前用户非会员或会员已过期时，购买会员时会受系统配置[开放/限制购买会员]限制
             if (1 != adamRdmService.getSwitch(AdamRedisConst.SWITCH_BUY_MEMBER)) {
                 return ResponseDto.failure(ErrorMapping.get("10215"));
             }
+        }
 
         AdamRealInfoVo realInfoVo = adamRdmService.getRealInfoVoByUid(currentUid);
         if (null == realInfoVo) {

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

@@ -990,7 +990,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
                     LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
                     LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)) {
+                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && !orderTicketVo.getExpressAddress().trim().equals("")) {
                         vo.setIsCanRefund(1);
                     } else {
                         vo.setIsCanRefund(0);