Commit a3897a98 authored by hezhen's avatar hezhen

123

parent cd8251db
...@@ -42,6 +42,7 @@ public class ActivityUserJoinBiz extends BaseBiz<ActivityUserJoinMapper,Activity ...@@ -42,6 +42,7 @@ public class ActivityUserJoinBiz extends BaseBiz<ActivityUserJoinMapper,Activity
log.error("----活动已超过参与人数----number==="+number); log.error("----活动已超过参与人数----number==="+number);
return; return;
} }
rule.setJoinNumber(joinNumber+1);
Integer activityId=rule.getId(); Integer activityId=rule.getId();
ActivityUserJoin userJoin=new ActivityUserJoin(); ActivityUserJoin userJoin=new ActivityUserJoin();
userJoin.setActivityId(activityId); userJoin.setActivityId(activityId);
...@@ -52,6 +53,7 @@ public class ActivityUserJoinBiz extends BaseBiz<ActivityUserJoinMapper,Activity ...@@ -52,6 +53,7 @@ public class ActivityUserJoinBiz extends BaseBiz<ActivityUserJoinMapper,Activity
return; return;
} }
insertSelective(userJoin); insertSelective(userJoin);
ruleBiz.updateById(rule);
} }
//领取优惠卷 //领取优惠卷
......
...@@ -96,6 +96,8 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> { ...@@ -96,6 +96,8 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
userCoupon.setStartTime(startTime); userCoupon.setStartTime(startTime);
userCoupon.setExpireTime(expireTime); userCoupon.setExpireTime(expireTime);
insertSelective(userCoupon); insertSelective(userCoupon);
coupon.setTakeCount(coupon.getTakeCount()+1);
couponBiz.updateById(coupon);
return ticker_no; return ticker_no;
} }
...@@ -170,13 +172,16 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> { ...@@ -170,13 +172,16 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
log.error(userId+"----该优惠卷已使用--tickerNo=="); log.error(userId+"----该优惠卷已使用--tickerNo==");
continue; continue;
} }
Integer couponId=userCoupon.getCouponId();
if (type==1){ if (type==1){
userCoupon.setIsUse(1); userCoupon.setIsUse(1);
userCoupon.setOrderNo(orderNo); userCoupon.setOrderNo(orderNo);
userCoupon.setUseTime(System.currentTimeMillis()); userCoupon.setUseTime(System.currentTimeMillis());
updateSelectiveById(userCoupon); updateSelectiveById(userCoupon);
mapper.upUsedCount(couponId,1);
} }
couponAmout=couponAmout.add(getCouponAmout(userCoupon.getCouponId(),channel,amout)); couponAmout=couponAmout.add(getCouponAmout(couponId,channel,amout));
} }
return couponAmout; return couponAmout;
} }
...@@ -224,6 +229,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> { ...@@ -224,6 +229,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
userCoupon.setOrderNo(""); userCoupon.setOrderNo("");
userCoupon.setUseTime(0L); userCoupon.setUseTime(0L);
updateSelectiveById(userCoupon); updateSelectiveById(userCoupon);
mapper.upUsedCount(userCoupon.getCouponId(),-1);
} }
......
...@@ -3,6 +3,7 @@ package com.xxfc.platform.activity.mapper; ...@@ -3,6 +3,7 @@ package com.xxfc.platform.activity.mapper;
import com.xxfc.platform.activity.entity.UserCoupon; import com.xxfc.platform.activity.entity.UserCoupon;
import com.xxfc.platform.activity.vo.UserCouponVo; import com.xxfc.platform.activity.vo.UserCouponVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import tk.mybatis.mapper.common.Mapper; import tk.mybatis.mapper.common.Mapper;
import java.util.List; import java.util.List;
...@@ -22,4 +23,8 @@ public interface UserCouponMapper extends Mapper<UserCoupon> { ...@@ -22,4 +23,8 @@ public interface UserCouponMapper extends Mapper<UserCoupon> {
//单个优惠卷 //单个优惠卷
public UserCouponVo getUserCoupon(@Param("tickerNo")String tickerNo); public UserCouponVo getUserCoupon(@Param("tickerNo")String tickerNo);
//已使用的优惠券数量数量加减
@Update("update coupon set used_count=used_count+#{count} where `id`=#{id}")
int upUsedCount(@Param("id")Integer id,@Param("count")Integer count);
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment