Authored by Ge

update

... ... @@ -50,6 +50,16 @@ public class TencentMktActivity extends BaseBO {
private Byte oldUser;
private String buttonName;
public String getButtonName() {
return buttonName;
}
public void setButtonName(String buttonName) {
this.buttonName = buttonName;
}
public Byte getOldUser() {
return oldUser;
}
... ...
... ... @@ -28,11 +28,12 @@
<result column="old_user_button_name" property="oldUserButtonName" jdbcType="VARCHAR" />
<result column="old_user_button_link" property="oldUserButtonLink" jdbcType="VARCHAR" />
<result column="buttom_text_pic" property="buttomTextPic" jdbcType="VARCHAR" />
<result column="button_name" property="buttonName" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List" >
id, activity_code, activity_name, h5_title, activity_normal_pic, activity_end_pic,
share_img_url, share_title, share_content, pc_link, activity_desc, begin_time, end_time,
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
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
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
... ...
... ... @@ -170,6 +170,7 @@ public class TencentMktServiceImpl implements ITencentMktService {
AsyncFuture<ApiResponse> response = service.get("sms.sendCode", gatewayUrl + "?" + param, null, ApiResponse.class, null);
ApiResponse apiResponse = response.get();
apiResponse.setData(activity);
if(apiResponse.getCode() == 404){
log.warn("call app.passport.smsbind. user is exist. area={}, mobile={}, activityCode={}", area, mobile, activityCode);
return new ApiResponse(502, "仅限新用户领取哦!");
... ... @@ -407,6 +408,7 @@ public class TencentMktServiceImpl implements ITencentMktService {
}
bo.setH5Title(activitydb.getH5Title());
bo.setActivityEndPic(activitydb.getActivityEndPic());
bo.setButtonName(activitydb.getButtonName());
// activityStatus:1-活动未开始 2-活动中 3-活动已结束 4-活动不存在
int nowtime = DateUtils.getCurrentTimeSecond();
... ...
... ... @@ -126,7 +126,7 @@
<div class="input-content vertify-input-content hidden">
<input id="verification" type="text" placeholder="请输入验证码" maxlength="4">
<i class="clear-input iconfont hidden clear-verify"></i>
<div id="regist">注册领红包</div>
<div id="regist" ></div>
</div>
<div class="coupon-description">
... ... @@ -217,6 +217,7 @@
var shareImg = data.shareImgUrl;
var shareDesc = data.shareContent;
var shareLink = data.shareUrl;
var buttonName = data.buttonName;
$.getJSON(_weChatInterface + '?pageurl=' +
encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function(json) {
... ...
... ... @@ -132,15 +132,15 @@ $('#getCoupon').on('click', function() {
activityCode: activityCode
},
success: function(data) {
if (data.code === 200 || data.code === 502 || data.code === 503 || data.code === 404 || data.code === 504 || data.code == 505) {
if (window._yas && window._yas.sendCustomInfo) {
}
if (data.code === 200) {
$('.coupon-centent .phone-input-content').addClass('hidden');
$('.coupon-centent .vertify-input-content').removeClass('hidden');
$("#regist").text(data.data.buttonName)
} else if(data.code == 505){
$('#oldUserDiv').removeClass('hidden');
... ...