修改bug

liujie

7 天以前 8672ae043d0c655fdfa86aff218b47d0ea52ac3d

修改bug

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java

@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.controller.specialTrain;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.rabbitmq.client.LongString;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
@@ -301,16 +302,33 @@
        tDriverPromotionActivity.setProvinceCode(province);
        tDriverPromotionActivity.setCityCode(city);
        tDriverPromotionActivity.setDistrictCode(area);
        Wrapper<TDriverPromotionActivity> eq = new EntityWrapper<TDriverPromotionActivity>().eq("provinceCode", province).eq("cityCode", city);
        if(area!=null && !area.equals("")){
            eq.eq("districtCode", area);
        }
        String s = time.split(" - ")[0] + " 00:00:00";
        String s1 = time.split(" - ")[1] + " 23:59:59";
        tDriverPromotionActivity.setStartTime(simpleDateFormat.parse(s));
        tDriverPromotionActivity.setEndTime(simpleDateFormat.parse(s1));
        List<TDriverPromotionActivity> tDriverPromotionActivities = tDriverPromotionActivityService.selectList(eq);
        for (TDriverPromotionActivity driverPromotionActivity : tDriverPromotionActivities) {
            // 判断时间是否有交集
            if (isTimeOverlap(driverPromotionActivity, tDriverPromotionActivity)) {
                return "602"; // 时间冲突
            }

        }



        List<TRegion> code = tRegionService.selectList(new EntityWrapper<TRegion>().in("code", Arrays.asList(province, city, area)));

        tDriverPromotionActivity.setProvince(code.stream().filter(e->e.getCode().equals( province)).collect(Collectors.toList()).get(0).getName());
        tDriverPromotionActivity.setCity(code.stream().filter(e->e.getCode().equals( city)).collect(Collectors.toList()).get(0).getName());
        tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());
        String s = time.split(" - ")[0] + " 00:00:00";
        String s1 = time.split(" - ")[1] + " 23:59:59";
        tDriverPromotionActivity.setStartTime(simpleDateFormat.parse(s));
        tDriverPromotionActivity.setEndTime(simpleDateFormat.parse(s1));
        if(area!=null && !"".equals(area)){
            tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());
        }

        tDriverPromotionActivity.setCommissionRatio(BigDecimal.valueOf(commissionRatio));
        tDriverPromotionActivity.setBindingDays(bindingDays);
        tDriverPromotionActivity.setActivityDesc(ToolUtil.cleanXSS(content));
@@ -320,7 +338,13 @@
        tDriverPromotionActivityService.insert(tDriverPromotionActivity);
        return SUCCESS_TIP;
    }

    // 更完整的时间交集判断方法
    private boolean isTimeOverlap(TDriverPromotionActivity existing, TDriverPromotionActivity newActivity) {
        // 两个时间段有交集的条件：
        // existing的开始时间 <= newActivity的结束时间 且 existing的结束时间 >= newActivity的开始时间
        return existing.getStartTime().getTime() <= newActivity.getEndTime().getTime() &&
                existing.getEndTime().getTime() >= newActivity.getStartTime().getTime();
    }
    /**
     * 删除
     */
@@ -367,7 +391,9 @@

        tDriverPromotionActivity.setProvince(code.stream().filter(e->e.getCode().equals( province)).collect(Collectors.toList()).get(0).getName());
        tDriverPromotionActivity.setCity(code.stream().filter(e->e.getCode().equals( city)).collect(Collectors.toList()).get(0).getName());
        tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());
        if(area!=null && !"".equals(area)){
            tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());
        }
        String s = time.split(" - ")[0] + " 00:00:00";
        String s1 = time.split(" - ")[1] + " 23:59:59";
        tDriverPromotionActivity.setStartTime(simpleDateFormat.parse(s));

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -203,6 +203,7 @@
            shellList.add("是否推广订单");
            shellList.add("推广员姓名");
            shellList.add("推广员电话");
            shellList.add("所属公司");
            dataList.add(shellList);

            for (Map<String,Object> object : list){
@@ -295,11 +296,6 @@
                    shellList.add("-");
                }

                if(SinataUtil.isNotEmpty(object.get("contactPersonPhone"))){
                    shellList.add(object.get("contactPersonPhone").toString());
                }else{
                    shellList.add("-");
                }

                if(SinataUtil.isNotEmpty(object.get("startAddress"))){
                    shellList.add(object.get("startAddress").toString());
@@ -409,6 +405,11 @@
                }else{
                    shellList.add("-");
                }
                if(SinataUtil.isNotEmpty(object.get("companyName"))){
                    shellList.add(object.get("companyName").toString());
                }else{
                    shellList.add("-");
                }


                dataList.add(shellList);

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html

@@ -402,7 +402,10 @@
         let type = document.querySelector('input[name=type]').value;
         let orderNum = document.querySelector('input[name=orderNum]').value;
         console.log(responsibilityTypeVal,money,orderMoney)
         if(responsibilityTypeVal>3 && money>orderMoney){
         console.log(money>orderMoney)

         console.log("5">"10.00")
         if(responsibilityTypeVal>3 && Number(money)>Number(orderMoney)){
             Feng.error("需小于等于原订单金额!");
             return;
         }

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_add.html

@@ -135,10 +135,6 @@
            Feng.error("请选择活动区域");
            return;
        }
        if(area==null||area==''){
            Feng.error("请选择活动区域");
            return;
        }
        if(time==null||time==''){
            Feng.error("请填写活动时间");
            return;
@@ -170,9 +166,13 @@
        }

        var ajax = new $ax(Feng.ctxPath + "/tDriverPromotionActivity/add", function(data){
            Feng.success("添加成功!");
            TDriverPromotionActivityInfoDlg.close();
            parent.TDriverPromotionActivity.table.refresh();
            if(data=="602"){
                Feng.error("活动时间已重复");
            }else {
                Feng.success("添加成功!");
                TDriverPromotionActivityInfoDlg.close();
                parent.TDriverPromotionActivity.table.refresh();
            }
        },function(data){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        });

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_edit.html

@@ -177,10 +177,6 @@
                Feng.error("请选择活动区域");
                return;
            }
            if(area==null||area==''){
                Feng.error("请选择活动区域");
                return;
            }
            if(time==null||time==''){
                Feng.error("请填写活动时间");
                return;