YOHOBUY / yohobuy-activity · Commits

Go to a project

Authored by wangxin
Commit de4c80d49b6fde6eb96bf605c987ac03e5b40e35 1 parent bc3cba90

活动内容修改

Inline Side-by-side
Showing 8 changed files with 138 additions and 52 deletions
... ... @@ -209,4 +209,24 @@ public class OrderShareActivityBO extends BaseModel{
this.oldUserCouponPic = oldUserCouponPic;
}
public String getFormatActivityDesc() {
if (null == activityDesc) {
return "";
}
String[] array = activityDesc.split("(\\r\\n|\\r|\\n|\\n\\r)");
if (array.length > 0) {
StringBuffer sb = new StringBuffer();
for(String s : array) {
sb.append("<P>");
sb.append(s);
sb.append("</P>");
}
return sb.toString();
}
return "";
}
}
... ...
... ... @@ -33,4 +33,26 @@ public class TencentMktBO extends TencentMktActivityBO{
public void setShareUrl(String shareUrl) {
this.shareUrl = shareUrl;
}
public String getFormatActivityDesc() {
String activityDesc = getActivityDesc();
if (null == activityDesc) {
return "";
}
String[] array = activityDesc.split("(\\r\\n|\\r|\\n|\\n\\r)");
if (array.length > 0) {
StringBuffer sb = new StringBuffer();
for(String s : array) {
sb.append("<P>");
sb.append(s);
sb.append("</P>");
}
return sb.toString();
}
return "";
}
}
... ...
... ... @@ -17,5 +17,5 @@ public interface IOrderShareCouponDAO {
int updateByPrimaryKey(OrderShareCoupon record);
OrderShareCoupon selectCouponByDateAndType(@Param("useDate") String useDate, @Param("couponType") int couponType);
OrderShareCoupon selectCouponByDateAndType(@Param("useDate") String useDate, @Param("couponType") int couponType, @Param("activityId") int activityId);
}
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@ package com.yoho.coupon.dal.model;
import com.yoho.queue.dal.model.BaseModel;
public class OrderShareCoupon extends BaseModel {
public class OrderShareCoupon extends BaseModel {
/**
*
*/
... ... @@ -18,6 +18,10 @@ public class OrderShareCoupon extends BaseModel {
private Integer couponType;
private Integer activityId;
private String couponPic;
public Integer getId() {
return id;
}
... ... @@ -57,4 +61,20 @@ public class OrderShareCoupon extends BaseModel {
public void setCouponType(Integer couponType) {
this.couponType = couponType;
}
public Integer getActivityId() {
return activityId;
}
public void setActivityId(Integer activityId) {
this.activityId = activityId;
}
public String getCouponPic() {
return couponPic;
}
public void setCouponPic(String couponPic) {
this.couponPic = couponPic;
}
}
\ No newline at end of file
... ...
... ... @@ -7,9 +7,11 @@
<result column="coupon_name" property="couponName" jdbcType="VARCHAR" />
<result column="use_date" property="useDate" jdbcType="VARCHAR" />
<result column="coupon_type" property="couponType" jdbcType="TINYINT" />
<result column="activity_id" property="activityId" jdbcType="INTEGER" />
<result column="coupon_pic" property="couponPic" jdbcType="VARCHAR" />
</resultMap>
<sql id="Base_Column_List">
id, coupon_id, coupon_name, use_date, coupon_type
id, coupon_id, coupon_name, use_date, coupon_type,activity_id,coupon_pic
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Integer">
... ... @@ -19,7 +21,7 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectCouponByDateAndType" resultMap="BaseResultMap">
select * from order_share_coupon where 1=1
select * from order_share_coupon where activity_id=#{activityId}
<if test="useDate != null">
and use_date=#{useDate}
</if>
... ...
... ... @@ -105,6 +105,16 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
}
activityBO = OrderShareActivityConvert.db2bo(db);
//重新设置新老用户券
OrderShareCoupon newCoupon = orderShareCouponDAO.selectCouponByDateAndType(null, Constant.ORDER_SHARE_USERTYPE_NEW, activityBO.getId());
if (null != newCoupon) {
activityBO.setCouponPic(newCoupon.getCouponPic());
}
OrderShareCoupon oldCoupon = orderShareCouponDAO.selectCouponByDateAndType(DateUtils.getToday("yyyy-MM-dd"), Constant.ORDER_SHARE_USERTYPE_OLD, activityBO.getId());
if (null != oldCoupon) {
activityBO.setOldUserCouponPic(oldCoupon.getCouponPic());
}
yhValueOperations.set(ORDER_SHARE_ACTIVITY_CACHEKEY, CacheKeyHelper.value2String(activityBO));
yHRedisTemplate.longExpire(ORDER_SHARE_ACTIVITY_CACHEKEY, 1, TimeUnit.MINUTES);
... ... @@ -306,7 +316,7 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
// 发送优惠券
// 获取老人优惠券
OrderShareCouponVO couponVO = drawCoupon(profileInfo.getUid(), Constant.ORDER_SHARE_USERTYPE_OLD);
OrderShareCouponVO couponVO = drawCoupon(profileInfo.getUid(), Constant.ORDER_SHARE_USERTYPE_OLD, activityInfo.getId());
if (!couponVO.isDrawCouponSuccess()) {
respBO.setReturnCode(Constant.ORDER_SHARE_SENDCOUPON_ERROR);
respBO.setReturnMsg("优惠券已被抢光");
... ... @@ -364,7 +374,7 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
// 3、发送优惠券
// 获取新人优惠券
OrderShareCouponVO couponVO = drawCoupon(model.getUid(), Constant.ORDER_SHARE_USERTYPE_NEW);
OrderShareCouponVO couponVO = drawCoupon(model.getUid(), Constant.ORDER_SHARE_USERTYPE_NEW, activityInfo.getId());
if (!couponVO.isDrawCouponSuccess()) {
respBO.setReturnCode(Constant.ORDER_SHARE_SENDCOUPON_ERROR);
respBO.setReturnMsg("优惠券已被抢光");
... ... @@ -507,17 +517,17 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
* @param userType
* @return
*/
private OrderShareCouponVO drawCoupon(int uid, int userType) {
private OrderShareCouponVO drawCoupon(int uid, int userType, int activityId) {
log.info("draw orderShare coupon: uid: {}, userType: {}", uid, userType);
OrderShareCouponVO couponVO = new OrderShareCouponVO();
//新人券、老人全不一样
OrderShareCoupon coupon = null;
if(userType == Constant.ORDER_SHARE_USERTYPE_OLD) {
coupon = orderShareCouponDAO.selectCouponByDateAndType(DateUtils.getToday("yyyy-MM-dd"), Constant.ORDER_SHARE_USERTYPE_OLD);
coupon = orderShareCouponDAO.selectCouponByDateAndType(DateUtils.getToday("yyyy-MM-dd"), Constant.ORDER_SHARE_USERTYPE_OLD, activityId);
}
else if(userType == Constant.ORDER_SHARE_USERTYPE_NEW) {
coupon = orderShareCouponDAO.selectCouponByDateAndType(null, Constant.ORDER_SHARE_USERTYPE_NEW);
coupon = orderShareCouponDAO.selectCouponByDateAndType(null, Constant.ORDER_SHARE_USERTYPE_NEW, activityId);
}
if(coupon == null) {
... ...
... ... @@ -84,7 +84,8 @@
<div class="receive-coupon-page">
<div class="bg-contain">
<img src="http://img11.static.yhbimg.com/yhb-img01/2016/06/17/16/019b5b887d2e78098f9448927df3427da4.png">
<img class="img1" src="http://img11.static.yhbimg.com/yhb-img01/2016/06/17/16/019b5b887d2e78098f9448927df3427da4.png">
<img class="img2">
</div>
<p class="hidden" id="activityEnded"></p>
<p class="hidden" id="newUser"></p>
... ... @@ -164,7 +165,13 @@
<div class="mask hidden"></div>
<div class="dialog hidden" id="message">
<span class="close"></span>
<span id="activityDesc"></span>
<span id="activityDesc">
<div class="activity-message">
<h3>活动说明</h3>
<div class="message">
</div>
</div>
</span>
</div>
... ...
var tipMessage = $('#tipMessage').html();
var activityID = $('#activityID').html();
$('#phone').bind('input propertychange', function() {
var tipMessage = $('#tipMessage').html();
var activityID = $('#activityID').html();
$('#phone').bind('input propertychange', function() {
if ($(this).val().length === 11) {
$('.input-content div').eq('0').addClass('verification-code');
} else {
... ... @@ -13,8 +11,8 @@
$('.input-content i').eq('0').addClass('hidden');
}
}
});
$('#verification').bind('input propertychange', function() {
});
$('#verification').bind('input propertychange', function() {
if ($(this).val().length === 4) {
$('.input-content div').eq('1').addClass('get');
} else {
... ... @@ -25,15 +23,15 @@
$('.input-content i').eq('1').addClass('hidden');
}
}
});
});
if ($('#activityEnded').html()) {
if ($('#activityEnded').html()) {
$('.tip-wrap').removeClass('hidden');
$('.tip-wrap .title').html(tipMessage);
}
}
function showToast(messages, time) {
function showToast(messages, time) {
$('#dialog').removeClass('hidden');
$('.mask').removeClass('hidden');
$('#dialog .content').html('<p class="phone-error">' + messages + '<p>');
... ... @@ -42,9 +40,9 @@
$('.mask').addClass('hidden');
$('#dialog .content').html(' ');
}, time);
}
}
$(function(){
$(function() {
$.ajax({
url: '/activity/tencentMkt/TencentMktController/getActivityInfo',
... ... @@ -62,7 +60,12 @@
}, false);
}*/
if (data.code === 200) {
$('.receive-coupon-page .bg-contain img').attr('src', data.bgImg);
$('.receive-coupon-page .bg-contain .img1').attr('src', data.bgImg);
if (data.secondScreenPic) {
$('.receive-coupon-page .bg-contain .img2').attr('src', data.secondScreenPic);
} else {
$('.receive-coupon-page .bg-contain .img2').addClass('hidden');
}
$('.gain-coupon-centent .coupon img').attr('src', data.couponPic);
$('#activityEnded').text(data.ended);
$('#newUser').text(data.newUser);
... ... @@ -76,8 +79,8 @@
$('.gain-coupon-centent .use-coupon-btn .use-coupon').attr('href', data.buttonLink);
$('.gain-coupon-centent .go-wep').attr('href', data.pcLink);
$('.tip .title').html(data.message);
$('#activityDesc').html(data.activityDesc);
if(data.ended) {
$('#activityDesc .message').html(data.formatActivityDesc);
if (data.ended) {
$('.tip-wrap').removeClass('hidden');
$('.tip-wrap .title').html(data.message);
}
... ... @@ -91,11 +94,11 @@
error: function() {
showToast('网络错误，稍后再试！', 1400);
},
dataType : "json"
});
dataType: "json"
});
});
$('#getCoupon').on('click', function() {
$('#getCoupon').on('click', function() {
phone = $(this).siblings('input').val();
reg = /[0-9]{11}/;
if (!reg.test(phone)) {
... ... @@ -131,10 +134,10 @@
error: function() {
showToast('网络错误，稍后再试！', 1400);
},
dataType : "json"
dataType: "json"
});
});
$('.input-content').on('click', '.get', function() {
});
$('.input-content').on('click', '.get', function() {
$('.input-content div').eq('1').removeClass('get');
if ($(this).siblings('input').val().length === 4) {
$.ajax({
... ... @@ -163,57 +166,57 @@
error: function() {
showToast('网络错误，稍后再试！', 1400);
},
dataType : "json"
dataType: "json"
});
} else {
showToast('网络错误，稍后再试！', 1400);
}
});
$('.close').on('click', function() {
});
$('.close').on('click', function() {
$('.dialog').addClass('hidden');
$('.mask').addClass('hidden');
$('#dialog .content').html(' ');
});
$('.description-btn').on('click', function() {
});
$('.description-btn').on('click', function() {
$('#message').removeClass('hidden');
$('.mask').removeClass('hidden');
});
});
$('.gain-description-btn').on('click', function() {
$('.gain-description-btn').on('click', function() {
$('#message').removeClass('hidden');
$('.mask').removeClass('hidden');
});
$('.description').on('click', function() {
});
$('.description').on('click', function() {
$('#message').removeClass('hidden');
$('.mask').removeClass('hidden');
});
});
$('.use-coupon-btn').on('click', function() {
$('.use-coupon-btn').on('click', function() {
if (window._yas) {
window._yas.sendCustomInfo({
activityID: activityID
}, true);
}
});
});
$('.input-content .clear-mobile').on('click', function() {
$('.input-content .clear-mobile').on('click', function() {
$('.input-content input').eq('0').val('');
$(this).addClass('hidden');
$('.input-content div').eq('0').removeClass();
});
});
$('.input-content .clear-verify').on('click', function() {
$('.input-content .clear-verify').on('click', function() {
$('.input-content input').eq('1').val('');
$(this).addClass('hidden');
$('.input-content div').eq('1').removeClass();
});
});
/**
/**
* 分享页面基础参数
* @param {object} sizeInfo [接口原始数据]
* @return {object} [description]
*/
function getPageInfo(pageInfo) {
function getPageInfo(pageInfo) {
var dest = {};
dest.shareTitle = pageInfo.data.shareTitle;
... ... @@ -229,6 +232,8 @@
dest.mobile = pageInfo.data.mobile;
dest.pcLink = pageInfo.data.pcLink;
dest.buttonLink = pageInfo.data.buttonLink;
dest.secondScreenPic = pageInfo.data.secondScreenPic;
dest.formatActivityDesc = pageInfo.data.formatActivityDesc;
if (pageInfo.data.flag === 1) {
dest.bgImg = pageInfo.data.activityNormalPic;
... ... @@ -241,4 +246,4 @@
// 清空变量，释放内存
pageInfo = {};
return dest;
};
\ No newline at end of file
};
\ No newline at end of file
... ...