Merge remote-tracking branch 'origin/dev' into dev

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

@@ -62,25 +62,25 @@ public class AdamEntersController {
                 break;
             case 2:
                 if (!Pattern.matches(LnsRegex.Valid.CN_ID_CARD_HM, parameter.getIdCard())) {
-                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "港澳居民来往内地通行证号码不合规");
+                    return ResponseDto.failure(ErrorMapping.get("10107"));
                 }
                 break;
             case 3:
                 if (!Pattern.matches(LnsRegex.Valid.CN_ID_CARD_TW, parameter.getIdCard())) {
-                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "台湾居民来往大陆通行证号码不合规");
+                    return ResponseDto.failure(ErrorMapping.get("10108"));
                 }
                 break;
             case 4:
                 if (Pattern.matches(LnsRegex.Valid.CN_ID_CARD_PP, parameter.getIdCard())) {
-                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "不支持中国大陆护照");
+                    return ResponseDto.failure(ErrorMapping.get("10109"));
                 }
                 if (!Pattern.matches(LnsRegex.Valid.CN_ID_CARD_PP_NON, parameter.getIdCard())) {
-                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "护照号码不合规");
+                    return ResponseDto.failure(ErrorMapping.get("10110"));
                 }
                 break;
             case 5:
                 if (!Pattern.matches(LnsRegex.Valid.CN_ID_CARD_MO, parameter.getIdCard())) {
-                    return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "军官证号不合规");
+                    return ResponseDto.failure(ErrorMapping.get("10111"));
                 }
                 break;
         }

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

@@ -31,6 +31,11 @@
 10104=身份证号码不合规
 10105=入场人不存在
 10106=收获地址不存在
+10107=港澳居民来往内地通行证号码不合规
+10108=台湾居民来往大陆通行证号码不合规
+10109=不支持中国大陆护照
+10110=护照号码不合规
+10111=军官证号不合规
 
 
 10200=仅限从未购买过会员的用户使用

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

@@ -43,7 +43,7 @@ public class OrderUtils {
         } else {
             integers = roadShowOrderLimit(userId, idCard, performanceId, ticketId, performanceBuyCount, ticketBuyCount, isTrueName);
         }
-        return judgeMemberType(performanceLimitCount, performanceMemberLimitCount, ticketLimitCount, ticketMemberLimitCount, memberType, integers[0], integers[1]);
+        return judgeMemberType(performanceLimitCount, performanceMemberLimitCount, ticketLimitCount, ticketMemberLimitCount, memberType, integers[0], integers[1], isTrueName);
     }
 
     public Integer[] roadShowOrderLimit(
@@ -85,20 +85,20 @@ public class OrderUtils {
         return new Integer[]{performanceBuyCount, ticketBuyCount};
     }
 
-    public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int ticketLimitCount, int ticketMemberLimitCount, int memberType, int performanceBuyCount, int ticketBuyCount) {
+    public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int ticketLimitCount, int ticketMemberLimitCount, int memberType, int performanceBuyCount, int ticketBuyCount, int isTrueName) {
         if (memberType == 1 || memberType == 2) {
             if (performanceBuyCount > performanceMemberLimitCount && performanceMemberLimitCount != 0) {
-                return "该演出只能购买" + performanceMemberLimitCount + "张";//超过演出维度购买量
+                return (1 == isTrueName ? "实名制" : "本场") + "演出限购" + performanceMemberLimitCount + "张，已超出";//超过演出维度购买量
             }
             if (ticketBuyCount > ticketMemberLimitCount && ticketMemberLimitCount != 0) {
-                return "该票种只能购买" + ticketMemberLimitCount + "张";//超过票维度购买量
+                return (1 == isTrueName ? "实名制" : "该") + "票种限购" + ticketMemberLimitCount + "张，已超出";//超过票维度购买量
             }
         } else {//非会员区间
             if (performanceBuyCount > performanceLimitCount && performanceLimitCount != 0) {
-                return "该演出只能购买" + performanceLimitCount + "张";//超过演出维度购买量
+                return (1 == isTrueName ? "实名制" : "本场") + "演出限购" + performanceLimitCount + "张，已超出";//超过演出维度购买量
             }
             if (ticketBuyCount > ticketLimitCount && ticketLimitCount != 0) {
-                return "该票种只能购买" + ticketLimitCount + "张";//超过票维度购买量
+                return (1 == isTrueName ? "实名制" : "该") + "票种限购" + ticketLimitCount + "张，已超出";//超过票维度购买量
             }
         }
         return "";

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ShunfengSignUtils.java

@@ -59,38 +59,45 @@ public class ShunfengSignUtils {
      * @return
      */
     public boolean receiveRequestAndCheckSign(String params, HttpServletRequest request) {
+        log.error("params {}", params);
+        log.debug("params {}", params);
+        log.info("params {}", params);
         // 请求方APPID
         String sendAppId = request.getHeader("sendAppId");
+        log.error("sendAppId {}", sendAppId);
         // 请求方时间戳
         String timestamp = request.getHeader("timestamp");
+        log.error("timestamp {}", timestamp);
         // 请求方签名
         String sign = request.getHeader("sign");
+        log.error("sign {}", sign);
+
         if (StringUtils.isBlank(sendAppId)) {
-            System.out.println("参数sendAppId不能为空");
+            log.error("参数sendAppId不能为空");
             return false;
         }
         if (StringUtils.isBlank(timestamp)) {
+            log.error("参数timestamp不能为空 {}", "");
             System.out.println("参数timestamp不能为空");
             return false;
         }
         if (StringUtils.isBlank(sign)) {
-            System.out.println("参数sign不能为空");
+            log.error("参数sign不能为空");
             return false;
         }
         // 校验签名是否过期
         long requestTime = Long.parseLong(timestamp);
         long now = System.currentTimeMillis();
         if (Math.abs(now - requestTime) > CHECK_TIME) {
-            System.out.println("签名过期!");
+            log.error("签名过期");
             return false;
         }
         // 请求方参数+请求方时间戳+SK 生成签名
         String thisSign = genSign(timestamp, params);
-        System.out.println(params);
-        System.out.println(thisSign);
+        log.error("thisSign {}", thisSign);
         // 获取的签名和请求方签名比较是否一致
         if (!thisSign.equals(sign)) {
-            System.out.println("签名错误");
+            log.error("签名错误");
             return false;
         }
         return true;