修改时间的bug，修改添加合同不显示的bug

zhaoxiaohao

2020-12-01 a40b70f8ff9c95590f05234916948943ed2c1d8d

修改时间的bug，修改添加合同不显示的bug

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java

@@ -103,7 +103,7 @@
                productOrder.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
            }
            //默认添加的合同视为无效合同,在充值完成后,会将对应合同启用
            productOrder.setIsDel(true);
//            productOrder.setIsDel(true);
            boolean v = productOrderService.saveOrUpdate(productOrder);
            if (v) {
                return ResultBody.ok().data(productOrder).msg("保存成功");

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html

@@ -256,6 +256,8 @@
        var laydate = layui.laydate;

        var contractNum = 0;
        var contractBeginTime_cheng = "";
        var contractEndTime_cheng = "";

        //充值进行中
        var isRun = false;
@@ -265,10 +267,16 @@
            done: function (value, date, endDate) {
                var startDate = new Date(value).getTime();
                var endTime = new Date($('#contractEndTime').val()).getTime();
                if (endTime < startDate) {
                    layer.msg('结束时间不能小于开始时间');
                    $('#contractBeginTime').val($('#contractEndTime').val());
                if (endTime <= startDate) {
                    layer.msg('结束时间不能小于或等于开始时间');
                    var end = new Date($('#contractEndTime').val())
                    end.setDate(end.getDate()-1)
                    $('#contractBeginTime').val(util.toDateString(end, "yyyy-MM-dd"));
                } else {
                    var flag=termTypeTime();
                    if(!false){
                        return false;
                    }
                    $('#custom_beginTime').val($("#contractBeginTime").val())
                    custom_beginTimes.config.min = {
                        year: date.year,
@@ -287,10 +295,17 @@
            done: function (value, date, endDate) {
                var startDate = new Date($('#contractBeginTime').val()).getTime();
                var endTime = new Date(value).getTime();
                if (endTime < startDate) {
                    layer.msg('结束时间不能小于开始时间');
                    $('#contractEndTime').val($('#contractBeginTime').val());
                if (endTime <= startDate) {
                    layer.msg('结束时间不能小于或等于开始时间');
                    var begin = new Date($('#contractBeginTime').val())
                    begin.setDate(begin.getDate()+1)
                    $('#contractEndTime').val(util.toDateString(begin, "yyyy-MM-dd"));
                    // $('#contractEndTime').val($('#contractBeginTime').val());
                } else {
                    var flag=termTypeTime();
                    if(!false){
                        return false;
                    }
                    $('#custom_endTime').val($("#contractEndTime").val())
                    custom_endTimes.config.max = {
                        year: date.year,
@@ -313,6 +328,44 @@
                }
            }
        });
        function termTypeTime(){
            var listData = admin.getTempData("t_tempProduct");
            var max= "";
            var min= '';
            if(listData!=null&&listData.length>0){
               
                listData.forEach((element,index) => {
                    debugger
                    if(index==0){
                        max=element.endTime;
                        min=element.beginTime;
                    }else{
                        if (dateUtil.compareDate(min, element.beginTime)) {
                        min=element.beginTime;
                        }
                        if (dateUtil.compareDate( element.endTime,max)) {
                            max=element.endTime;
                        }
                    }
                    
                });
            }
            if(dateUtil.compareDate( $('#contractBeginTime').val(),min)){
                layer.msg("合同的时间必须小于待充值的开始时间")
                $('#contractBeginTime').val(contractBeginTime_cheng);
                return false;
            }else{
                contractBeginTime_cheng=$('#contractBeginTime').val()
            }
            if(dateUtil.compareDate(max, $('#contractEndTime').val())){
                layer.msg("合同的时间必须小于待充值的开始时间")
                $('#contractEndTime').val(contractEndTime_cheng);
                return false;
            }else{
                contractEndTime_cheng=$('#contractEndTime').val()
            }

        }
        laydate.render({
            elem: '#contractBeginTime_not' //指定元素
        });
@@ -984,7 +1037,7 @@
                                                    }
                                                }, 'POST');
                                        } else {
                                            layer.msg("充值数据异常为空！", {
                                            layer.msg("充值数据成功！", {
                                                icon: 2,
                                                time: 1000
                                            });