Merge branch 'pre' into 'master'

Pre

See merge request !353

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

@@ -170,7 +170,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                         rollbackStock = true;
                         if (!res1.equals("")) {
 //                            throw new Exception("已超出限购数量");
-                            throw new LiquidnetServiceException("-1", "超出账号限购数量");// 按杨要求调整
+                            throw new LiquidnetServiceException("-1", "超出正在现场账号(手机号)限购数量");// 按杨要求调整
                         }
                         //权限限购
                         Boolean res2 = orderUtils.judgeOrderRose(isMember, skuParam.getSkuId(), StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get("mobile")), ""), Integer.parseInt(skuVo.getBuyFactor()));

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

@@ -425,7 +425,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             if (e.getMessage() == null) {
                 return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
             } else if (e.getMessage().equals("券不可用")) {
-                return ResponseDto.failure("请在“我的订单”中取消或支付“待支付订单”再进行操作");//券不可用
+                return ResponseDto.failure("请完成“待支付订单”支付或等待取消后再进行购买");//券不可用
             } else {
                 return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
             }