modify

Helius

2020-12-23 c554c7ad5405bafa149dbb6429e8245f78b33ffc

 zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java

@@ -12,7 +12,7 @@
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.MoneyCardUseFlowDao;
import com.matrix.system.hive.plugin.util.DateUtils;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -296,7 +296,7 @@
                if (newDate != null && newDate.before(today)) {
                    return new AjaxResult(AjaxResult.STATUS_FAIL, "有效期要大于当前日期");
                }
                if (newDate == null && failTime.before(today)) {
                if (newDate == null && (failTime == null || failTime.before(today))) {
                    //如果是已过期界面会提醒重新设置有效期
                    return new AjaxResult(AjaxResult.STATUS_SUCCESS, "已过期");
                }
@@ -305,7 +305,7 @@
            case Dictionary.TAOCAN_STATUS_DJ:
                MoneyCardUseFreeze freeze = new MoneyCardUseFreeze();
                freeze = moneyCardUseFreezeService.findByMoneyCardUseId(proj.getId());
                proj.setFailTime(DateUtils.nextNDate(failTime, freeze.getGapDays()));
                proj.setFailTime(DateUtil.nextNDate(failTime, freeze.getGapDays()));
                break;
            default:
                return new AjaxResult(AjaxResult.STATUS_FAIL, "请选择无效或者冻结的充值卡");