修改下单

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

@@ -5,6 +5,7 @@ import com.liquidnet.common.sms.constant.SmsEnum;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.base.*;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
@@ -141,7 +142,21 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             String timeStart = ticketData.getTimeStart(); // 普通开售时间
             String timeEnd = ticketData.getTimeEnd(); // 购票停售时间
             String timeExpressEnd = ticketData.getTimeEndExpress(); // 快递停售时间
-            boolean isMember = orderUtils.isMember(uid);//feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
+            AdamUserMemberVo memberData = orderUtils.isMember(uid);
+            Boolean isMember;
+            Boolean isOldMember;
+            if (memberData == null) {
+                isMember = false;
+                isOldMember = false;
+            } else {
+                isMember = true;
+                if (memberData.isOldMember()) {
+                    isOldMember = true;
+                } else {
+                    isOldMember = false;
+                }
+            }
+
             int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
             if (ticketData.getIsExclusive() == 1) {
                 memberType = 2;
@@ -179,10 +194,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
             //通用判断时间
             if (payOrderParam.getAdvanceCode() != null) {
-                advanceMap = orderUtils.useCoupon(payOrderParam.getAdvanceCode(), "购买 "+performanceData.getTitle(), BigDecimal.ZERO,payOrderParam.getPerformanceId(),payOrderParam.getTimeId(),payOrderParam.getTicketId());
-                Integer typeVoucher = (Integer) advanceMap.get("type");
-                if (typeVoucher.equals(-1)) {
-                    return ResponseDto.failure("优先券券不可用");
+                if (isOldMember) {
+
+                } else {
+                    advanceMap = orderUtils.useCoupon(payOrderParam.getAdvanceCode(), "购买 " + performanceData.getTitle(), BigDecimal.ZERO, payOrderParam.getPerformanceId(), payOrderParam.getTimeId(), payOrderParam.getTicketId());
+                    Integer typeVoucher = (Integer) advanceMap.get("type");
+                    if (typeVoucher.equals(-1)) {
+                        return ResponseDto.failure("优先券券不可用");
+                    }
                 }
             }
 
@@ -205,11 +224,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             //快递票判断
             if (payOrderParam.getIsExpress() != null) {
                 if (payOrderParam.getIsExpress() == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeExpressEnd) == 1) {
-                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
+                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                     return ResponseDto.failure(ErrorMapping.get("20013"));//快递票不卖
                 }
                 if (payOrderParam.getIsExpress() == 1 && payOrderParam.getAddressId().isEmpty()) {
-                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
+                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                     return ResponseDto.failure(ErrorMapping.get("20014"));//快递票未填写收货地址
                 }
             }

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

@@ -144,13 +144,17 @@ public class OrderUtils {
         return surplusGeneral;
     }
 
-    public boolean isMember(String uid) {
+    public AdamUserMemberVo isMember(String uid) {
 //        String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null);
 //        AdamUserMemberVo vo = JsonUtils.fromJson(resultData, AdamUserMemberVo.class);
 
         String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
         AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
-        return null != vo && vo.isActive();
+        if(null != vo && vo.isActive()){
+            return vo;
+        }else{
+            return null;
+        }
     }