modify

Helius

2021-01-08 b6e7b81fd914cb08eb49d6cea916139e594020ac

 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;
@@ -181,23 +181,10 @@
     * @author jyy
     */
    @RequestMapping(value = "/toBj")
    public String toBj(Long id, HttpServletRequest request) {
    public String toBj(Long id) {
        // 根据id查到对应的订单信息
        SysOrder order = orderService.findById(id);
        WebUtil.getRequest().setAttribute("order", order);

        SysOrderItem item = new SysOrderItem();
        item.setOrderId(order.getId());
        item.setStatus(Dictionary.ORDER_STATU_QK);
        order.setItems(orderItemService.findByModel(item));


        MoneyCardUse moneyCardUse = new MoneyCardUse();
        moneyCardUse.setVipId(order.getVipId());
        moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
        List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);

        WebUtil.getRequest().setAttribute("cards", cards);

        return "admin/hive/beautySalon/bj-form";
    }
@@ -296,7 +283,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 +292,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, "请选择无效或者冻结的充值卡");