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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html

@@ -425,17 +425,17 @@
                     </div>
                     <div class="radio-box">
                         <label for="radio2" onclick="radioType(this)">
-                            <input type="radio" id="coupeAdd2" class="coupeAddVal" onclick="radioType(this)" name="coupeAdd_type" value="1"/>演出
+                            <input type="radio" id="coupeAdd2" class="coupeAddVal" name="coupeAdd_type" value="1"/>演出
                         </label>
                     </div>
                     <div class="radio-box">
                         <label for="radio2" onclick="radioType(this)">
-                            <input type="radio" id="coupeAdd3" class="coupeAddVal" onclick="radioType(this)" name="coupeAdd_type" value="2"/>商品
+                            <input type="radio" id="coupeAdd3" class="coupeAddVal" name="coupeAdd_type" value="2"/>商品
                         </label>
                     </div>
                     <div class="radio-box">
                         <label for="radio2" onclick="radioType(this)">
-                            <input type="radio" id="coupeAdd4" class="coupeAddVal" onclick="radioType(this)" name="coupeAdd_type" value="3"/>优先购买
+                            <input type="radio" id="coupeAdd4" class="coupeAddVal" name="coupeAdd_type" value="3"/>优先购买
                         </label>
                     </div>
                 </div>
@@ -560,17 +560,29 @@
         } else {
             var coupeTitle = $('#coupeAdd_title').val();
             var busiType = this.typeRadio;
-            if (this.typeRadio == 0 || this.typeRadio == 1 || this.typeRadio == 3) {
-                var couponRuleList =  [{
+            if (this.typeRadio == 0) {
+                var couponRuleList = [{
                     useScope: 100,
-                    busiName: '全部演出'
+                    busiName: '全场'
+                }]
+            } else if ( this.typeRadio == 1) {
+                var couponRuleList = [{
+                    useScope: 90,
+                    busiName: '演出'
+                }]
+            } else if ( this.typeRadio == 2) {
+                var couponRuleList = [{
+                    useScope: 80,
+                    busiName: '商品'
                 }]
             } else {
                 var couponRuleList =  [{
-                    useScope: 100,
-                    busiName: '全部商品'
+                    useScope: 90,
+                    busiName: '优先购'
                 }]
             }
+
+
             if (this.typeRadio == 3) {
                 var eventAmt = $('#eventAmt').val();
                 var overlay = this.overlay;
@@ -617,7 +629,11 @@
 
     // 类别
     function radioType (obj) {
+        console.log(obj)
         var typeRadio = $(obj).find('input').val();
+        $(obj).parent().parent().find('input').removeAttr('checked');
+        $(obj).find('input').attr('checked', true);
+
         this.typeRadio = typeRadio;
         if (typeRadio == 3) {
             $('.alltrack').hide();
@@ -664,17 +680,29 @@
         var valOver = thisVal.find('#mrcvalOver').val();
         var valMinus = thisVal.find('#mrcvalMinus').val();
         // var mrightsId =
-        if (busiType == 0 || busiType == 1 || busiType == 3) {
-            var couponRuleList =  [{
+
+        if (busiType == 0) {
+            var couponRuleList = [{
                 useScope: 100,
-                busiName: '全部演出'
+                busiName: '全场'
+            }]
+        } else if ( busiType == 1) {
+            var couponRuleList = [{
+                useScope: 90,
+                busiName: '演出'
+            }]
+        } else if ( busiType == 3 ) {
+            var couponRuleList = [{
+                useScope: 80,
+                busiName: '商品'
             }]
         } else {
             var couponRuleList =  [{
-                useScope: 100,
-                busiName: '全部商品'
+                useScope: 90,
+                busiName: '优先购'
             }]
         }
+
         var MembercoupenData = {
             busiType: busiType,
             couType:  couType == 3 ? 101 : couType,
@@ -750,15 +778,25 @@
             $('.coupetypr_discount').show();
         }
 
-        if (this.typeRadio == 0 || this.typeRadio == 1 || this.typeRadio == 3) {
-            var couponRuleList =  [{
+        if (this.typeRadio == 0) {
+            var couponRuleList = [{
                 useScope: 100,
-                busiName: '全部演出'
+                busiName: '全场'
+            }]
+        } else if ( this.typeRadio == 1) {
+            var couponRuleList = [{
+                useScope: 90,
+                busiName: '演出'
+            }]
+        } else if ( this.typeRadio == 2) {
+            var couponRuleList = [{
+                useScope: 80,
+                busiName: '商品'
             }]
         } else {
             var couponRuleList =  [{
-                useScope: 100,
-                busiName: '全部商品'
+                useScope: 90,
+                busiName: '优先购'
             }]
         }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add4.html

@@ -316,7 +316,7 @@
             showId = '';
         }
         if (showId) {
-            useScope = 90;
+            useScope = 80;
             busiName = $('#searchIpt').val();
             busiId = showId;
         }

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/constant/SmsEnum.java

@@ -10,8 +10,7 @@ public class SmsEnum {
         M02("正在现场"),
         M03("新血计划"),
         M04("摩登小家伙"),
-        M05("五百里Live")
-        ;
+        M05("五百里Live");
         private final String val;
 
         ADSignName(String val) {
@@ -65,6 +64,12 @@ public class SmsEnum {
          * - 模版内容:您已成功购买$(name)门票。可至个人中心查看订单http://tcn/ExMir1B。演出$(time)开始。微信关注摩登天空服务号，联系我们。
          */
         SMS_223203737,
+        /**
+         * 购票短信
+         * - 模版内容:您已成功购买${name}门票。可至个人中心查看订单 http://t.cn/ExMlr1B。演出${time}开始。微信关注 摩登天空服务号，获得更多演出资讯。特别提示：下载“正在现场APP”最新版，使用“在场”功能，可结识该场演出中共同观演的在场好友。
+         */
+        SMS_225995308,
         ;
+
     }
 }

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

@@ -193,7 +193,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             int ticketMemberLimit = ticketData.getLimitCountMember();//会员票种限购
             int performanceLimit = performanceData.getLimitCount();//普通演出限购
 //            int performanceMemberLimit = performanceData.getLimitCountMember();//会员演出限购
-            int performanceMemberLimit = 0;//会员演出限购
+            int performanceMemberLimit = 1;//会员演出限购
             int isTrueName = ticketData.getIsTrueName();//是否演出实名
 
             if (!canBuyStatus.contains(performanceData.getAppStatus())) {
@@ -905,9 +905,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                 SmsEnum.ADTemplate adTemplate = null;
                 if (orderTicketData.getGetTicketType().equals("express")) {
-                    adTemplate = SmsEnum.ADTemplate.SMS_223203737;
+                    adTemplate = SmsEnum.ADTemplate.SMS_225995308;
                 } else if (orderTicketData.getGetTicketType().equals("electronic")) {
-                    adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_223203737 : SmsEnum.ADTemplate.SMS_223203737;
+                    adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_225995308 : SmsEnum.ADTemplate.SMS_225995308;
                 }
 
                 if (null != adTemplate) {