修改bug

Pu Zhibing

2025-03-12 f3839fff3c7da7f1942cfad520cfe393def35a04

修改bug

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java

@@ -190,7 +190,19 @@
        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        settlementDetailEntityWrapper.between("createTime", start, end);
        if (state!=null && state == 2){
            settlementDetailEntityWrapper.eq("paymentStatus", 2);
            List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 1));
            if(paymentStatus.size() > 0){
                settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
            }else{
                settlementDetailEntityWrapper.eq("settlementRecordId", 0);
            }
        }else if (state!=null && state == 1){
            List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 2));
            if(paymentStatus.size() > 0){
                settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
            }else{
                settlementDetailEntityWrapper.eq("settlementRecordId", 0);
            }
        }
        if (time == 5 && !StringUtils.hasLength(insertTime)){

@@ -1793,7 +1805,19 @@
        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        settlementDetailEntityWrapper.between("createTime", start, end);
        if (state!=null && state == 2){
            settlementDetailEntityWrapper.eq("paymentStatus", 2);
            List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 1));
            if(paymentStatus.size() > 0){
                settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
            }else{
                settlementDetailEntityWrapper.eq("settlementRecordId", 0);
            }
        }else if (state!=null && state == 1){
            List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 2));
            if(paymentStatus.size() > 0){
                settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
            }else{
                settlementDetailEntityWrapper.eq("settlementRecordId", 0);
            }
        }
        if (time == 5 && !StringUtils.hasLength(insertTime)){


 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java

@@ -229,6 +229,26 @@
            TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
            return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
        }
        String fareTypeNoteChinese = tSystemPrice.getFareTypeNoteChinese();
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& lt;", "<");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& gt;", ">");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #40;", "(");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteChinese(fareTypeNoteChinese);
        String fareTypeNoteEnglish = tSystemPrice.getFareTypeNoteEnglish();
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& lt;", "<");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& gt;", ">");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #40;", "(");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteEnglish(fareTypeNoteEnglish);
        String fareTypeNoteFrench = tSystemPrice.getFareTypeNoteFrench();
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& lt;", "<");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& gt;", ">");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #40;", "(");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteFrench(fareTypeNoteFrench);
        
        
        tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
        tSystemPrice.setType(1);
        tSystemPrice.setState(1);
@@ -249,6 +269,25 @@
            TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
            return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
        }
        String fareTypeNoteChinese = tSystemPrice.getFareTypeNoteChinese();
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& lt;", "<");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& gt;", ">");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #40;", "(");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteChinese(fareTypeNoteChinese);
        String fareTypeNoteEnglish = tSystemPrice.getFareTypeNoteEnglish();
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& lt;", "<");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& gt;", ">");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #40;", "(");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteEnglish(fareTypeNoteEnglish);
        String fareTypeNoteFrench = tSystemPrice.getFareTypeNoteFrench();
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& lt;", "<");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& gt;", ">");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #40;", "(");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteFrench(fareTypeNoteFrench);
        
        tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
        tSystemPrice.setType(4);
        tSystemPrice.setState(1);
@@ -275,6 +314,25 @@
                return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
            }
        }
        String fareTypeNoteChinese = tSystemPrice.getFareTypeNoteChinese();
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& lt;", "<");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& gt;", ">");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #40;", "(");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteChinese(fareTypeNoteChinese);
        String fareTypeNoteEnglish = tSystemPrice.getFareTypeNoteEnglish();
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& lt;", "<");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& gt;", ">");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #40;", "(");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteEnglish(fareTypeNoteEnglish);
        String fareTypeNoteFrench = tSystemPrice.getFareTypeNoteFrench();
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& lt;", "<");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& gt;", ">");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #40;", "(");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteFrench(fareTypeNoteFrench);
        
        tSystemPriceService.updateById(tSystemPrice);
        return SUCCESS_TIP;
    }
@@ -295,6 +353,25 @@
                return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
            }
        }
        String fareTypeNoteChinese = tSystemPrice.getFareTypeNoteChinese();
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& lt;", "<");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& gt;", ">");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #40;", "(");
        fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteChinese(fareTypeNoteChinese);
        String fareTypeNoteEnglish = tSystemPrice.getFareTypeNoteEnglish();
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& lt;", "<");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& gt;", ">");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #40;", "(");
        fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteEnglish(fareTypeNoteEnglish);
        String fareTypeNoteFrench = tSystemPrice.getFareTypeNoteFrench();
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& lt;", "<");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& gt;", ">");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #40;", "(");
        fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #41;", ")");
        tSystemPrice.setFareTypeNoteFrench(fareTypeNoteFrench);
        
        tSystemPriceService.updateById(tSystemPrice);
        return SUCCESS_TIP;
    }

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml

@@ -143,7 +143,7 @@
        CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
        '市内小件物流' as typeStr,
        cc.type as companyType,
        dd.name as companyName,
        cc.name as companyName,
        ot.*,
        oc.money as cancelMoney,
        case when oc.payType = 1 then '手机支付'

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html

@@ -15,7 +15,7 @@
                    <#label id="recipient" name="收货人昵称" value="${item.recipient}"/>
                    <#label id="startAddress" name="起点" value="${item.startAddress}"/>
                    <#label id="driver" name="接单司机" value="${item.driver}"/>
                    <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
                    <#label id="companyName" name="订单所属机构" value="${item.companyName}"/>
                </div>

                <div class="col-sm-6">

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html

@@ -43,7 +43,7 @@
                    <#label id="passengersPhone" name="乘车用户手机号" value="${item.passengersPhone}"/>
                    <#label id="endAddress" name="终点" value="${item.endAddress}"/>
                    <#label id="driver" name="接单司机" value="${item.driver}"/>
                    <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
                    <#label id="companyName" name="订单所属机构" value="${item.companyName}"/>
                    <#label id="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/>
                    <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/>
                </div>