Merge remote-tracking branch 'origin/dev' into dev

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

@@ -64,7 +64,10 @@ public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
                     if(array.size()>0){
                         for(int i=0;i<array.size();i++){
                             Integer id=array.getJSONObject(i).getInteger("id");
-                            coupons.add(couponBiz.selectById(id));
+                            Coupon coupon=couponBiz.selectById(id);
+                            if (coupon!=null&&coupon.getIsDel()==0&&coupon.getStatus()==1){
+                                coupons.add(couponBiz.selectById(id));
+                            }
                         }
                     }
                     ruleVo.setCoupons(coupons);