修改下单 提示和增加回滚库存文案

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

@@ -250,11 +250,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
             //实名判断
-            if (isTrueName == 1 && payOrderParam.getEnterIdList().size() <= 0) {
+            if (isTrueName == 1 && (payOrderParam.getEnterIdList() == null || payOrderParam.getEnterIdList().size() <= 0)) {
                 orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                 return ResponseDto.failure(ErrorMapping.get("20015"));//需要实名 未实名
             }
-            if (isTrueName == 1 && payOrderParam.getEnterIdList().size() != payOrderParam.getNumber()) {
+            if (isTrueName == 1 && (payOrderParam.getEnterIdList() == null || payOrderParam.getEnterIdList().size() != payOrderParam.getNumber())) {
                 orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                 return ResponseDto.failure(ErrorMapping.get("20015"));//入场人数量错误
             }
@@ -281,6 +281,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                         }
                         entersVoList.add(adamEnters);
                         if (isStudent == 1) {
+                            if (adamEnters.getType() != 1) {
+                                orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
+                                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
+                                return ResponseDto.failure(ErrorMapping.get("20031"));//不符合购买条件
+                            }
                             int age = IDCard.getAgeByIdCard(adamEnters.getIdCard());
                             if (age > 25) {
                                 orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
@@ -318,6 +323,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             log.error("Kylin Order Pay Error = {}", e);
             if (isDownGeneral) {
                 orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
+                log.error("回滚库存");
                 orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                 for (AdamEntersVo enters : entersVoList) {
                     dataUtils.changeBuyInfo(uid, enters.getIdCard(), payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), -1);

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

@@ -152,9 +152,9 @@ public class OrderUtils {
 
         String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
         AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
-        if(null != vo && vo.isActive()){
+        if (null != vo && vo.isActive()) {
             return vo;
-        }else{
+        } else {
             return null;
         }
     }
@@ -175,6 +175,9 @@ public class OrderUtils {
 //        });
         String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
         List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk);
+        if (vos == null) {
+            return null;
+        }
         return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }
 
@@ -199,12 +202,12 @@ public class OrderUtils {
 
         MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
         header.add("Authorization", "Bearer " + CurrentUtil.getToken());
-        log.info("url="+candyUrl + "/candy-coupon/use");
-        log.info("params="+JSON.toJSONString(params));
+        log.info("url=" + candyUrl + "/candy-coupon/use");
+        log.info("params=" + JSON.toJSONString(params));
         String returnData = HttpUtil.post(candyUrl + "/candy-coupon/use", params, header);
         InnerReturnVo<CandyUseResultVo> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<InnerReturnVo<CandyUseResultVo>>() {
         });
-        log.info("returnData="+returnData);
+        log.info("returnData=" + returnData);
         CandyUseResultVo candyUseResultVo = innerReturnVo.getData();
         Integer type = candyUseResultVo.getCouType();
         BigDecimal value = candyUseResultVo.getValue();
@@ -231,11 +234,11 @@ public class OrderUtils {
         }
         HashMap<String, Object> hashMap = CollectionUtil.mapStringObject();
         hashMap.put("type", type);
-        hashMap.put("voucher", voucher.setScale(2,BigDecimal.ROUND_HALF_UP));
+        hashMap.put("voucher", voucher.setScale(2, BigDecimal.ROUND_HALF_UP));
         return hashMap;
     }
 
-    public void backAdvanceCoupon(String advanceCode,String uid) {
+    public void backAdvanceCoupon(String advanceCode, String uid) {
         if (advanceCode != null) {
             backCoupon(advanceCode.toString(), uid);
         }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/errors.properties

@@ -34,6 +34,7 @@
 20027=您已支付请刷新再试
 20029=未选择支付方式
 20030=券不可用
+20031=不符合购买条件
 
 #APP PARTNER
 20101=添加失败