Merge branch 'hz_master' into dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityRuleBiz.java

@@ -9,12 +9,10 @@ import com.xxfc.platform.activity.vo.ActivityRuleVo;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.xxfc.platform.activity.entity.ActivityRule;
 import com.xxfc.platform.activity.mapper.ActivityRuleMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -68,7 +66,7 @@ public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
                             if (coupon!=null&&coupon.getIsDel()==0&&coupon.getStatus()==1){
                                 if (coupon.getValidType()==2){
                                     int days=coupon.getValidDays()==null?0:coupon.getValidDays();
-                                    coupon.setValidEndTime(System.currentTimeMillis()+days*24*60*60*1000);
+                                    coupon.setValidEndTime(System.currentTimeMillis()+(days*24*60*60*1000L));
                                 }
                                 coupons.add(coupon);
                             }