Merge remote-tracking branch 'origin/consumer_unite' into dev_bd_rm_consumer_od

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java

@@ -291,7 +291,7 @@ public class CandyMgtCouponAdminController extends BaseController {
             case 0:
                 buildParam.setEventType(0);
                 buildParam.setEventLimit(null);
-                if (null == buildParam.getRedeemValidity()) {
+                if (null == buildParam.getRedeemValidity() || buildParam.getRedeemValidity().compareTo(0) <= 0) {
                     return AjaxResult.warn("兑换有效期无效");
                 }
                 break;