除会员相关 其他测试完成

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

@@ -168,18 +168,20 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             String timeExpressEnd = ticketData.getTimeEndExpress(); // 快递停售时间
             //获取用户相关
 //            AdamRscPolymer01Vo userVo = orderUtils.adamAddressEnterMember(uid, null, null);
-            List<AdamEntersVo> entersVos;
             AddressVo addressesVo = payOrderParam.getAddressesVo();
             boolean isOldMember;
             boolean isMember;
             Integer result = orderUtils.getMember(uid);
-            if(result.equals(1)){
+            if (result == null) {
+                isMember = false;
+                isOldMember = false;
+            } else if (result.equals(1)) {
                 isMember = true;
                 isOldMember = false;
-            }else if(result.equals(2)){
+            } else if (result.equals(2)) {
                 isMember = true;
                 isOldMember = true;
-            }else{
+            } else {
                 isMember = false;
                 isOldMember = false;
             }
@@ -187,14 +189,18 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 //            if (userVo == null) {
 //                return ResponseDto.failure(ErrorMapping.get("20016"));//没抢到
 //            } else {
-                entersVos = orderUtils.getEnterList(payOrderParam.getEnterIdList(), uid);
-                if (entersVos.size() != payOrderParam.getEnterIdList().size()) {
+            if (payOrderParam.getEnterIdList() != null) {
+                entersVoList = orderUtils.getEnterList(payOrderParam.getEnterIdList(), uid);
+                if (entersVoList.size() != payOrderParam.getEnterIdList().size()) {
                     return ResponseDto.failure(ErrorMapping.get("20016"));//没抢到
                 }
-                if (payOrderParam.getIsExpress() == 1) {
-                    payOrderParam.setAdCode(addressesVo.getCountyId());
-                    log.error("[快递地址异常]");
-                }
+            } else {
+                entersVoList = ObjectUtil.cloneArrayListObject();
+            }
+            if (payOrderParam.getIsExpress() == 1) {
+                payOrderParam.setAdCode(addressesVo.getCountyId());
+                log.error("[快递地址异常]");
+            }
 //                switch (userVo.getMembership()) {
 //                    case 10:
 //                        isMember = true;
@@ -286,7 +292,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                     return ResponseDto.failure(ErrorMapping.get("20013"));//快递票不卖
                 }
-                if (payOrderParam.getIsExpress() == 1 && payOrderParam.getAddressesVo()==null) {
+                if (payOrderParam.getIsExpress() == 1 && payOrderParam.getAddressesVo() == null) {
                     orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                     return ResponseDto.failure(ErrorMapping.get("20014"));//快递票未填写收货地址
                 }
@@ -314,7 +320,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 //学生票 判断
                 entersVoList = ObjectUtil.cloneArrayListObject();
                 if (isTrueName == 1) {
-                    for (AdamEntersVo adamEnters : entersVos) {
+                    for (AdamEntersVo adamEnters : entersVoList) {
                         if (adamEnters == null) {
                             orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
                             orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -193,17 +193,20 @@ public class OrderUtils {
             if (entersVo == null) {
                 unExists.add(enterId);
             } else {
+                entersVo.setUid(uid);
                 if (entersVo.getUid().equals(uid)) {
                     list.add(entersVo);
                 }
             }
         }
         try {
-            ResponseDto<List<AdamEntersVo>> res = adamBaseClient.querysEnters(unExists, uid);
-            List<AdamEntersVo> entersVoList = res.getData();
-            for (AdamEntersVo vo : entersVoList) {
-                dataUtils.setEnterVo(vo);
-                list.add(vo);
+            if (unExists.size() > 0) {
+                ResponseDto<List<AdamEntersVo>> res = adamBaseClient.querysEnters(unExists, uid);
+                List<AdamEntersVo> entersVoList = res.getData();
+                for (AdamEntersVo vo : entersVoList) {
+                    dataUtils.setEnterVo(vo);
+                    list.add(vo);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();