Merge branch 'hz_master' into dev

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

@@ -66,6 +66,10 @@ public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
                             Integer id=array.getJSONObject(i).getInteger("id");
                             Coupon coupon=couponBiz.selectById(id);
                             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);
+                                }
                                 coupons.add(couponBiz.selectById(id));
                             }
                         }