YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by Ge
Commit 6ef0a6cd594c07351a3cc3cecb96c1323a7cece9 1 parent 7bddc305

update

Inline Side-by-side
Showing 5 changed files with 18 additions and 4 deletions
@@ -50,6 +50,16 @@ public class TencentMktActivity extends BaseBO { @@ -50,6 +50,16 @@ public class TencentMktActivity extends BaseBO {
50 50
51 private Byte oldUser; 51 private Byte oldUser;
52 52
  53 + private String buttonName;
  54 +
  55 + public String getButtonName() {
  56 + return buttonName;
  57 + }
  58 +
  59 + public void setButtonName(String buttonName) {
  60 + this.buttonName = buttonName;
  61 + }
  62 +
53 public Byte getOldUser() { 63 public Byte getOldUser() {
54 return oldUser; 64 return oldUser;
55 } 65 }
@@ -28,11 +28,12 @@ @@ -28,11 +28,12 @@
28 <result column="old_user_button_name" property="oldUserButtonName" jdbcType="VARCHAR" /> 28 <result column="old_user_button_name" property="oldUserButtonName" jdbcType="VARCHAR" />
29 <result column="old_user_button_link" property="oldUserButtonLink" jdbcType="VARCHAR" /> 29 <result column="old_user_button_link" property="oldUserButtonLink" jdbcType="VARCHAR" />
30 <result column="buttom_text_pic" property="buttomTextPic" jdbcType="VARCHAR" /> 30 <result column="buttom_text_pic" property="buttomTextPic" jdbcType="VARCHAR" />
  31 + <result column="button_name" property="buttonName" jdbcType="VARCHAR"/>
31 </resultMap> 32 </resultMap>
32 <sql id="Base_Column_List" > 33 <sql id="Base_Column_List" >
33 id, activity_code, activity_name, h5_title, activity_normal_pic, activity_end_pic, 34 id, activity_code, activity_name, h5_title, activity_normal_pic, activity_end_pic,
34 share_img_url, share_title, share_content, pc_link, activity_desc, begin_time, end_time, 35 share_img_url, share_title, share_content, pc_link, activity_desc, begin_time, end_time,
35 - coupon_pic, button_link, create_time, status, second_screen_pic, coupon_id, user_not_order,sms_content,old_user_popup_content,old_user_button_name,old_user_button_link,buttom_text_pic,old_user 36 + coupon_pic, button_link, create_time, status, second_screen_pic, coupon_id, user_not_order,sms_content,old_user_popup_content,old_user_button_name,old_user_button_link,buttom_text_pic,old_user,button_name
36 </sql> 37 </sql>
37 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > 38 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
38 select 39 select
@@ -170,6 +170,7 @@ public class TencentMktServiceImpl implements ITencentMktService { @@ -170,6 +170,7 @@ public class TencentMktServiceImpl implements ITencentMktService {
170 AsyncFuture<ApiResponse> response = service.get("sms.sendCode", gatewayUrl + "?" + param, null, ApiResponse.class, null); 170 AsyncFuture<ApiResponse> response = service.get("sms.sendCode", gatewayUrl + "?" + param, null, ApiResponse.class, null);
171 171
172 ApiResponse apiResponse = response.get(); 172 ApiResponse apiResponse = response.get();
  173 + apiResponse.setData(activity);
173 if(apiResponse.getCode() == 404){ 174 if(apiResponse.getCode() == 404){
174 log.warn("call app.passport.smsbind. user is exist. area={}, mobile={}, activityCode={}", area, mobile, activityCode); 175 log.warn("call app.passport.smsbind. user is exist. area={}, mobile={}, activityCode={}", area, mobile, activityCode);
175 return new ApiResponse(502, "仅限新用户领取哦！"); 176 return new ApiResponse(502, "仅限新用户领取哦！");
@@ -407,6 +408,7 @@ public class TencentMktServiceImpl implements ITencentMktService { @@ -407,6 +408,7 @@ public class TencentMktServiceImpl implements ITencentMktService {
407 } 408 }
408 bo.setH5Title(activitydb.getH5Title()); 409 bo.setH5Title(activitydb.getH5Title());
409 bo.setActivityEndPic(activitydb.getActivityEndPic()); 410 bo.setActivityEndPic(activitydb.getActivityEndPic());
  411 + bo.setButtonName(activitydb.getButtonName());
410 412
411 // activityStatus：1-活动未开始 2-活动中 3-活动已结束 4-活动不存在 413 // activityStatus：1-活动未开始 2-活动中 3-活动已结束 4-活动不存在
412 int nowtime = DateUtils.getCurrentTimeSecond(); 414 int nowtime = DateUtils.getCurrentTimeSecond();
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 <div class="input-content vertify-input-content hidden"> 126 <div class="input-content vertify-input-content hidden">
127 <input id="verification" type="text" placeholder="请输入验证码" maxlength="4"> 127 <input id="verification" type="text" placeholder="请输入验证码" maxlength="4">
128 <i class="clear-input iconfont hidden clear-verify"></i> 128 <i class="clear-input iconfont hidden clear-verify"></i>
129 - <div id="regist">注册领红包</div> 129 + <div id="regist" ></div>
130 </div> 130 </div>
131 131
132 <div class="coupon-description"> 132 <div class="coupon-description">
@@ -217,6 +217,7 @@ @@ -217,6 +217,7 @@
217 var shareImg = data.shareImgUrl; 217 var shareImg = data.shareImgUrl;
218 var shareDesc = data.shareContent; 218 var shareDesc = data.shareContent;
219 var shareLink = data.shareUrl; 219 var shareLink = data.shareUrl;
  220 + var buttonName = data.buttonName;
220 221
221 $.getJSON(_weChatInterface + '?pageurl=' + 222 $.getJSON(_weChatInterface + '?pageurl=' +
222 encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function(json) { 223 encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function(json) {
@@ -132,15 +132,15 @@ $('#getCoupon').on('click', function() { @@ -132,15 +132,15 @@ $('#getCoupon').on('click', function() {
132 activityCode: activityCode 132 activityCode: activityCode
133 }, 133 },
134 success: function(data) { 134 success: function(data) {
  135 +
135 if (data.code === 200 || data.code === 502 || data.code === 503 || data.code === 404 || data.code === 504 || data.code == 505) { 136 if (data.code === 200 || data.code === 502 || data.code === 503 || data.code === 404 || data.code === 504 || data.code == 505) {
136 if (window._yas && window._yas.sendCustomInfo) { 137 if (window._yas && window._yas.sendCustomInfo) {
137 138
138 } 139 }
139 if (data.code === 200) { 140 if (data.code === 200) {
140 -  
141 $('.coupon-centent .phone-input-content').addClass('hidden'); 141 $('.coupon-centent .phone-input-content').addClass('hidden');
142 $('.coupon-centent .vertify-input-content').removeClass('hidden'); 142 $('.coupon-centent .vertify-input-content').removeClass('hidden');
143 - 143 + $("#regist").text(data.data.buttonName)
144 } else if(data.code == 505){ 144 } else if(data.code == 505){
145 145
146 $('#oldUserDiv').removeClass('hidden'); 146 $('#oldUserDiv').removeClass('hidden');