yanghb
2023-04-21 0481353111afb43a2322e18530dde26f1d841ead
代码调整
285个文件已修改
409个文件已删除
64个文件已添加
77010 ■■■■ 已修改文件
ManagementTravel/guns-admin/pom.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/BrandDict.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/CarDict.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/DriverDict.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/GunsUserFilter.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/Contrast.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/CarRentalController.java 771 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityHistoryController.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java 609 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java 419 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java 435 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantCouponController.java 157 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/PaymentRecordController.java 308 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/RecruitController.java 304 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java 644 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SellingCarController.java 892 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SpendingDetailPlatformController.java 2236 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdditionalFeeController.java 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java 139 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TComplaintController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java 205 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TMerchantController.java 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOfflineTravelPaymentController.java 176 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java 814 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TTaxiCardController.java 584 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserRedPacketRecordController.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TimeOutAppealController.java 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserCouponRecordController.java 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/AirLineController.java 380 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/AirSiteController.java 280 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java 137 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java 796 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java 130 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java 153 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarRentalMapper.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ComplaintDeductmoneyMapper.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MerchantActivityMapper.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MerchantActivitySlaveMapper.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MerchantCouponMapper.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MessNumMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PaymentRecordMapper.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RecruitMapper.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SellingCarMapper.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ShowModularMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SpellOrderRuleMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAdditionalFeeMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TBalanceModifyRecordMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyMapper.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TComplaintMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverMapper.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TMerchantActivityMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TMerchantMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOfflineTravelPaymentMapper.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderAdditionalFeeMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCallMapper.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderLogisticsMapper.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubWithdrawalMapper.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java 220 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysTimeoutMoneyMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysWithdrawalPoundageMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TTaxiCardMapper.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TTaxiCardPaymentMapper.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TTimeoutAppealMapper.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserMerchantCouponMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarRentalMapper.xml 124 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ComplaintDeductmoneyMapper.xml 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml 354 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MerchantActivityMapper.xml 253 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MerchantActivitySlaveMapper.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MerchantCouponMapper.xml 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MessNumMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PaymentRecordMapper.xml 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RecruitMapper.xml 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SellingCarMapper.xml 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ShowModularMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SpellOrderRuleMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdditionalFeeMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TBalanceModifyRecordMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml 253 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TMerchantActivityMapper.xml 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TMerchantMapper.xml 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOfflineTravelPaymentMapper.xml 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderAdditionalFeeMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCallMapper.xml 222 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml 341 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml 619 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysTimeoutMoneyMapper.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysWithdrawalPoundageMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TTaxiCardMapper.xml 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TTaxiCardPaymentMapper.xml 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TTimeoutAppealMapper.xml 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMerchantCouponMapper.xml 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarRental.java 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ComplaintDeductmoney.java 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/MerchantActivity.java 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/MerchantActivitySlave.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/MerchantCoupon.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/MessNum.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Recruit.java 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SellingCar.java 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ShowModular.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SpellOrderRule.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAdditionalFee.java 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TBalanceModifyRecord.java 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TMerchant.java 231 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TMerchantActivity.java 270 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOfflineTravelPayment.java 164 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderAdditionalFee.java 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCall.java 1012 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java 264 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderEvaluate.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java 304 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java 338 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java 355 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysWithdrawalPoundage.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java 201 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TTaxiCard.java 241 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TTaxiCardPayment.java 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TTimeoutAppeal.java 164 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUserRedPacketRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TransactionDetails.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityBalance.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount1.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserCouponRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserMerchantCoupon.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/response/MerchantActivityVo.java 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/response/UserRequest.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarRentalService.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IComplaintDeductmoneyService.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityHistoryService.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMerchantActivityService.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMerchantActivitySlaveService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMerchantCouponService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMessNumService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPaymentRecordService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRecruitService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISellingCarService.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IShowModularService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISpellOrderRuleService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAdditionalFeeService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITBalanceModifyRecordService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyService.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITComplaintService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITMerchantActivityService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITMerchantService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOfflineTravelPaymentService.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderAdditionalFeeService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCallService.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderLogisticsService.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubWithdrawalService.java 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java 177 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysTimeoutMoneyService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysWithdrawalPoundageService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITTaxiCardPaymentService.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITTaxiCardService.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITTimeoutAppealService.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITransactionDetailsService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserMerchantCouponService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarRentalServiceImpl.java 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintDeductmoneyServiceImpl.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java 460 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MerchantActivityServiceImpl.java 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MerchantActivitySlaveServiceImpl.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MerchantCouponServiceImpl.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MessNumServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PaymentRecordServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RecruitServiceImpl.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SellingCarServiceImpl.java 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ShowModularServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SpellOrderRuleServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdditionalFeeServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBalanceModifyRecordServiceImpl.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java 162 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TMerchantActivityServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TMerchantServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOfflineTravelPaymentServiceImpl.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderAdditionalFeeServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCallServiceImpl.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TReassignServiceImpl.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysTimeoutMoneyServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysWithdrawalPoundageServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TTaxiCardPaymentServiceImpl.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TTaxiCardServiceImpl.java 134 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TTimeoutAppealServiceImpl.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TransactionDetailsServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserMerchantCouponServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DESUtil.java 195 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GaoDeMapUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ICBCPayUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JpushUtil.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OrderUtil.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/resources/application.yml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airLine/airLine.html 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airLine/airLine_add.html 251 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airLine/airLine_addCompany.html 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airLine/airLine_edit.html 265 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airSite/airSite.html 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airSite/airSite_add.html 170 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airSite/airSite_edit.html 193 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/auditCarRental.html 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/auditCarRental_info.html 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/carRental.html 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/carRental_add.html 193 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/carRental_edit.html 204 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/carRental_info.html 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/complaintDeductmoney.html 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/order.html 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/otherOtherIncomeDetail.html 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/summaryOfIncomeDetails.html 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/summaryOfSpendingDetails.html 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/taxiCardPayment.html 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/timeOut.html 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/ActivityExamine.html 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity.html 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivityExamine.html 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_add.html 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_edit.html 122 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantCoupon.html 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/receivingRecord.html 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/merchantActivityGive.html 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/merchantActivityGive_add.html 124 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/merchantActivityGive_edit.html 134 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/merchantCoupon.html 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/receivingRecord.html 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/userInfo.html 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantCoupon/merchandiseCoupon.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantCoupon/merchantCoupon.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantCoupon/merchantCoupon_add.html 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantCoupon/merchantCoupon_edit.html 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/paymentRecord/balanceModify.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/paymentRecord/paymentRecord.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/recruit/recruit.html 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/recruit/recruit_add.html 190 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/recruit/recruit_edit.html 185 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/balanceModify.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/companyIncome.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/complaintDeductmoney.html 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/order.html 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/tCompany.html 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/tDriver.html 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/tPubWithdrawal.html 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/tUser.html 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/taxiCardPayment.html 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/auditSellingCar.html 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/auditSellingCar_info.html 314 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/sellingCar.html 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/sellingCar_add.html 342 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/sellingCar_edit.html 335 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/sellingCar_info.html 308 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/detail.html 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/hasCollectOrderDetail.html 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/noCollectOrderDetail.html 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/orderRevenueDetails.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/orderWithdrawalDetail.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/orderWithdrawalDetails.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/otherSpendingDetail.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/rewardDetails.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/rewardEarningDetail.html 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/rewardWithdrawalDetail.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/rewardWithdrawalDetails.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdditionalFee/tAdditionalFee.html 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdditionalFee/tAdditionalFee_add.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/carBuyingProblem.html 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/intimateAgreement.html 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/rentalCarAgreement.html 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/sellCarsAgreement.html 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementComplaintDeduct.html 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementTimeOutDeduct.html 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/deductmoney.html 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tComplaint.html 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tMerchant/tMerchantAudit.html 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tMerchant/tMerchantIndex.html 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOfflineTravelPayment/tOfflineTravelPayment.html 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOfflineTravelPayment/tOfflineTravelPayment_add.html 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOfflineTravelPayment/tOfflineTravelPayment_edit.html 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html 527 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html 111 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html 518 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTaxi.html 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/taxi.html 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html 1274 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html 1012 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html 1018 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCard.html 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCardAudit.html 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCardAudit_detail.html 229 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCardPayment.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCardPayment_detail.html 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCard_add.html 211 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCard_edit.html 229 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/timeOutAppeal/timeOutAppeal.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/css/bootstrap-select.css 458 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/css/bootstrap-select.css.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/css/bootstrap-select.min.css 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/bootstrap-select.js 3144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/bootstrap-select.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/bootstrap-select.min.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/bootstrap-select.min.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-am_ET.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-am_ET.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-am_ET.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ar_AR.js 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ar_AR.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ar_AR.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-bg_BG.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-bg_BG.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-bg_BG.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-cs_CZ.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-cs_CZ.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-cs_CZ.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-da_DK.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-da_DK.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-da_DK.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-de_DE.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-de_DE.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-de_DE.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-en_US.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-en_US.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-en_US.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_CL.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_CL.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_CL.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_ES.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_ES.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_ES.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-et_EE.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-et_EE.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-et_EE.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-eu.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-eu.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-eu.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fa_IR.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fa_IR.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fa_IR.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fi_FI.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fi_FI.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fi_FI.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fr_FR.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fr_FR.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fr_FR.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hr_HR.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hr_HR.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hr_HR.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hu_HU.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hu_HU.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hu_HU.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-id_ID.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-id_ID.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-id_ID.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-it_IT.js 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-it_IT.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-it_IT.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ja_JP.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ja_JP.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ja_JP.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-kh_KM.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-kh_KM.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-kh_KM.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ko_KR.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ko_KR.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ko_KR.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lt_LT.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lt_LT.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lt_LT.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lv_LV.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lv_LV.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lv_LV.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nb_NO.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nb_NO.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nb_NO.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nl_NL.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nl_NL.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nl_NL.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pl_PL.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pl_PL.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pl_PL.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_BR.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_BR.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_BR.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_PT.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_PT.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_PT.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ro_RO.js 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ro_RO.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ro_RO.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ru_RU.js 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ru_RU.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ru_RU.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sk_SK.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sk_SK.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sk_SK.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sl_SI.js 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sl_SI.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sl_SI.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sv_SE.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sv_SE.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sv_SE.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-tr_TR.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-tr_TR.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-tr_TR.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ua_UA.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ua_UA.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ua_UA.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-vi_VN.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-vi_VN.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-vi_VN.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_CN.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_CN.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_CN.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_TW.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_TW.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_TW.min.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/aes.js 234 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/cipher-core.js 890 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/core.js 807 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/crypto-js.js 6191 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-base64.js 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-base64url.js 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-hex.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-latin1.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-utf16.js 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-utf8.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/evpkdf.js 134 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/format-hex.js 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/format-openssl.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-md5.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-ripemd160.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha1.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha224.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha256.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha3.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha384.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha512.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac.js 143 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/index.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/lib-typedarrays.js 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/md5.js 268 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-cfb.js 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-ctr-gladman.js 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-ctr.js 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-ecb.js 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-ofb.js 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-ansix923.js 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-iso10126.js 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-iso97971.js 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-nopadding.js 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-pkcs7.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-zeropadding.js 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pbkdf2.js 145 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/rabbit-legacy.js 190 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/rabbit.js 192 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/rc4.js 139 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/ripemd160.js 267 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha1.js 150 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha224.js 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha256.js 199 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha3.js 326 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha384.js 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha512.js 326 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/tripledes.js 779 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/x64-core.js 304 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/home.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/img/icon100.png 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/img/login.png 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/js/common/bootstrap-table-object.js 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/js/md5.js 256 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airLine/airLine.js 244 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airLine/airLine_info.js 443 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airSite/airSite.js 231 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airSite/airSite_info.js 376 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airSite/electricFence.js 329 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/carRental/auditCarRental.js 189 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/carRental/auditCarRental_info.js 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/carRental/carRental.js 358 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/carRental/carRental_info.js 346 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/driverActivityHistory/driverActivityHistory.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/complaintDeductmoney.js 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/order.js 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/otherOtherIncomeDetail.js 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/summaryOfIncomeDetails.js 226 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/summaryOfSpendingDetails.js 208 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/taxiCardPayment.js 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/timeOut.js 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/activityExamine_info.js 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/merchantActivity.js 213 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/merchantActivityExamine.js 218 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/merchantActivity_info.js 399 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/merchantCoupon.js 127 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/receivingRecord.js 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/merchantActivityGive.js 200 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/merchantActivityGive_info.js 511 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/merchantCoupon.js 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/receivingRecord.js 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/userInfo.js 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantCoupon/merchandiseCoupon.js 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantCoupon/merchantCoupon.js 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantCoupon/merchantCoupon_info.js 137 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/paymentRecord/balanceModify.js 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/paymentRecord/paymentRecord.js 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/recruit/recruit.js 280 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/recruit/recruit_info.js 283 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/balanceModify.js 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/companyIncome.js 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/complaintDeductmoney.js 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/order.js 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/tCompany.js 316 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/tDriver.js 377 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/tPubWithdrawal.js 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/tUser.js 414 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/taxiCardPayment.js 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sellingCar/auditSellingCar.js 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sellingCar/auditSellingCar_info.js 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sellingCar/sellingCar.js 346 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sellingCar/sellingCar_info.js 528 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/hasCollectOrderDetail.js 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/noCollectOrderDetail.js 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/orderRevenueDetails.js 214 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/orderWithdrawalDetail.js 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/orderWithdrawalDetails.js 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/otherSpendingDetail.js 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/rewardDetails.js 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/rewardEarningDetail.js 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/rewardWithdrawalDetail.js 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/rewardWithdrawalDetails.js 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tAdditionalFee/tAdditionalFee.js 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js 442 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js 99 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js 116 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tComplaint/tComplaint.js 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/deductmoney.js 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tComplaint.js 264 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js 541 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tFeedback/tFeedback.js 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tFeedback/userFeedback.js 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js 78 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine_info.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tMerchant/tMerchant.js 183 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tMerchant/tMerchantAudit.js 273 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tMerchant/tMerchant_info.js 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOfflineTravelPayment/tOfflineTravelPayment.js 128 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOfflineTravelPayment/tOfflineTravelPayment_info.js 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity_info.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js 47 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics_info.js 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js 87 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js 225 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tProblem/tProblem.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectTaxiDriver.js 156 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tCross.js 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign.js 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign_info.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/taxi.js 333 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity_info.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/charter.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/charter_info.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js 836 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCard.js 209 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCardAudit.js 299 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCardPayment.js 177 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCard_info.js 1335 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tVerified/tVerified.js 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/timeOutAppeal/timeOutAppeal.js 279 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/user/user_info.js 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/pom.xml
@@ -64,14 +64,15 @@
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
            <version>3.9</version>
            <version>5.0.0</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
            <version>3.9</version>
            <version>5.0.0</version>
        </dependency>
        <!--shiro依赖-->
        <dependency>
            <groupId>org.apache.shiro</groupId>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java
@@ -102,7 +102,7 @@
    @Bean
    public CookieRememberMeManager rememberMeManager(SimpleCookie rememberMeCookie) {
        CookieRememberMeManager manager = new CookieRememberMeManager();
        manager.setCipherKey(Base64.decode("Z3VucwAAAAAAAAAAAAAAAA=="));
        manager.setCipherKey(Base64.decode(""));
        manager.setCookie(rememberMeCookie);
        return manager;
    }
@@ -112,7 +112,7 @@
     */
    @Bean
    public SimpleCookie rememberMeCookie() {
        SimpleCookie simpleCookie = new SimpleCookie("rememberMe");
        SimpleCookie simpleCookie = new SimpleCookie("");
        simpleCookie.setHttpOnly(true);
        simpleCookie.setMaxAge(7 * 24 * 60 * 60);//7天
        return simpleCookie;
@@ -160,6 +160,7 @@
         *
         */
        Map<String, String> hashMap = new LinkedHashMap<>();
        hashMap.put("/base/**", "anon");
        hashMap.put("/static/**", "anon");
        hashMap.put("/gunsApi/**", "anon");
        hashMap.put("/login", "anon");
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/BrandDict.java
@@ -17,7 +17,7 @@
        put("name","品牌名称");
        put("brandImg","品牌图片(多个用逗号隔开)");
        put("state","状态(1正常,2停用)");
        put("specialMode","快车计费");
        put("specialMode","专车计费");
        put("charteredMode","包车计费");
        put("seatNum","座位数");
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/CarDict.java
@@ -20,7 +20,7 @@
        put("licenseImg","行驶证照片");
        put("brandId","关联品牌id");
        put("color","车辆颜色");
        put("serviceMode","服务模式(1快车,2包车)");
        put("serviceMode","服务模式(1专车,2包车)");
        put("state","状态(1正常,2停用)");
        put("insuranceNumber","保险编号");
        put("insuranceImg","保险图片");
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/DriverDict.java
@@ -20,7 +20,7 @@
        put("sex","性别");
        put("password","登录密码");
        put("state","状态(1正常,2停用)");
        put("serviceMode","服务模式(1快车,2包车)");
        put("serviceMode","服务模式(1专车,2包车)");
        put("driveNumber","驾驶证编号");
        put("driveImg","驾驶证照片");
        put("carId","车辆id");
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/GunsUserFilter.java
@@ -41,13 +41,13 @@
    /**
     * Returns <code>true</code> if the request is a
     * {@link #isLoginRequest(javax.servlet.ServletRequest, javax.servlet.ServletResponse) loginRequest} or
     * if the current {@link #getSubject(javax.servlet.ServletRequest, javax.servlet.ServletResponse) subject}
     * {@link #isLoginRequest(ServletRequest, ServletResponse) loginRequest} or
     * if the current {@link #getSubject(ServletRequest, ServletResponse) subject}
     * is not <code>null</code>, <code>false</code> otherwise.
     *
     * @return <code>true</code> if the request is a
     * {@link #isLoginRequest(javax.servlet.ServletRequest, javax.servlet.ServletResponse) loginRequest} or
     * if the current {@link #getSubject(javax.servlet.ServletRequest, javax.servlet.ServletResponse) subject}
     * {@link #isLoginRequest(ServletRequest, ServletResponse) loginRequest} or
     * if the current {@link #getSubject(ServletRequest, ServletResponse) subject}
     * is not <code>null</code>, <code>false</code> otherwise.
     */
    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
@@ -62,7 +62,7 @@
    /**
     * This default implementation simply calls
     * {@link #saveRequestAndRedirectToLogin(javax.servlet.ServletRequest, javax.servlet.ServletResponse) saveRequestAndRedirectToLogin}
     * {@link #saveRequestAndRedirectToLogin(ServletRequest, ServletResponse) saveRequestAndRedirectToLogin}
     * and then immediately returns <code>false</code>, thereby preventing the chain from continuing so the redirect may
     * execute.
     */
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/Contrast.java
@@ -138,7 +138,7 @@
                Method getMethod = null;
                try {
                    getMethod = clazz.getDeclaredMethod(prefix + StrKit.firstCharToUpperCase(field.getName()));
                } catch (java.lang.NoSuchMethodException e) {
                } catch (NoSuchMethodException e) {
                    System.err.println("this className:" + clazz.getName() + " is not methodName: " + e.getMessage());
                    continue;
                }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/CarRentalController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
@@ -86,7 +86,7 @@
        model.addAttribute("id2",driverActivityRegistered.getId());
        DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",1));
        model.addAttribute("id3",driverActivityOnline.getId());
        //统计快车在线
        //统计专车在线
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
        model.addAttribute("id4",driverActivityOnline.getId());
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",3));
@@ -143,7 +143,7 @@
        map.put("number2",number);
        DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId)
                .eq("type",1).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
        //统计快车在线
        //统计专车在线
        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
        money=0d;
        number=0;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityHistoryController.java
@@ -1,12 +1,8 @@
package com.stylefeng.guns.modular.system.controller.general;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -18,12 +14,6 @@
import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
import com.stylefeng.guns.modular.system.service.IDriverActivityHistoryService;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
@@ -119,62 +109,5 @@
    @ResponseBody
    public Object detail(@PathVariable("driverActivityHistoryId") Integer driverActivityHistoryId) {
        return driverActivityHistoryService.selectById(driverActivityHistoryId);
    }
    /**
     * 导出
     */
    @RequestMapping(value = "/exportRecord")
    @ResponseBody
    public Object exportRecord(HttpServletResponse response, @RequestParam Integer activityId, @RequestParam Integer type) {
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "";
            if (type == 1){
                fileName = "邀请司机注册记录"+time+".xls";
            }else if (type == 2){
                fileName = "邀请用户注册记录"+time+".xls";
            }else if (type == 3){
                fileName = "累计在线记录"+time+".xls";
            }else if (type == 4){
                fileName = "订单数奖励记录"+time+".xls";
            }
            String[] title = new String[] {"领取时间","领取人","领取人电话","领取金额"};
            List<Map<String,Object>> mapList = driverActivityHistoryService.getListt(activityId,type);
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("collectionTime").toString();
                values[i][1]=d.get("name").toString();
                values[i][2]=d.get("phone").toString();
                values[i][3]=d.get("money").toString();
            }
            String fileNameTitle="";
            if (type == 1){
                fileNameTitle = "邀请司机注册记录";
            }else if (type == 2){
                fileNameTitle = "邀请用户注册记录";
            }else if (type == 3){
                fileNameTitle = "累计在线记录";
            }else if (type == 4){
                fileNameTitle = "订单数奖励记录";
            }
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(fileNameTitle+time, title, values, null);
            ExcelUtil.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -12,6 +12,7 @@
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.sun.org.apache.regexp.internal.RE;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -43,9 +44,6 @@
    private ITCarService tCarService;
    @Autowired
    private ITTaxiCardService taxiCardService;
    @Autowired
    private RedisUtil redisUtil;
    @Autowired
@@ -74,6 +72,7 @@
    @Autowired
    private IDriverOnlineService driverOnlineService;
    @RequestMapping("/openNetCarInfo")
    public Object openNetCarInfo(Integer id, Model model){
@@ -165,7 +164,7 @@
            zcTodayTme.eq("companyId", companyId);
        }
        int zcTodayNum = itOrderPrivateCarService.selectCount(zcTodayTme);
        map1.put("orderDetail1", zcTodayNum);  //快车订单
        map1.put("orderDetail1", zcTodayNum);  //专车订单
        Wrapper<TOrderCrossCity> kcTodayTme = new EntityWrapper<TOrderCrossCity>().between("travelTime", calendar1.getTime(), calendar2.getTime());
        if(companyId != null){
@@ -220,11 +219,8 @@
        Double allTradeMoney = tOrderTaxiService.getAllTradeMoney(companyId, null, null);
        Double allIncomeMoney = tOrderTaxiService.getAllIncomeMoney(companyId, null, null);
        ///   购买打车卡产生的收益
        double allCardMoney = taxiCardService.AllCardMoney(ShiroKit.getUser().getObjectId());
        map1.put("paiceSum", allTradeMoney + allCardMoney);  //交易总金额
        map1.put("paySum", allIncomeMoney + allCardMoney);  //总收益
        map1.put("paiceSum", allTradeMoney);  //交易总金额
        map1.put("paySum", allIncomeMoney);  //总收益
        map.put("operationSum", map1);
        //【运营数据增长查询】
@@ -248,7 +244,7 @@
            zcTodayTmeByConditions.eq("companyId", companyId);
        }
        int zcTodayNum1 = itOrderPrivateCarService.selectCount(zcTodayTmeByConditions);
        map1.put("orderDetail1", zcTodayNum1);  //快车订单
        map1.put("orderDetail1", zcTodayNum1);  //专车订单
        Wrapper<TOrderTaxi> travelTime2 = new EntityWrapper<TOrderTaxi>().between("travelTime", calendar3.getTime(), calendar4.getTime());
        if(companyId != null){
@@ -335,7 +331,7 @@
            Integer allOrderNum = tOrderTaxiService.getAllOrderNum(companyId, startTime1, endTime1);
            m3.add(allOrderNum);
            //快车订单趋势图
            //专车订单趋势图
            Wrapper<TOrderPrivateCar> inZC = new EntityWrapper<TOrderPrivateCar>().between("travelTime", s1.getTime(), e1.getTime()).in("state", states);
            if(companyId != null){
                inZC.eq("companyId", companyId);
@@ -373,7 +369,7 @@
        map1.put("orderDetail5", m7);  //跨城物流订单数趋势图
        map1.put("orderDetail4", m6);  //同城物流订单数趋势图
        map1.put("orderDetail3", m5);  //跨城订单数趋势图
        map1.put("orderDetail1", m4);  //快车订单数趋势图
        map1.put("orderDetail1", m4);  //专车订单数趋势图
        map1.put("orderDetailSum", m3);  //全部订单数趋势图
        map1.put("passengerInfoSum", m2);  //用户注册趋势图
        map1.put("orderDetail2", m1);  //出租车订单趋势图
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantCouponController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/PaymentRecordController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/RecruitController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java
@@ -2,17 +2,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TBalanceModifyRecord;
import com.stylefeng.guns.modular.system.model.TCompany;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.service.ITCompanyService;
import com.stylefeng.guns.modular.system.service.IUserActivityDiscount1Service;
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import com.stylefeng.guns.modular.system.service.IUserRedPacketRecordService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,26 +15,19 @@
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 报表控制器
 */
@Controller
@RequestMapping("/report")
public class ReportController extends BaseController {
public class ReportController {
    private String PREFIX = "/system/report/";
@@ -54,611 +42,6 @@
    @Autowired
    private IUserActivityDiscount1Service userActivityDiscount1Service;
    @Autowired
    private ITBalanceModifyRecordService balanceModifyRecordService;
    @Autowired
    private ITPubWithdrawalService tPubWithdrawalService;
    @Autowired
    private IComplaintDeductmoneyService complaintDeductmoneyService;
    @Autowired
    private ITTaxiCardPaymentService taxiCardPaymentService;
    @Autowired
    private ITOrderTaxiService orderTaxiService;
    /**
     * 跳转到用户管理首页
     */
    @RequestMapping("user")
    public String user() {
        return PREFIX + "tUser.html";
    }
    /**
     * 跳转到订单收益
     * @return
     */
    @RequestMapping("order")
    public String order() {
        return PREFIX + "order.html";
    }
    /**
     * 跳转公司
     * @return
     */
    @RequestMapping("company")
    public String company() {
        return PREFIX + "tCompany.html";
    }
    /**
     * 分公司收益
     * @return
     */
    @RequestMapping("companyIncome")
    public String companyIncome() {
        return PREFIX + "companyIncome.html";
    }
    @RequestMapping(value = "/orderList")
    @ResponseBody
    public Object orderList(String insertTime,
                                    String ids,Integer type,String payType) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        /*if (ShiroKit.getUser().getRoleType() != 1){
            page.setRecords(null);
        }else{*/
            List<Map<String,Object>> list = orderTaxiService.getOrderList(page,beginTime,endTime,ids,type,payType,ShiroKit.getUser().getObjectId());
            page.setRecords(list);
       /* }*/
        return super.packForBT(page);
    }
    @RequestMapping("/exportOrder")
    @ResponseBody
    public Object exportOrder(HttpServletResponse response, String insertTime,
                              String ids,Integer type,String payType){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "订单收益"+time+".xls";
            String[] title = new String[] {"订单时间","订单号","订单类型"
                    ,"支付方式","订单状态","司机名称","司机手机号","用户名称"
                    ,"用户id","用户手机号","平台收入","订单收入","附加费"
                    ,"加价费","节假日服务费","取消费","改派费","超时罚款"
                    ,"优惠金额","感谢费","小件物流差价费","平台支出","司机收入"
                    ,"附加费","节假日服务费","加价费","感谢费","小件物流差价费","余额"
            };
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(insertTime)){
                String[] timeArray = insertTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = orderTaxiService.getOrderListEx(beginTime,endTime,ids,type,payType,ShiroKit.getUser().getObjectId());
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("insertTime").toString();
                values[i][1]=d.get("orderNum").toString();
                values[i][2]=d.get("type").toString().equals("1")?"快车":
                        d.get("type").toString().equals("2")?"出租车":
                                d.get("type").toString().equals("3")?"城际":
                                        d.get("type").toString().equals("4")?"同城物流":"跨城物流";
                values[i][3]=d.get("payTypeName").toString();
                values[i][4]=d.get("payState").toString();
                values[i][5]=d.get("driverName").toString();
                values[i][6]=d.get("driverPhone").toString();
                values[i][7]=d.get("userName").toString();
                values[i][8]=d.get("userId").toString();
                values[i][9]=d.get("userPhone").toString();
                values[i][10]=d.get("totalMoney").toString();
                values[i][11]=d.get("orderMoney").toString();
                values[i][12]=d.get("additionalMoney").toString();
                values[i][13]=d.get("tipMoney").toString();
                values[i][14]=d.get("holidayFee").toString();
                values[i][15]=d.get("cancleMoney").toString();
                values[i][16]=d.get("reassignMoney").toString();
                values[i][17]=d.get("timeOutMoney").toString();
                values[i][18]=d.get("discountAmount").toString();
                values[i][19]=d.get("thankYouFee").toString();
                values[i][20]=d.get("spreadMoney").toString();
                values[i][21]=d.get("driverMoney").toString();
                values[i][22]=(Double.parseDouble(d.get("driverMoney").toString())-Double.parseDouble(d.get("additionalMoney").toString())
                        -Double.parseDouble(d.get("holidayFee").toString())
                        -Double.parseDouble(d.get("tipMoney").toString())
                        -Double.parseDouble(d.get("thankYouFee").toString())
                        -Double.parseDouble(d.get("spreadMoney").toString())
                )+"";
                values[i][23]=d.get("additionalMoney").toString();
                values[i][24]=d.get("holidayFee").toString();
                values[i][25]=d.get("tipMoney").toString();
                values[i][26]=d.get("thankYouFee").toString();
                values[i][27]=d.get("spreadMoney").toString();
                values[i][28]=(Double.parseDouble(d.get("totalMoney").toString())-Double.parseDouble(d.get("driverMoney").toString()))+"";
            }
            String fileNameTitle="订单收益";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
    @RequestMapping(value = "/companyIncomeList")
    @ResponseBody
    public Object companyIncomeList(String insertTime,
                                      String ids) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
            page.setRecords(null);
        }else{
            List<Map<String,Object>> list = companyService.getCompanyIncomeList(page,beginTime,endTime,ids);
            Map<String,Object> map = new HashMap<>();
            map.put("id","合计");
            map.put("money",companyService.getSumCompanyIncomeMoney(beginTime,endTime,ids));
            list.add(map);
            page.setRecords(list);
        }
        return super.packForBT(page);
    }
    @RequestMapping("/exportCompanyIncome")
    @ResponseBody
    public Object exportCompanyIncome(HttpServletResponse response, String insertTime, @RequestParam String ids){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "分公司收益"+time+".xls";
            String[] title = new String[] {"id","公司名称","收益金额"};
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(insertTime)){
                String[] timeArray = insertTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = companyService.getCompanyIncomeListEx(beginTime,endTime,ids);
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("id").toString();
                values[i][1]=d.get("name").toString();
                values[i][2]=d.get("money").toString();
            }
            String fileNameTitle="分公司收益";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
    /**
     * 跳转司机管理页面
     * @return
     */
    @RequestMapping("driver")
    public String driver() {
        return PREFIX + "tDriver.html";
    }
    /**
     * 打车卡
     * @return
     */
    @RequestMapping("/taxiCardPayment")
    public String taxiCardPayment() {
        return PREFIX + "taxiCardPayment.html";
    }
    @RequestMapping(value = "/taxiCardPaymentList")
    @ResponseBody
    public Object taxiCardPaymentList(String insertTime,
                                           String ids,String type) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
            List<Map<String,Object>> list = taxiCardPaymentService.getList(page,beginTime,endTime,ids,type,null,null,null,null,ShiroKit.getUser().getObjectId());
            Map<String,Object> map = new HashMap<>();
            map.put("id","合计");
            map.put("payMoney",taxiCardPaymentService.getSumMoney(beginTime,endTime,ids,type,null,null,null,null,ShiroKit.getUser().getObjectId()));
            list.add(map);
            page.setRecords(list);
        return super.packForBT(page);
    }
    @RequestMapping("/exportTaxiCardPayment")
    @ResponseBody
    public Object exportTaxiCardPaymentList(HttpServletResponse response, String insertTime, @RequestParam String ids,String type){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "打车卡"+time+".xls";
            String[] title = new String[] {"支付时间","乘客名称","乘客电话","订单ID","打车卡类型","用户支付金额"};
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(insertTime)){
                String[] timeArray = insertTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = taxiCardPaymentService.getListEx(beginTime,endTime,ids,type,null,null,null,null,ShiroKit.getUser().getObjectId());
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("createTime").toString();
                values[i][1]=d.get("nickName").toString();
                values[i][2]=d.get("phone").toString();
                values[i][3]=d.get("id").toString();
                values[i][4]=d.get("typeName").toString();
                values[i][5]=d.get("payMoney").toString();
            }
            String fileNameTitle="打车卡";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
    /**
     * 跳转投诉扣款
     * @return
     */
    @RequestMapping("/complaintDeductmoney")
    public String complaintDeductmoney() {
        return PREFIX + "complaintDeductmoney.html";
    }
    @RequestMapping(value = "/complaintDeductmoneyList")
    @ResponseBody
    public Object complaintDeductmoneyList(String insertTime,
                                 String ids) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
            page.setRecords(null);
        }else{
            List<Map<String,Object>> list = complaintDeductmoneyService.getList(page,beginTime,endTime,ids,null,null,null,ShiroKit.getUser().getObjectId());
            Map<String,Object> map = new HashMap<>();
            map.put("id","合计");
            map.put("money",complaintDeductmoneyService.getSumMoney(beginTime,endTime,ids,null,null,null,ShiroKit.getUser().getObjectId()));
            list.add(map);
            page.setRecords(list);
        }
        return super.packForBT(page);
    }
    @RequestMapping("/exportComplaintDeductmoney")
    @ResponseBody
    public Object exportComplaintDeductmoney(HttpServletResponse response, String insertTime, @RequestParam String ids){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "投诉扣款"+time+".xls";
            String[] title = new String[] {"司机名称","处罚时间","司机电话","投诉扣款"};
            Wrapper wrapper = new EntityWrapper<TBalanceModifyRecord>();
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(insertTime)){
                String[] timeArray = insertTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = complaintDeductmoneyService.getListEx(beginTime,endTime,ids,null,null,null,ShiroKit.getUser().getObjectId());
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("name").toString();
                values[i][1]=d.get("createTime").toString();
                values[i][2]=d.get("phone").toString();
                values[i][3]=d.get("money").toString();
            }
            String fileNameTitle="投诉扣款";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
    /**
     * 投诉扣款
     * @return
     */
    @RequestMapping("/balanceModify")
    public String balanceModifyIndex() {
        return PREFIX + "balanceModify.html";
    }
    /**
     * 跳转到提现列表首页
     */
    @RequestMapping("withdrawal")
    public String withdrawal() {
        return PREFIX + "tPubWithdrawal.html";
    }
    /**
     * 获取提现列表列表
     */
    @RequestMapping(value = "/withdrawalList")
    @ResponseBody
    public Object withdrawalList(String insertTime,
                       String ids) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
            page.setRecords(null);
        }else{
            List<Map<String,Object>> list = tPubWithdrawalService.getReportWithdrawalList(page,beginTime,endTime,ids);
            Map<String,Object> map = tPubWithdrawalService.getSumMoney(beginTime,endTime,ids);
            if(map!=null){
                map.put("id","合计");
                list.add(map);
            }
            page.setRecords(list);
        }
        return super.packForBT(page);
    }
    @RequestMapping("/exportWithdrawal")
    @ResponseBody
    public Object exportWithdrawal(HttpServletResponse response, String insertTime, @RequestParam String ids){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "司机提现"+time+".xls";
            String[] title = new String[] {"司机名称","提现时间","提现金额","提现扣除手续费"};
            Wrapper wrapper = new EntityWrapper<TBalanceModifyRecord>();
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(insertTime)){
                String[] timeArray = insertTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = tPubWithdrawalService.getReportWithdrawalListEx(beginTime,endTime,ids);
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("userName").toString();
                values[i][1]=d.get("insertTime").toString();
                values[i][2]=d.get("money").toString();
                values[i][3]=(Double.parseDouble(d.get("money").toString())-Double.parseDouble(d.get("realGetMoney").toString()))+"";
            }
            String fileNameTitle="司机提现";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
    /**
     * 余额修改记录列表
     * @return
     */
    @RequestMapping("/balanceModifylist")
    @ResponseBody
    public Object balanceModifylist(String userId, String startTime, String endTime) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        Wrapper wrapper = new EntityWrapper<TBalanceModifyRecord>();
        wrapper.eq("1",1);
        if (ToolUtil.isNotEmpty(userId)){
            wrapper.last(" and find_in_set(userId,\""+ userId+"\")");
        }
        if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)){
            wrapper.between("createTime",startTime + " 00:00:00",endTime + " 23:59:59");
        }
        List<Map<String,Object>> list = balanceModifyRecordService.selectMapsPage(page,wrapper).getRecords();
        Map<String,Object> map = new HashMap<>();
        map.put("id","合计");
        map.put("money",balanceModifyRecordService.getSumMoney(userId,ToolUtil.isEmpty(startTime)?null:startTime + " 00:00:00",ToolUtil.isEmpty(startTime)?null:endTime + " 23:59:59"));
        list.add(map);
        page.setRecords(list);
        return super.packForBT(page);
    }
    /**
     * 导出用户余额修改记录
     * @param response
     * @param userId
     * @param startTime
     * @param endTime
     * @return
     */
    @RequestMapping("/exportRecordBalanceModify")
    @ResponseBody
    public Object exportRecordBalanceModify(HttpServletResponse response,  @RequestParam String userId,
                                            @RequestParam String startTime, @RequestParam String endTime){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "余额修改记录"+time+".xls";
            String[] title = new String[] {"修改时间","流水ID","用户ID","用户名称","用户手机号","金额","类型"};
            Wrapper wrapper = new EntityWrapper<TBalanceModifyRecord>();
            wrapper.eq("1",1);
            if (ToolUtil.isNotEmpty(userId)){
                wrapper.last(" and find_in_set(userId,\""+ userId+"\")");
            }
            String searchTime="";
            if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)){
                searchTime=startTime+" - "+endTime;
                wrapper.between("createTime",startTime + " 00:00:00",endTime + " 23:59:59");
            }
            List<Map<String,Object>> mapList = balanceModifyRecordService.selectMaps(wrapper);
            for (Map<String, Object> map : mapList) {
                if (map.get("type").toString().equals("1")){
                    map.put("typeStr","增加");
                }else if (map.get("type").toString().equals("2")){
                    map.put("typeStr","减少");
                }
            }
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("createTime").toString();
                values[i][1]=d.get("recordID").toString();
                values[i][2]=d.get("userId").toString();
                if (ToolUtil.isNotEmpty(d.get("userName"))){
                    values[i][3]=d.get("userName").toString();
                }else {
                    values[i][3]="";
                }
                if (ToolUtil.isNotEmpty(d.get("phone"))){
                    values[i][4]=d.get("phone").toString();
                }else {
                    values[i][4]="";
                }
                values[i][5]=d.get("money").toString();
                values[i][6]=d.get("typeStr").toString();
            }
            String fileNameTitle="余额修改记录";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,searchTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
@@ -1046,23 +429,6 @@
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }
    /**
     * 设置文件响应头
     * @param response
     * @param fileName
     */
    private void setResponseHeader(HttpServletResponse response, String fileName) {
        try {
            response.setContentType("application/octet-stream;charset=UTF-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes(),"iso-8859-1"));
            response.addHeader("Pargam", "no-cache");
            response.addHeader("Cache-Control", "no-cache");
        } catch (Exception ex) {
            ex.printStackTrace();
        }
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SellingCarController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SpendingDetailPlatformController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java
@@ -42,9 +42,7 @@
     * 跳转到首页
     */
    @RequestMapping("")
    public String index(Model model) {
        model.addAttribute("jumpType",1);
        model.addAttribute("num",0);
    public String index() {
        return PREFIX + "sysCouponRecord.html";
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdditionalFeeController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.util.AddAdminLogUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -235,75 +234,6 @@
    }
    /**
     * 跳转到添加亲密账户协议管理
     */
    @RequestMapping("/intimateAgreement")
    public String intimateAgreement(Model model) {
        TAgreement tAgreement = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type",16));
        if (ToolUtil.isEmpty(tAgreement)){
            tAgreement = new TAgreement();
            tAgreement.setContent("");
            tAgreement.setId(0);
        }
        model.addAttribute("item",tAgreement);
        return PREFIX + "intimateAgreement.html";
    }
    /**
     * 租车协议
     * @param model
     * @return
     */
    @RequestMapping("/rentalCarAgreement")
    public String rentalCarAgreement(Model model) {
        TAgreement tAgreement = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type",19));
        if (ToolUtil.isEmpty(tAgreement)){
            tAgreement = new TAgreement();
            tAgreement.setContent("");
            tAgreement.setId(0);
        }
        model.addAttribute("item",tAgreement);
        return PREFIX + "rentalCarAgreement.html";
    }
    /**
     * 车辆售卖协议
     * @param model
     * @return
     */
    @RequestMapping("/sellCarsAgreement")
    public String sellCarsAgreement(Model model) {
        TAgreement tAgreement = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type",20));
        if (ToolUtil.isEmpty(tAgreement)){
            tAgreement = new TAgreement();
            tAgreement.setContent("");
            tAgreement.setId(0);
        }
        model.addAttribute("item",tAgreement);
        return PREFIX + "sellCarsAgreement.html";
    }
    /**
     * 车辆售卖协议
     * @param model
     * @return
     */
    @RequestMapping("/carBuyingProblem")
    public String carBuyingProblem(Model model) {
        TAgreement tAgreement = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type",21));
        if (ToolUtil.isEmpty(tAgreement)){
            tAgreement = new TAgreement();
            tAgreement.setContent("");
            tAgreement.setId(0);
        }
        model.addAttribute("item",tAgreement);
        return PREFIX + "carBuyingProblem.html";
    }
    /**
     * 获取用户端协议管理列表
     */
    @RequestMapping(value = "/list")
@@ -342,46 +272,6 @@
        return SUCCESS_TIP;
    }
    /**
     * 新增或修改亲密账户协议
     */
    @RequestMapping(value = "/addOrUpdateIntimateAgreement")
    @ResponseBody
    public Object addOrUpdateIntimateAgreement(TAgreement tAgreement) {
        if (tAgreement.getId() == 0){
            tAgreement.setId(null);
            tAgreement.setInsertUser(ShiroKit.getUser().getName());
            tAgreement.setUseType(1);
            tAgreement.setType(16);
            tAgreement.setFlag("1");
            tAgreement.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
            tAgreement.setUpdateUser(ShiroKit.getUser().getId());
            ///     过滤富文本的特殊字符
            String content = tAgreement.getContent();
            content = content.replaceAll("& lt;", "<").replaceAll("& gt;", ">");
            content = content.replaceAll("\\(", "& #40;").replaceAll("\\)", "& #41;");
            tAgreement.setContent(content);
            tAgreementService.insert(tAgreement);
        }else {
            tAgreement.setUpdateUser(ShiroKit.getUser().getId());
            tAgreement.setUpdateTime(DateUtil.parseTime(DateUtil.getTime()));
            tAgreement.setFlag("2");
            ///     过滤富文本的特殊字符
            String content = tAgreement.getContent();
            content = content.replaceAll("& lt;", "<").replaceAll("& gt;", ">");
            content = content.replaceAll("\\(", "& #40;").replaceAll("\\)", "& #41;");
            tAgreement.setContent(content);
            tAgreementService.updateById(tAgreement);
        }
        return SUCCESS_TIP;
    }
    /**
     * 用户端协议管理详情
     */
@@ -389,32 +279,5 @@
    @ResponseBody
    public Object detail(@PathVariable("tAgreementId") Integer tAgreementId) {
        return tAgreementService.selectById(tAgreementId);
    }
    /**
     * 跳转到超时扣款协议
     * @param model
     * @return
     */
    @RequestMapping("/timeOutDeduct")
    public String timeOutDeduct(Model model) {
        TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 17));
        model.addAttribute("one",one);
        return PREFIX + "tAgreementTimeOutDeduct.html";
    }
    /**
     * 跳转到投诉扣款协议
     * @param model
     * @return
     */
    @RequestMapping("/complaintDeduct")
    public String complaintDeduct(Model model) {
        TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 18));
        model.addAttribute("one",one);
        return PREFIX + "tAgreementComplaintDeduct.html";
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -101,13 +101,13 @@
     */
    @RequestMapping("/tCar_add")
    public String tCarAdd(Model model) {
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
        model.addAttribute("companyList",companyList);
        Integer roleType = ShiroKit.getUser().getRoleType();
        model.addAttribute("roleType",roleType);
        if (2 == roleType){
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()).eq("state", 0).ne("flag", 3));
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
            model.addAttribute("franchiseeList",franchiseeList);
        }else{
            model.addAttribute("franchiseeList",null);
@@ -158,12 +158,12 @@
        model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
        if (1 == roleType){
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
            model.addAttribute("companyList",companyList);
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tCar.getCompanyId()).eq("state", 0).ne("flag", 3));
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tCar.getCompanyId()));
            model.addAttribute("franchiseeList",franchiseeList);
        }else if (2 == roleType){
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()).eq("state", 0).ne("flag", 3));
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
            model.addAttribute("franchiseeList",franchiseeList);
        }
@@ -542,43 +542,8 @@
            }
            tCarServiceService.insert(service);
        }
        TCar obj = tCarService.selectById(tCar.getId());
        obj.setCompanyId(tCar.getCompanyId());
        obj.setFranchiseeId(tCar.getFranchiseeId());
        obj.setCarColor(tCar.getCarColor());
        obj.setCarModelId(tCar.getCarModelId());
        obj.setCarBrandId(tCar.getCarBrandId());
        obj.setCarLicensePlate(tCar.getCarLicensePlate());
        obj.setCarPhoto(tCar.getCarPhoto());
        obj.setDrivingLicenseNumber(tCar.getDrivingLicenseNumber());
        obj.setDrivingLicensePhoto(tCar.getDrivingLicensePhoto());
        obj.setAnnualInspectionTime(tCar.getAnnualInspectionTime());
        obj.setCommercialInsuranceTime(tCar.getCommercialInsuranceTime());
        obj.setPlateColor(tCar.getPlateColor());
        obj.setVehicleType(tCar.getVehicleType());
        obj.setOwnerName(tCar.getOwnerName());
        obj.setEngineId(tCar.getEngineId());
        obj.setVIN(tCar.getVIN());
        obj.setCertifyDateA(tCar.getCertifyDateA());
        obj.setCertifyDateB(tCar.getCertifyDateB());
        obj.setFuelType(tCar.getFuelType());
        obj.setEngineDisplace(tCar.getEngineDisplace());
        obj.setCertificate(tCar.getCertificate());
        obj.setTransAgency(tCar.getTransAgency());
        obj.setTransArea(tCar.getTransArea());
        obj.setTransDateStart(tCar.getTransDateStart());
        obj.setTransDateStop(tCar.getTransDateStop());
        obj.setFixState(tCar.getFixState());
        obj.setNextFixDate(tCar.getNextFixDate());
        obj.setCheckState(tCar.getCheckState());
        obj.setFeePrintId(tCar.getFeePrintId());
        obj.setGPSBrand(tCar.getGPSBrand());
        obj.setGPSIMEI(tCar.getGPSIMEI());
        obj.setGPSInstallDate(tCar.getGPSInstallDate());
        obj.setGPSModel(tCar.getGPSModel());
        obj.setRegisterDate(tCar.getRegisterDate());
        obj.setCommercialType(tCar.getCommercialType());
        tCarService.updateAllColumnById(obj);
        tCarService.updateById(tCar);
        new Thread(new Runnable() {
            @Override
            public void run() {
@@ -614,7 +579,7 @@
        shellList.add("所属机构[平台车辆/加盟车辆]");
        shellList.add("所属分公司[提示:加盟车辆选填]");
        shellList.add("所属加盟商[提示:加盟车辆选填]");
        shellList.add("服务模式:快车[是/否]");
        shellList.add("服务模式:专车[是/否]");
        shellList.add("服务模式:出租车[是/否]");
        shellList.add("服务模式:跨城出行[是/否]");
        shellList.add("服务模式:小件同城物流[是/否]");
@@ -678,7 +643,7 @@
                    two = String.valueOf(cell2.getStringCellValue()).trim();
                }
                Cell cell3 = row.getCell(3);  //服务模式:快车[是/否]
                Cell cell3 = row.getCell(3);  //服务模式:专车[是/否]
                String three = null;
                if (SinataUtil.isNotEmpty(cell3)){
                    three = String.valueOf(cell3.getStringCellValue()).trim();
@@ -767,9 +732,9 @@
                    if (!zero.equals("平台车辆") && !zero.equals("加盟车辆")){
                        return new ErrorTip(500, "所属机构内容不正确");
                    }
                    //判断服务模式【快车】
                    //判断服务模式【专车】
                    if (!three.equals("是") && !three.equals("否")){
                        return new ErrorTip(500, "服务模式【快车】内容不正确");
                        return new ErrorTip(500, "服务模式【专车】内容不正确");
                    }
                    //判断服务模式【出租车】
                    if (!four.equals("是") && !four.equals("否")){
@@ -879,7 +844,7 @@
                    }
                    tCarService.insert(car);
                    //添加快车服务模式
                    //添加专车服务模式
                    if ("是".equals(three)){
                        TCarService service = new TCarService();
                        service.setCarId(car.getId());
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -10,9 +10,10 @@
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.service.ITCompanyCityService;
import com.stylefeng.guns.modular.system.service.ITRegionService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -23,6 +24,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.service.ITCompanyService;
import java.util.ArrayList;
import java.util.Date;
@@ -49,9 +51,6 @@
    @Autowired
    private IUserService userService;
    @Autowired
    private ITTaxiCardService cardService;
    @Autowired
    private ITCompanyCityService tCompanyCityService;
@@ -240,29 +239,6 @@
        return list;
    }
    ////   移除经营区域时校验
    @RequestMapping(value = "/searchArea")
    @ResponseBody
    public Object searchArea(Integer companyId, Integer id) {
        List<TTaxiCard> list = cardService.selectList(new EntityWrapper<TTaxiCard>().eq("companyId",companyId));
        for (TTaxiCard tTaxiCard : list) {
            if (ToolUtil.isNotEmpty(tTaxiCard.getCompanyCityId())){
                String[] arr = tTaxiCard.getCompanyCityId().split(";");
                for (String s : arr) {
                    if (s.equals(id.toString())){
                        return "该区域正被打车卡使用,不允许移除";
                    }
                }
            }
        }
        return SUCCESS_TIP;
    }
    /**
     * 获取分公司管理列表
     */
@@ -354,17 +330,7 @@
    //添加经营区域
    public void addSocpe(String subArr,Integer id){
        JSONArray jsonArray = JSON.parseArray(subArr);
        List<Integer> integers = new ArrayList<>();
        for (int i = 0; i < jsonArray.size(); i++) {
            JSONObject jsonObject = jsonArray.getJSONObject(i);
            integers.add(jsonObject.getInteger("recordId"));
        }
        tCompanyCityService.delete(new EntityWrapper<TCompanyCity>().eq("companyId", id).notIn("id",integers));
        tCompanyCityService.delete(new EntityWrapper<TCompanyCity>().eq("companyId", id));
        int size = jsonArray.size();
        for (int i = 0; i < size; i++){
            JSONObject jsonObject = jsonArray.getJSONObject(i);
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TComplaintController.java
@@ -115,7 +115,7 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tComplaintService.getComplaintList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,userName,userPhone,driverPhone,isHandle,null));
        page.setRecords(tComplaintService.getComplaintList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,userName,userPhone,driverPhone,isHandle));
        return super.packForBT(page);
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -23,7 +23,6 @@
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -76,56 +75,11 @@
    @Resource
    private DriverPunishMapper driverPunishMapper;
    @Autowired
    private RedisUtil redisUtil;
    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;
    @Autowired
    private ITComplaintService tComplaintService;
    /**
     * 跳转投诉页面
     * @return
     */
    @RequestMapping("complaint")
    public String complaint(Model model,Integer driverId) {
        model.addAttribute("id",driverId);
        return PREFIX + "tComplaint.html";
    }
    @RequestMapping("deductmoney")
    public String deductmoney(Model model,Integer driverId) {
        model.addAttribute("id",driverId);
        model.addAttribute("driverMoney",tDriverService.selectById(driverId).getLaveBusinessMoney());
        return PREFIX + "deductmoney.html";
    }
    @RequestMapping(value = "/complaintList")
    @ResponseBody
    public Object complaintList(String insertTime,
                       String userName,
                       String userPhone,
                       String driverPhone,
                       Integer isHandle,Integer driverId) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tComplaintService.getComplaintList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,userName,userPhone,driverPhone,isHandle,driverId));
        return super.packForBT(page);
    }
    /**
     * 跳转到司机审核列表首页
     */
@@ -171,15 +125,16 @@
        return PREFIX + "tDriver_add.html";
    }
    /**
    /**1
     * 跳转到修改审核司机
     */
    @RequestMapping("/tDriver_immediately/{tDriverId}")
    public String tDriver_immediately(@PathVariable Integer tDriverId, Model model) {
        Map<String, Object> tDriver = tDriverService.getDriverById(tDriverId);
        tDriver.put("account", null != tDriver.get("account") ? AESUtil.decrypt(tDriver.get("account").toString()) : "");
        tDriver.put("phone", null != tDriver.get("phone") ? AESUtil.decrypt(tDriver.get("phone").toString()) : "");
        tDriver.put("idCard", null != tDriver.get("idCard") ? AESUtil.decrypt(tDriver.get("idCard").toString()) : "");
        model.addAttribute("item",tDriver);
        String placeOfPractice = tDriver.get("placeOfPractice").toString().replaceAll(",", "-");
        model.addAttribute("placeOfPractice", placeOfPractice);
        LogObjectHolder.me().set(tDriver);
        return PREFIX + "tDriver_immediately.html";
    }
@@ -209,9 +164,10 @@
    @RequestMapping("/tDriver_look/{tDriverId}")
    public String tDriver_look(@PathVariable Integer tDriverId, Model model) {
        Map<String, Object> tDriver = tDriverService.getDriverById(tDriverId);
        tDriver.put("account", null != tDriver.get("account") ? AESUtil.decrypt(tDriver.get("account").toString()) : "");
        tDriver.put("phone", null != tDriver.get("phone") ? AESUtil.decrypt(tDriver.get("phone").toString()) : "");
        tDriver.put("idCard", null != tDriver.get("idCard") ? AESUtil.decrypt(tDriver.get("idCard").toString()) : "");
        model.addAttribute("item",tDriver);
        String placeOfPractice = tDriver.get("placeOfPractice").toString().replaceAll(",", "-");
        model.addAttribute("placeOfPractice", placeOfPractice);
        LogObjectHolder.me().set(tDriver);
        return PREFIX + "tDriver_look.html";
    }
@@ -222,6 +178,9 @@
    @RequestMapping("/tDriver_update/{tDriverId}")
    public String tDriverUpdate(@PathVariable Integer tDriverId, Model model) {
        TDriver tDriver = tDriverService.selectById(tDriverId);
        tDriver.setAccount(null != tDriver.getAccount() ? AESUtil.decrypt(tDriver.getAccount()) : "");
        tDriver.setPhone(null != tDriver.getPhone() ? AESUtil.decrypt(tDriver.getPhone()) : "");
        tDriver.setIdCard(null != tDriver.getIdCard() ? AESUtil.decrypt(tDriver.getIdCard()) : "");
        model.addAttribute("item",tDriver);
        LogObjectHolder.me().set(tDriver);
@@ -514,15 +473,6 @@
        return ResultUtil.success(driverPunishes);
    }
    @Autowired
    private IComplaintDeductmoneyService complaintDeductmoneyService;
    @ResponseBody
    @RequestMapping(value = "/queryAllDeductmoney", method = RequestMethod.POST)
    public ResultUtil queryAllDeductmoney(Integer driverId){
        List<ComplaintDeductmoney> driverPunishes = complaintDeductmoneyService.selectList(new EntityWrapper<ComplaintDeductmoney>().eq("driverId",driverId));
        return ResultUtil.success(driverPunishes);
    }
    /**
     * 根据分公司ID获取加盟商
@@ -726,7 +676,8 @@
        tDriver.setInsertTime(new Date());
        tDriver.setInsertUser(ShiroKit.getUser().getId());
//        tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
        tDriver.setAccount(AESUtil.encrypt(tDriver.getAccount()));
        tDriver.setPhone(AESUtil.encrypt(tDriver.getPhone()));
        tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
        tDriverService.insert(tDriver);
@@ -779,10 +730,6 @@
        TDriver driver = tDriverService.selectById(tDriverId);
        driver.setFlag("3");
        tDriverService.updateById(driver);
        String value = redisUtil.getValue("DRIVER_" + driver.getPhone());
        redisUtil.remove(value);
        redisUtil.remove("DRIVER_" + driver.getId());
        redisUtil.remove("DRIVER_" + driver.getPhone());
        return SUCCESS_TIP;
    }
    /**
@@ -815,11 +762,6 @@
                        }
                    }
                }).start();
                String value = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
                redisUtil.remove(value);
                redisUtil.remove("DRIVER_" + tDriver.getId());
                redisUtil.remove("DRIVER_" + tDriver.getPhone());
            }
            tDriver.setRemark(remark);
            tDriverService.updateById(tDriver);
@@ -872,59 +814,11 @@
        }
        tDriver.setUpdateTime(new Date());
        tDriver.setUpdateUser(ShiroKit.getUser().getId());
//        tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
        if(ToolUtil.isEmpty(tDriver.getPassword())){
            tDriver.setPassword(obj.getPassword());
        }else{
            tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
        }
        obj.setCompanyId(tDriver.getCompanyId());
        obj.setFranchiseeId(tDriver.getFranchiseeId());
        obj.setName(tDriver.getName());
        obj.setHeadImgUrl(tDriver.getHeadImgUrl());
        obj.setFaceImgUrl(tDriver.getFaceImgUrl());
        obj.setSex(tDriver.getSex());
        obj.setDriveCard(tDriver.getDriveCard());
        obj.setDriveCardImgUrl(tDriver.getDriveCardImgUrl());
        obj.setDriverAge(tDriver.getDriverAge());
        obj.setIdCard(tDriver.getIdCard());
        obj.setIdCardImgUrl1(tDriver.getIdCardImgUrl1());
        obj.setIdCardImgUrl2(tDriver.getIdCardImgUrl2());
        obj.setDriverAddress(tDriver.getDriverAddress());
        obj.setTaxiAptitudeCard(tDriver.getTaxiAptitudeCard());
        obj.setJobNumber(tDriver.getJobNumber());
        obj.setAccount(tDriver.getPhone());
        obj.setPassword(tDriver.getPassword());
        obj.setDriverNationality(tDriver.getDriverNationality());
        obj.setDriverNation(tDriver.getDriverNation());
        obj.setDriverMaritalStatus(tDriver.getDriverMaritalStatus());
        obj.setDriverLanguageLevel( tDriver.getDriverLanguageLevel());
        obj.setDriverEducation(tDriver.getDriverEducation());
        obj.setDriverCensus(tDriver.getDriverCensus());
        obj.setDriverAddress(tDriver.getDriverAddress());
        obj.setDriverContactAddress(tDriver.getDriverContactAddress());
        obj.setGetDriverLicenseDate(tDriver.getGetDriverLicenseDate());
        obj.setDriverLicenseOn(tDriver.getDriverLicenseOn());
        obj.setDriverLicenseOff(tDriver.getDriverLicenseOff());
        obj.setTaxiDriver(tDriver.getTaxiDriver());
        obj.setNetworkCarlssueOrganization(tDriver.getNetworkCarlssueOrganization());
        obj.setNetworkCarlssueDate(tDriver.getNetworkCarlssueDate());
        obj.setGetNetworkCarProofDate(tDriver.getGetNetworkCarProofDate());
        obj.setNetworkCarProofOn(tDriver.getNetworkCarProofOn());
        obj.setNetworkCarProofOff(tDriver.getNetworkCarProofOff());
        obj.setRegisterDate(tDriver.getRegisterDate());
        obj.setFullTimeDriver(tDriver.getFullTimeDriver());
        obj.setInDriverBlacklist(tDriver.getInDriverBlacklist());
        obj.setCommercialType(tDriver.getCommercialType());
        obj.setContractCompany(tDriver.getContractCompany());
        obj.setContractOn(tDriver.getContractOn());
        obj.setContractOff(tDriver.getContractOff());
        obj.setEmergencyContact(tDriver.getEmergencyContact());
        obj.setEmergencyContactPhone(tDriver.getEmergencyContactPhone());
        obj.setEmergencyContactAddress(tDriver.getEmergencyContactAddress());
        obj.setUpdateTime(new Date());
        obj.setUpdateUser(ShiroKit.getUser().getId());
        tDriverService.updateAllColumnById(obj);
        tDriver.setAccount(AESUtil.encrypt(tDriver.getAccount()));
        tDriver.setPhone(AESUtil.encrypt(tDriver.getPhone()));
        tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
        tDriverService.updateById(tDriver);
        //删除业务
        tDriverServiceService.delete(new EntityWrapper<TDriverService>().eq("driverId",tDriver.getId()));
@@ -988,7 +882,7 @@
            shellList.add("居住地址");
            shellList.add("出租车资格证号");
            shellList.add("工号[选填]");
            shellList.add("经营业务:快车[是/否]");
            shellList.add("经营业务:专车[是/否]");
            shellList.add("经营业务:出租车[是/否]");
            shellList.add("经营业务:跨城出行[是/否]");
            shellList.add("经营业务:小件同城物流[是/否]");
@@ -1008,7 +902,7 @@
            shellList.add("居住地址");
            shellList.add("出租车资格证号");
            shellList.add("工号[选填]");
            shellList.add("经营业务:快车[是/否]");
            shellList.add("经营业务:专车[是/否]");
            shellList.add("经营业务:出租车[是/否]");
            shellList.add("经营业务:跨城出行[是/否]");
            shellList.add("经营业务:小件同城物流[是/否]");
@@ -1027,7 +921,7 @@
            shellList.add("居住地址");
            shellList.add("出租车资格证号");
            shellList.add("工号[选填]");
            shellList.add("经营业务:快车[是/否]");
            shellList.add("经营业务:专车[是/否]");
            shellList.add("经营业务:出租车[是/否]");
            shellList.add("经营业务:跨城出行[是/否]");
            shellList.add("经营业务:小件同城物流[是/否]");
@@ -1129,13 +1023,13 @@
                        ten = String.valueOf(cell10.getStringCellValue()).trim();
                    }
                    Cell cell11 = row.getCell(11);  //经营业务:快车[是/否]
                    Cell cell11 = row.getCell(11);  //经营业务:专车[是/否]
                    String eleven = null;
                    if (SinataUtil.isNotEmpty(cell11)){
                        eleven = String.valueOf(cell11.getStringCellValue()).trim();
                    }
                    Cell cell12 = row.getCell(12);  //经营业务:快车[是/否]
                    Cell cell12 = row.getCell(12);  //经营业务:专车[是/否]
                    String twelve = null;
                    if (SinataUtil.isNotEmpty(cell12)){
                        twelve = String.valueOf(cell12.getStringCellValue()).trim();
@@ -1198,9 +1092,9 @@
                        if (!four.equals("男") && !four.equals("女")){
                            return new ErrorTip(500, "性别内容不正确");
                        }
                        //判断经营业务【快车】
                        //判断经营业务【专车】
                        if (!eleven.equals("是") && !eleven.equals("否")){
                            return new ErrorTip(500, "经营业务【快车】内容不正确");
                            return new ErrorTip(500, "经营业务【专车】内容不正确");
                        }
                        //判断经营业务【出租车】
                        if (!twelve.equals("是") && !twelve.equals("否")){
@@ -1256,6 +1150,7 @@
                            }
                        }
                        TDriver driver = new TDriver();
                        seventeen = AESUtil.encrypt(seventeen);
                        driver.setAccount(seventeen);
                        driver.setJobNumber(ten);
                        driver.setPhone(seventeen);
@@ -1290,7 +1185,7 @@
                        tDriverService.insert(driver);
                        //添加快车服务模式
                        //添加专车服务模式
                        if ("是".equals(eleven)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
@@ -1394,7 +1289,7 @@
                        eight = String.valueOf(cell8.getStringCellValue()).trim();
                    }
                    Cell cell9 = row.getCell(9);  //经营业务:快车[是/否]
                    Cell cell9 = row.getCell(9);  //经营业务:专车[是/否]
                    String nine = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        nine = String.valueOf(cell9.getStringCellValue()).trim();
@@ -1457,9 +1352,9 @@
                        if (!two.equals("男") && !two.equals("女")){
                            return new ErrorTip(500, "性别内容不正确");
                        }
                        //判断经营业务【快车】
                        //判断经营业务【专车】
                        if (!nine.equals("是") && !nine.equals("否")){
                            return new ErrorTip(500, "经营业务【快车】内容不正确");
                            return new ErrorTip(500, "经营业务【专车】内容不正确");
                        }
                        //判断经营业务【出租车】
                        if (!ten.equals("是") && !ten.equals("否")){
@@ -1505,6 +1400,7 @@
                        }
                        TDriver driver = new TDriver();
                        fifteen = AESUtil.encrypt(fifteen);
                        driver.setAccount(fifteen);
                        driver.setJobNumber(eight);
                        driver.setPhone(fifteen);
@@ -1534,7 +1430,7 @@
                        }
                        tDriverService.insert(driver);
                        //添加快车服务模式
                        //添加专车服务模式
                        if ("是".equals(nine)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
@@ -1633,7 +1529,7 @@
                        seven = String.valueOf(cell8.getStringCellValue()).trim();
                    }
                    Cell cell9 = row.getCell(8);  //经营业务:快车[是/否]
                    Cell cell9 = row.getCell(8);  //经营业务:专车[是/否]
                    String eight = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        eight = String.valueOf(cell9.getStringCellValue()).trim();
@@ -1696,9 +1592,9 @@
                        if (!one.equals("男") && !one.equals("女")){
                            return new ErrorTip(500, "性别内容不正确");
                        }
                        //判断经营业务【快车】
                        //判断经营业务【专车】
                        if (!eight.equals("是") && !eight.equals("否")){
                            return new ErrorTip(500, "经营业务【快车】内容不正确");
                            return new ErrorTip(500, "经营业务【专车】内容不正确");
                        }
                        //判断经营业务【出租车】
                        if (!nine.equals("是") && !nine.equals("否")){
@@ -1745,6 +1641,7 @@
                        }
                        TDriver driver = new TDriver();
                        fifteen = AESUtil.encrypt(fifteen);
                        driver.setAccount(fourteen);
                        driver.setJobNumber(seven);
                        driver.setPhone(fourteen);
@@ -1774,7 +1671,7 @@
                        }
                        tDriverService.insert(driver);
                        //添加快车服务模式
                        //添加专车服务模式
                        if ("是".equals(eight)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
@@ -2018,34 +1915,4 @@
        }
    }
    @Autowired
    private IIncomeService incomeService;
    /**
     * 添加扣款记录
     * @param complaintDeductmoney
     * @return
     */
    @ResponseBody
    @RequestMapping(value = "/saveDeductmoney", method = RequestMethod.POST)
    public ResultUtil saveDeductmoney(ComplaintDeductmoney complaintDeductmoney){
        try {
            complaintDeductmoney.setCreateTime(new Date());
            complaintDeductmoney.insert();
            TDriver tDriver = tDriverService.selectById(complaintDeductmoney.getDriverId());
            tDriver.setLaveBusinessMoney(tDriver.getLaveBusinessMoney()-complaintDeductmoney.getMoney().doubleValue());
            tDriverService.updateById(tDriver);
            Income income = new Income();
            income.setUserType(1);
            income.setObjectId(tDriver.getCompanyId());
            income.setType(8);
            income.setMoney(complaintDeductmoney.getMoney().doubleValue());
            income.setInsertTime(new Date());
            incomeService.insert(income);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
        return ResultUtil.success();
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java
@@ -108,32 +108,9 @@
    @ResponseBody
    public Object again(@RequestParam Integer tInvoiceId) {
        TInvoice tInvoice = tInvoiceService.selectById(tInvoiceId);
        tInvoice.setState(2);
        tInvoiceService.updateById(tInvoice);
        return SUCCESS_TIP;
    }
    /**
     * 批量同意或者拒绝开票
     */
    @RequestMapping(value = "/updateState")
    @ResponseBody
    public Object again(Integer state, String ids) {
        String[] arr = ids.split(",");
        for (String s : arr) {
            TInvoice tInvoice = tInvoiceService.selectById(s);
            if (tInvoice.getState() == 1){
                tInvoice.setState(state);
                tInvoiceService.updateById(tInvoice);
            }
        }
        return SUCCESS_TIP;
    }
    /**
     * 删除开发票列表
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TMerchantController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOfflineTravelPaymentController.java
New file
@@ -0,0 +1,176 @@
package com.stylefeng.guns.modular.system.controller.general;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ExcelExportUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.TOfflineTravelPayment;
import com.stylefeng.guns.modular.system.service.ITOfflineTravelPaymentService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.*;
/**
 * 控制器
 *
 * @author fengshuonan
 * @Date 2023-04-14 17:37:29
 */
@Controller
@RequestMapping("/tOfflineTravelPayment")
public class TOfflineTravelPaymentController extends BaseController {
    private String PREFIX = "/system/tOfflineTravelPayment/";
    @Autowired
    private ITOfflineTravelPaymentService tOfflineTravelPaymentService;
    /**
     * 跳转到首页
     */
    @RequestMapping("")
    public String index() {
        return PREFIX + "tOfflineTravelPayment.html";
    }
    /**
     * 跳转到添加
     */
    @RequestMapping("/tOfflineTravelPayment_add")
    public String tOfflineTravelPaymentAdd() {
        return PREFIX + "tOfflineTravelPayment_add.html";
    }
    /**
     * 跳转到修改
     */
    @RequestMapping("/tOfflineTravelPayment_update/{tOfflineTravelPaymentId}")
    public String tOfflineTravelPaymentUpdate(@PathVariable Integer tOfflineTravelPaymentId, Model model) {
        TOfflineTravelPayment tOfflineTravelPayment = tOfflineTravelPaymentService.selectById(tOfflineTravelPaymentId);
        model.addAttribute("item",tOfflineTravelPayment);
        LogObjectHolder.me().set(tOfflineTravelPayment);
        return PREFIX + "tOfflineTravelPayment_edit.html";
    }
    /**
     * 获取列表
     */
    @RequestMapping(value = "/list")
    @ResponseBody
    public Object list(String driverName,String payTime) {
        return tOfflineTravelPaymentService.getPageList(driverName,payTime);
    }
    /**
     * 新增
     */
    @RequestMapping(value = "/add")
    @ResponseBody
    public Object add(TOfflineTravelPayment tOfflineTravelPayment) {
        tOfflineTravelPaymentService.insert(tOfflineTravelPayment);
        return SUCCESS_TIP;
    }
    /**
     * 删除
     */
    @RequestMapping(value = "/delete")
    @ResponseBody
    public Object delete(@RequestParam Integer tOfflineTravelPaymentId) {
        tOfflineTravelPaymentService.deleteById(tOfflineTravelPaymentId);
        return SUCCESS_TIP;
    }
    /**
     * 修改
     */
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TOfflineTravelPayment tOfflineTravelPayment) {
        tOfflineTravelPaymentService.updateById(tOfflineTravelPayment);
        return SUCCESS_TIP;
    }
    /**
     * 详情
     */
    @RequestMapping(value = "/detail/{tOfflineTravelPaymentId}")
    @ResponseBody
    public Object detail(@PathVariable("tOfflineTravelPaymentId") Integer tOfflineTravelPaymentId) {
        return tOfflineTravelPaymentService.selectById(tOfflineTravelPaymentId);
    }
    @ApiOperation(value = "导出二维码收款列表",notes="导出二维码收款列表")
    @RequestMapping(value = "/export")
    public void export(String driverName, String payTime, HttpServletRequest request, HttpServletResponse response) {
        List<TOfflineTravelPayment> pageList = tOfflineTravelPaymentService.getPageList(driverName, payTime);
        // 表格数据【封装】
        List<List<String>> dataList = new ArrayList<>();
        //第一行显示【封装】
        List<String> twoList = new ArrayList<String>();
        twoList.add("总计:");
        twoList.add(pageList.size()+"条");
        dataList.add(twoList);
        // 列【封装】
        List<String> shellList = new ArrayList<String>();
        shellList.add("订单时间");
        shellList.add("订单编码");
        shellList.add("司机姓名");
        shellList.add("收款金额");
        dataList.add(shellList);
        for (TOfflineTravelPayment payment : pageList){
            // 详细数据列【封装】
            shellList = new ArrayList<String>();
            if(Objects.nonNull(payment.getPayTime())){
                shellList.add(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(payment.getPayTime()));
            }else{
                shellList.add("");
            }
            if(StringUtils.hasLength(payment.getPayNumber())){
                shellList.add(payment.getPayNumber());
            }else{
                shellList.add("");
            }
            if(StringUtils.hasLength(payment.getDriverName())){
                shellList.add(payment.getDriverName());
            }else{
                shellList.add("");
            }
            if(Objects.nonNull(payment.getPayMoney())){
                shellList.add(String.valueOf(payment.getPayMoney()));
            }else{
                shellList.add("");
            }
            dataList.add(shellList);
        }
        try {
            // 调用工具类进行导出
            ExcelExportUtil.easySheet("二维码收款记录"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "二维码收款记录", dataList,request, response);
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java
@@ -184,20 +184,18 @@
            business.setOpenCityId(tOpenCityId);
            String type = jsonObject.getString("type");
            Integer businessType = 0;
            if ("快车".equals(type)){
            if ("专车".equals(type)){
                businessType = 1;
            }else if ("出租车".equals(type)){
                businessType = 2;
            }else if ("跨城出行".equals(type)){
                businessType = 3;
            }else if ("跨城小件物流".equals(type)){
                businessType = 5;
            }else if ("同城小件物流".equals(type)){
                businessType = 4;
            }else if ("同城小件物流".equals(type)){
                businessType = 5;
            }else if ("包车".equals(type)){
                businessType = 6;
            }else{
                businessType = 7;
            }
            business.setBusinessType(businessType);
            business.setSort(jsonObject.getInteger("sort"));
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
@@ -10,12 +10,14 @@
import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
import com.stylefeng.guns.modular.system.service.ITPubWithdrawalService;
@@ -114,7 +116,7 @@
    public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
        TPubWithdrawal tPubWithdrawal = tPubWithdrawalService.selectById(id);
        if (SinataUtil.isNotEmpty(tPubWithdrawal)){
            tPubWithdrawal.setState(state);  //调用接口修改状态
//            tPubWithdrawal.setState(state);  //调用接口修改状态
            tPubWithdrawal.setRemark(remark);
            tPubWithdrawal.setHandleTime(new Date());
@@ -126,11 +128,11 @@
            }
            tPubWithdrawalService.updateById(tPubWithdrawal);
//            Map<String,String> map = new HashMap<>();
//            map.put("id", String.valueOf(tPubWithdrawal.getId()));
//            map.put("state", String.valueOf(stateObj));
//            String result = HttpRequestUtil.postRequest(PushURL.withdraw_auth_url, map);
//            System.out.println("提现审核接口 :【recordId="+tPubWithdrawal.getId().toString()+"】,调用接口:"+result);
            Map<String,String> map = new HashMap<>();
            map.put("id", String.valueOf(tPubWithdrawal.getId()));
            map.put("state", String.valueOf(stateObj));
            String result = HttpRequestUtil.postRequest(PushURL.withdraw_auth_url, map);
            System.out.println("提现审核接口 :【recordId="+tPubWithdrawal.getId().toString()+"】,调用接口:"+result);
            //增加系统消息
            TSystemNotice notice = new TSystemNotice();
@@ -163,7 +165,4 @@
    public Object detail(@PathVariable("tPubWithdrawalId") Integer tPubWithdrawalId) {
        return tPubWithdrawalService.selectById(tPubWithdrawalId);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -1,6 +1,5 @@
package com.stylefeng.guns.modular.system.controller.general;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.shiro.ShiroKit;
@@ -17,9 +16,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 系统设置控制器
@@ -51,15 +47,6 @@
    @Autowired
    private ITPhoneService tPhoneService;
    @Autowired
    private ITCompanyService companyService;
    @Autowired
    private ISpellOrderRuleService spellOrderRuleService;
    @Autowired
    private IShowModularService showModularService;
    /**
     * 跳转到系统设置首页
@@ -76,13 +63,13 @@
        TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
        model.addAttribute("faceDistinguish",faceDistinguish);
        //快车推单(第一轮)
        //专车推单(第一轮)
        TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
        model.addAttribute("zcOne",zcOne);
        //快车推单(第二轮)
        //专车推单(第二轮)
        TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
        model.addAttribute("zcTwo",zcTwo);
        //快车推单(第三轮)
        //专车推单(第三轮)
        TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
        model.addAttribute("zcThree",zcThree);
@@ -96,7 +83,7 @@
        TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
        model.addAttribute("czcThree",czcThree);
        //普通取消设置(快车)
        //普通取消设置(专车)
        TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
        model.addAttribute("ptCancel1",ptCancel1);
        //普通取消设置(出租车)
@@ -106,16 +93,12 @@
        TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
        model.addAttribute("ptCancel3",ptCancel3);
        //预约取消设置(快车)
        //预约取消设置(专车)
        TSysCancleOrder yyCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
        model.addAttribute("yyCancel1",yyCancel1);
        //预约取消设置(出租车)
        TSysCancleOrder yyCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
        model.addAttribute("yyCancel2",yyCancel2);
        //拼车设置
        SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", ShiroKit.getUser().getObjectId()));
        model.addAttribute("spellOrderRule", JSONObject.parseObject(spellOrderRule.getContent()));
        //报警电话
        TPhone phone1 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
@@ -126,565 +109,302 @@
        //客服电话
        TPhone phone3 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 3));
        model.addAttribute("phone3",phone3);
        //95128电召电话
        TPhone phone4 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 4));
        model.addAttribute("phone4",phone4);
        //招聘电话
        TPhone phone5 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 5));
        model.addAttribute("phone5",phone5);
        //节假日服务费
        BigDecimal holidayFee = companyService.selectById(ShiroKit.getUser().getObjectId()).getHolidayFee();
        model.addAttribute("holidayFee",holidayFee);
        //超时扣款
        TSysTimeoutMoney tSysTimeoutMoney = timeoutMoneyService.selectOne(null);
        model.addAttribute("tSysTimeoutMoney",tSysTimeoutMoney);
        //提现手续费
        TSysWithdrawalPoundage tSysWithdrawalPoundage = sysWithdrawalPoundageService.selectOne(null);
        model.addAttribute("tSysWithdrawalPoundage",tSysWithdrawalPoundage);
        //模块管理
        List<ShowModular> showModulars = showModularService.selectList(null);
        Map<String, Integer> map = new HashMap<>();
        for (ShowModular showModular : showModulars) {
            switch (showModular.getType()){
                case 1:
                    map.put("sjzp1", showModular.getUserShow());
                    map.put("sjzp2", showModular.getDriverShow());
                    break;
                case 2:
                    map.put("zuc1", showModular.getUserShow());
                    map.put("zuc2", showModular.getDriverShow());
                    break;
                case 3:
                    map.put("mc1", showModular.getUserShow());
                    map.put("mc2", showModular.getDriverShow());
                    break;
                case 4:
                    map.put("czgrcl1", showModular.getUserShow());
                    map.put("czgrcl2", showModular.getDriverShow());
                    break;
                case 5:
                    map.put("mac1", showModular.getUserShow());
                    map.put("mac2", showModular.getDriverShow());
                    break;
                case 6:
                    map.put("sjzx1", showModular.getUserShow());
                    map.put("sjzx2", showModular.getDriverShow());
                    break;
                case 7:
                    map.put("dck1", showModular.getUserShow());
                    map.put("dck2", showModular.getDriverShow());
                    break;
            }
        }
        model.addAttribute("showModulars", map);
        return PREFIX + "tSysReformist.html";
    }
    @Autowired
    private ITSysTimeoutMoneyService timeoutMoneyService;
    @Autowired
    private ITSysWithdrawalPoundageService sysWithdrawalPoundageService;
    /**
     * 删除系统设置
     */
    @RequestMapping(value = "/setUp")
    @ResponseBody
    public Object setUp(String type, BigDecimal one, Integer two, Integer three, Integer openValue,
                        Integer isSpecialCar,Integer isTaxiCar,
                        Double zc1,Integer zc2,Double zc3,
                        Double zc4,Integer zc5,Double zc6,
                        Double zc7,Integer zc8,Double zc9,
                        Double czc1,Integer czc2,Double czc3,
                        Double czc4,Integer czc5,Double czc6,
                        Double czc7,Integer czc8,Double czc9,
                        Integer ptCancel1,BigDecimal ptCancel2, Integer ptCancel3, BigDecimal ptCancel4, Integer ptCancel5, BigDecimal ptCancel6,
                        Integer yyCancel1, BigDecimal yyCancel2, Integer yyCancel3, BigDecimal yyCancel4,
                        Double pdpd1, Double pdpd2, Double pdpd3, Double pdpd4, Double pdpd5, Double pdpd6,
                        String phone1, String phone2, String phone3, String phone4, String phone5, BigDecimal holidayFee,
                        Double percentage, Integer timeOut, Double deductMoney,
                        Integer sjzp1, Integer sjzp2, Integer zuc1, Integer zuc2, Integer mc1, Integer mc2,
                        Integer czgrcl1, Integer czgrcl2, Integer mac1, Integer mac2, Integer sjzx1, Integer sjzx2,
                        Integer dck1, Integer dck2) {
    public Object setUp(@RequestParam BigDecimal one, @RequestParam Integer two, @RequestParam Integer three, @RequestParam Integer openValue,
                        @RequestParam Integer isSpecialCar,@RequestParam Integer isTaxiCar,
                        @RequestParam Double zc1,@RequestParam Integer zc2,@RequestParam Double zc3,
                        @RequestParam Double zc4,@RequestParam Integer zc5,@RequestParam Double zc6,
                        @RequestParam Double zc7,@RequestParam Integer zc8,@RequestParam Double zc9,
                        @RequestParam Double czc1,@RequestParam Integer czc2,@RequestParam Double czc3,
                        @RequestParam Double czc4,@RequestParam Integer czc5,@RequestParam Double czc6,
                        @RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,
                        @RequestParam Integer ptCancel1,@RequestParam BigDecimal ptCancel2,@RequestParam Integer ptCancel3,@RequestParam BigDecimal ptCancel4,@RequestParam Integer ptCancel5,@RequestParam BigDecimal ptCancel6,
                        @RequestParam Integer yyCancel1,@RequestParam BigDecimal yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,
                        @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3) {
        //改派设置
        if("reassigningSet".equals(type)){
            TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
            if (SinataUtil.isNotEmpty(reformist)){
                reformist.setMoney(one);
                reformist.setIsSpecialCar(isSpecialCar);
                reformist.setIsTaxiCar(isTaxiCar);
                tSysReformistService.updateById(reformist);
            }else{
                reformist = new TSysReformist();
                reformist.setCompanyId(ShiroKit.getUser().getObjectId());
                reformist.setMoney(one);
                reformist.setIsSpecialCar(isSpecialCar);
                reformist.setIsTaxiCar(isTaxiCar);
                tSysReformistService.insert(reformist);
            }
        TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
        if (SinataUtil.isNotEmpty(reformist)){
            reformist.setMoney(one);
            reformist.setIsSpecialCar(isSpecialCar);
            reformist.setIsTaxiCar(isTaxiCar);
            tSysReformistService.updateById(reformist);
        }else{
            reformist = new TSysReformist();
            reformist.setCompanyId(ShiroKit.getUser().getObjectId());
            reformist.setMoney(one);
            reformist.setIsSpecialCar(isSpecialCar);
            reformist.setIsTaxiCar(isTaxiCar);
            tSysReformistService.insert(reformist);
        }
        //积分设置
        if("integralSet".equals(type)){
            TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
            if (SinataUtil.isNotEmpty(integral)){
                integral.setIntegral(two);
                tSysIntegralService.updateById(integral);
            }else{
                integral = new TSysIntegral();
                integral.setCompanyId(ShiroKit.getUser().getObjectId());
                integral.setIntegral(two);
                tSysIntegralService.insert(integral);
            }
        TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
        if (SinataUtil.isNotEmpty(integral)){
            integral.setIntegral(two);
            tSysIntegralService.updateById(integral);
        }else{
            integral = new TSysIntegral();
            integral.setCompanyId(ShiroKit.getUser().getObjectId());
            integral.setIntegral(two);
            tSysIntegralService.insert(integral);
        }
        //人脸识别
        if("faceRecognitionSettings".equals(type)){
            TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
            if (SinataUtil.isNotEmpty(faceDistinguish)){
                faceDistinguish.setIsOpen(three);
                faceDistinguish.setMinuteNum(openValue);
                tSysFaceDistinguishService.updateById(faceDistinguish);
            }else{
                faceDistinguish = new TSysFaceDistinguish();
                faceDistinguish.setIsOpen(three);
                faceDistinguish.setMinuteNum(openValue);
                faceDistinguish.setCompanyId(ShiroKit.getUser().getObjectId());
                tSysFaceDistinguishService.insert(faceDistinguish);
            }
        TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
        if (SinataUtil.isNotEmpty(faceDistinguish)){
            faceDistinguish.setIsOpen(three);
            faceDistinguish.setMinuteNum(openValue);
            tSysFaceDistinguishService.updateById(faceDistinguish);
        }else{
            faceDistinguish = new TSysFaceDistinguish();
            faceDistinguish.setIsOpen(three);
            faceDistinguish.setMinuteNum(openValue);
            faceDistinguish.setCompanyId(ShiroKit.getUser().getObjectId());
            tSysFaceDistinguishService.insert(faceDistinguish);
        }
        //推单设置
        if("pushOrderSettings".equals(type)){
            //快车推单(第一轮)
            TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
            if (SinataUtil.isNotEmpty(zcOne)){
                zcOne.setPushDistance(zc1);
                zcOne.setPushTime(zc2);
                zcOne.setDriverProportion(zc3);
                tSysPushOrderService.updateById(zcOne);
            }else{
                zcOne = new TSysPushOrder();
                zcOne.setPushDistance(zc1);
                zcOne.setPushTime(zc2);
                zcOne.setDriverProportion(zc3);
                zcOne.setCompanyId(ShiroKit.getUser().getObjectId());
                zcOne.setPushType(1);
                zcOne.setType(1);
                tSysPushOrderService.insert(zcOne);
            }
            //快车推单(第二轮)
            TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
            if (SinataUtil.isNotEmpty(zcTwo)){
                zcTwo.setPushDistance(zc4);
                zcTwo.setPushTime(zc5);
                zcTwo.setDriverProportion(zc6);
                tSysPushOrderService.updateById(zcTwo);
            }else{
                zcTwo = new TSysPushOrder();
                zcTwo.setPushDistance(zc4);
                zcTwo.setPushTime(zc5);
                zcTwo.setDriverProportion(zc6);
                zcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                zcTwo.setPushType(1);
                zcTwo.setType(2);
                tSysPushOrderService.insert(zcTwo);
            }
            //快车推单(第三轮)
            TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
            if (SinataUtil.isNotEmpty(zcThree)){
                zcThree.setPushDistance(zc7);
                zcThree.setPushTime(zc8);
                zcThree.setDriverProportion(zc9);
                tSysPushOrderService.updateById(zcThree);
            }else{
                zcThree = new TSysPushOrder();
                zcThree.setPushDistance(zc7);
                zcThree.setPushTime(zc8);
                zcThree.setDriverProportion(zc9);
                zcThree.setCompanyId(ShiroKit.getUser().getObjectId());
                zcThree.setPushType(1);
                zcThree.setType(3);
                tSysPushOrderService.insert(zcThree);
            }
            //出租车推单(第一轮)
            TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
            if (SinataUtil.isNotEmpty(czcOne)){
                czcOne.setPushDistance(czc1);
                czcOne.setPushTime(czc2);
                czcOne.setDriverProportion(czc3);
                tSysPushOrderService.updateById(czcOne);
            }else{
                czcOne = new TSysPushOrder();
                czcOne.setPushDistance(czc1);
                czcOne.setPushTime(czc2);
                czcOne.setDriverProportion(czc3);
                czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
                czcOne.setPushType(2);
                czcOne.setType(1);
                tSysPushOrderService.insert(czcOne);
            }
            //出租车推单(第二轮)
            TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
            if (SinataUtil.isNotEmpty(czcTwo)){
                czcTwo.setPushDistance(czc4);
                czcTwo.setPushTime(czc5);
                czcTwo.setDriverProportion(czc6);
                tSysPushOrderService.updateById(czcTwo);
            }else{
                czcTwo = new TSysPushOrder();
                czcTwo.setPushDistance(czc4);
                czcTwo.setPushTime(czc5);
                czcTwo.setDriverProportion(czc6);
                czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                czcTwo.setPushType(2);
                czcTwo.setType(2);
                tSysPushOrderService.insert(czcTwo);
            }
            //出租车推单(第三轮)
            TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
            if (SinataUtil.isNotEmpty(czcThree)){
                czcThree.setPushDistance(czc7);
                czcThree.setPushTime(czc8);
                czcThree.setDriverProportion(czc9);
                tSysPushOrderService.updateById(czcThree);
            }else{
                czcThree = new TSysPushOrder();
                czcThree.setPushDistance(czc7);
                czcThree.setPushTime(czc8);
                czcThree.setDriverProportion(czc9);
                czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
                czcThree.setPushType(2);
                czcThree.setType(3);
                tSysPushOrderService.insert(czcThree);
            }
        //专车推单(第一轮)
        TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
        if (SinataUtil.isNotEmpty(zcOne)){
            zcOne.setPushDistance(zc1);
            zcOne.setPushTime(zc2);
            zcOne.setDriverProportion(zc3);
            tSysPushOrderService.updateById(zcOne);
        }else{
            zcOne = new TSysPushOrder();
            zcOne.setPushDistance(zc1);
            zcOne.setPushTime(zc2);
            zcOne.setDriverProportion(zc3);
            zcOne.setCompanyId(ShiroKit.getUser().getObjectId());
            zcOne.setPushType(1);
            zcOne.setType(1);
            tSysPushOrderService.insert(zcOne);
        }
        //专车推单(第二轮)
        TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
        if (SinataUtil.isNotEmpty(zcTwo)){
            zcTwo.setPushDistance(zc4);
            zcTwo.setPushTime(zc5);
            zcTwo.setDriverProportion(zc6);
            tSysPushOrderService.updateById(zcTwo);
        }else{
            zcTwo = new TSysPushOrder();
            zcTwo.setPushDistance(zc4);
            zcTwo.setPushTime(zc5);
            zcTwo.setDriverProportion(zc6);
            zcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
            zcTwo.setPushType(1);
            zcTwo.setType(2);
            tSysPushOrderService.insert(zcTwo);
        }
        //专车推单(第三轮)
        TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
        if (SinataUtil.isNotEmpty(zcThree)){
            zcThree.setPushDistance(zc7);
            zcThree.setPushTime(zc8);
            zcThree.setDriverProportion(zc9);
            tSysPushOrderService.updateById(zcThree);
        }else{
            zcThree = new TSysPushOrder();
            zcThree.setPushDistance(zc7);
            zcThree.setPushTime(zc8);
            zcThree.setDriverProportion(zc9);
            zcThree.setCompanyId(ShiroKit.getUser().getObjectId());
            zcThree.setPushType(1);
            zcThree.setType(3);
            tSysPushOrderService.insert(zcThree);
        }
        //取消设置
        if("cancelOrderSettings".equals(type)){
            //普通取消设置(快车)
            TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(ptCancelOne)){
                ptCancelOne.setMinuteNum(ptCancel1);
                ptCancelOne.setMoney(ptCancel2);
                tSysCancleOrderService.updateById(ptCancelOne);
            }else{
                ptCancelOne = new TSysCancleOrder();
                ptCancelOne.setMinuteNum(ptCancel1);
                ptCancelOne.setMoney(ptCancel2);
                ptCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
                ptCancelOne.setType(1);
                ptCancelOne.setOrderType(1);
                tSysCancleOrderService.insert(ptCancelOne);
            }
            //普通取消设置(出租车)
            TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
            if (SinataUtil.isNotEmpty(ptCancelTwo)){
                ptCancelTwo.setMinuteNum(ptCancel3);
                ptCancelTwo.setMoney(ptCancel4);
                tSysCancleOrderService.updateById(ptCancelTwo);
            }else{
                ptCancelTwo = new TSysCancleOrder();
                ptCancelTwo.setMinuteNum(ptCancel3);
                ptCancelTwo.setMoney(ptCancel4);
                ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                ptCancelTwo.setType(1);
                ptCancelTwo.setOrderType(2);
                tSysCancleOrderService.insert(ptCancelTwo);
            }
            //普通取消设置(跨城出行)
            TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
            if (SinataUtil.isNotEmpty(ptCancelThree)){
                ptCancelThree.setMinuteNum(ptCancel5);
                ptCancelThree.setMoney(ptCancel6);
                tSysCancleOrderService.updateById(ptCancelThree);
            }else{
                ptCancelThree = new TSysCancleOrder();
                ptCancelThree.setMinuteNum(ptCancel5);
                ptCancelThree.setMoney(ptCancel6);
                ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());
                ptCancelThree.setType(1);
                ptCancelThree.setOrderType(3);
                tSysCancleOrderService.insert(ptCancelThree);
            }
        //出租车推单(第一轮)
        TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
        if (SinataUtil.isNotEmpty(czcOne)){
            czcOne.setPushDistance(czc1);
            czcOne.setPushTime(czc2);
            czcOne.setDriverProportion(czc3);
            tSysPushOrderService.updateById(czcOne);
        }else{
            czcOne = new TSysPushOrder();
            czcOne.setPushDistance(czc1);
            czcOne.setPushTime(czc2);
            czcOne.setDriverProportion(czc3);
            czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
            czcOne.setPushType(2);
            czcOne.setType(1);
            tSysPushOrderService.insert(czcOne);
        }
        //出租车推单(第二轮)
        TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
        if (SinataUtil.isNotEmpty(czcTwo)){
            czcTwo.setPushDistance(czc4);
            czcTwo.setPushTime(czc5);
            czcTwo.setDriverProportion(czc6);
            tSysPushOrderService.updateById(czcTwo);
        }else{
            czcTwo = new TSysPushOrder();
            czcTwo.setPushDistance(czc4);
            czcTwo.setPushTime(czc5);
            czcTwo.setDriverProportion(czc6);
            czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
            czcTwo.setPushType(2);
            czcTwo.setType(2);
            tSysPushOrderService.insert(czcTwo);
        }
        //出租车推单(第三轮)
        TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
        if (SinataUtil.isNotEmpty(czcThree)){
            czcThree.setPushDistance(czc7);
            czcThree.setPushTime(czc8);
            czcThree.setDriverProportion(czc9);
            tSysPushOrderService.updateById(czcThree);
        }else{
            czcThree = new TSysPushOrder();
            czcThree.setPushDistance(czc7);
            czcThree.setPushTime(czc8);
            czcThree.setDriverProportion(czc9);
            czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
            czcThree.setPushType(2);
            czcThree.setType(3);
            tSysPushOrderService.insert(czcThree);
        }
        //预约取消设置
        if("cancelTheReservationOrderSetting".equals(type)){
            //预约取消设置(快车)
            TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(yyCancelOne)){
                yyCancelOne.setMinuteNum(yyCancel1);
                yyCancelOne.setMoney(yyCancel2);
                tSysCancleOrderService.updateById(yyCancelOne);
            }else{
                yyCancelOne = new TSysCancleOrder();
                yyCancelOne.setMinuteNum(yyCancel1);
                yyCancelOne.setMoney(yyCancel2);
                yyCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
                yyCancelOne.setType(2);
                yyCancelOne.setOrderType(1);
                tSysCancleOrderService.insert(yyCancelOne);
            }
            //预约取消设置(出租车)
            TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
            if (SinataUtil.isNotEmpty(yyCancelTwo)){
                yyCancelTwo.setMinuteNum(yyCancel3);
                yyCancelTwo.setMoney(yyCancel4);
                tSysCancleOrderService.updateById(yyCancelTwo);
            }else{
                yyCancelTwo = new TSysCancleOrder();
                yyCancelTwo.setMinuteNum(yyCancel3);
                yyCancelTwo.setMoney(yyCancel4);
                yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                yyCancelTwo.setType(2);
                yyCancelTwo.setOrderType(2);
                tSysCancleOrderService.insert(yyCancelTwo);
            }
        //普通取消设置(专车)
        TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
        if (SinataUtil.isNotEmpty(ptCancelOne)){
            ptCancelOne.setMinuteNum(ptCancel1);
            ptCancelOne.setMoney(ptCancel2);
            tSysCancleOrderService.updateById(ptCancelOne);
        }else{
            ptCancelOne = new TSysCancleOrder();
            ptCancelOne.setMinuteNum(ptCancel1);
            ptCancelOne.setMoney(ptCancel2);
            ptCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
            ptCancelOne.setType(1);
            ptCancelOne.setOrderType(1);
            tSysCancleOrderService.insert(ptCancelOne);
        }
        //拼单派单
        if("spellOrderSetting".equals(type)){
            SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", ShiroKit.getUser().getObjectId()));
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("num1", pdpd1);
            jsonObject.put("num2", pdpd2);
            jsonObject.put("num3", pdpd3);
            jsonObject.put("num4", pdpd4);
            jsonObject.put("num5", pdpd5);
            jsonObject.put("num6", pdpd6);
            if(SinataUtil.isNotEmpty(spellOrderRule)){
                spellOrderRule.setContent(jsonObject.toJSONString());
                spellOrderRuleService.updateById(spellOrderRule);
            }else{
                spellOrderRule = new SpellOrderRule();
                spellOrderRule.setCompanyId(ShiroKit.getUser().getObjectId());
                spellOrderRule.setContent(jsonObject.toJSONString());
                spellOrderRuleService.insert(spellOrderRule);
            }
        //普通取消设置(出租车)
        TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
        if (SinataUtil.isNotEmpty(ptCancelTwo)){
            ptCancelTwo.setMinuteNum(ptCancel3);
            ptCancelTwo.setMoney(ptCancel4);
            tSysCancleOrderService.updateById(ptCancelTwo);
        }else{
            ptCancelTwo = new TSysCancleOrder();
            ptCancelTwo.setMinuteNum(ptCancel3);
            ptCancelTwo.setMoney(ptCancel4);
            ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
            ptCancelTwo.setType(1);
            ptCancelTwo.setOrderType(2);
            tSysCancleOrderService.insert(ptCancelTwo);
        }
        //电话设置
        if("phoneSettings".equals(type)){
            //报警电话
            TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
            if (SinataUtil.isNotEmpty(phoneOne)){
                phoneOne.setPhone(phone1);
                tPhoneService.updateById(phoneOne);
            }else{
                phoneOne = new TPhone();
                phoneOne.setPhone(phone1);
                phoneOne.setCompanyId(ShiroKit.getUser().getObjectId());
                phoneOne.setType(1);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phoneOne.setPlatform(1);
                }else{
                    phoneOne.setPlatform(2);
                }
                tPhoneService.insert(phoneOne);
            }
            //客服电话
            TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
            if (SinataUtil.isNotEmpty(phoneTwo)){
                phoneTwo.setPhone(phone2);
                tPhoneService.updateById(phoneTwo);
            }else{
                phoneTwo = new TPhone();
                phoneTwo.setPhone(phone2);
                phoneTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                phoneTwo.setType(2);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phoneTwo.setPlatform(1);
                }else{
                    phoneTwo.setPlatform(2);
                }
                tPhoneService.insert(phoneTwo);
            }
            //客服电话
            TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 3));
            if (SinataUtil.isNotEmpty(phone)){
                phone.setPhone(phone3);
                tPhoneService.updateById(phone);
            }else{
                phone = new TPhone();
                phone.setPhone(phone3);
                phone.setCompanyId(ShiroKit.getUser().getObjectId());
                phone.setType(3);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phone.setPlatform(1);
                }else{
                    phone.setPlatform(2);
                }
                tPhoneService.insert(phone);
            }
            //招聘电话
            TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 5));
            if (SinataUtil.isNotEmpty(phoneFive)){
                phoneFive.setPhone(phone5);
                tPhoneService.updateById(phoneFive);
            }else{
                phoneFive = new TPhone();
                phoneFive.setPhone(phone5);
                phoneFive.setCompanyId(ShiroKit.getUser().getObjectId());
                phoneFive.setType(5);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phoneFive.setPlatform(1);
                }else{
                    phoneFive.setPlatform(2);
                }
                tPhoneService.insert(phoneFive);
            }
        //普通取消设置(跨城出行)
        TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
        if (SinataUtil.isNotEmpty(ptCancelThree)){
            ptCancelThree.setMinuteNum(ptCancel5);
            ptCancelThree.setMoney(ptCancel6);
            tSysCancleOrderService.updateById(ptCancelThree);
        }else{
            ptCancelThree = new TSysCancleOrder();
            ptCancelThree.setMinuteNum(ptCancel5);
            ptCancelThree.setMoney(ptCancel6);
            ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());
            ptCancelThree.setType(1);
            ptCancelThree.setOrderType(3);
            tSysCancleOrderService.insert(ptCancelThree);
        }
        //95128
        if("95128TheOnCall".equals(type)){
            //95128电召电话
            TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 4));
            if (SinataUtil.isNotEmpty(phoneFour)){
                phoneFour.setPhone(phone4);
                tPhoneService.updateById(phoneFour);
            }else{
                phoneFour = new TPhone();
                phoneFour.setPhone(phone4);
                phoneFour.setCompanyId(ShiroKit.getUser().getObjectId());
                phoneFour.setType(4);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phoneFour.setPlatform(1);
                }else{
                    phoneFour.setPlatform(2);
                }
                tPhoneService.insert(phoneFour);
            }
        //预约取消设置(专车)
        TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
        if (SinataUtil.isNotEmpty(yyCancelOne)){
            yyCancelOne.setMinuteNum(yyCancel1);
            yyCancelOne.setMoney(yyCancel2);
            tSysCancleOrderService.updateById(yyCancelOne);
        }else{
            yyCancelOne = new TSysCancleOrder();
            yyCancelOne.setMinuteNum(yyCancel1);
            yyCancelOne.setMoney(yyCancel2);
            yyCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
            yyCancelOne.setType(2);
            yyCancelOne.setOrderType(1);
            tSysCancleOrderService.insert(yyCancelOne);
        }
        //预约取消设置(出租车)
        TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
        if (SinataUtil.isNotEmpty(yyCancelTwo)){
            yyCancelTwo.setMinuteNum(yyCancel3);
            yyCancelTwo.setMoney(yyCancel4);
            tSysCancleOrderService.updateById(yyCancelTwo);
        }else{
            yyCancelTwo = new TSysCancleOrder();
            yyCancelTwo.setMinuteNum(yyCancel3);
            yyCancelTwo.setMoney(yyCancel4);
            yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
            yyCancelTwo.setType(2);
            yyCancelTwo.setOrderType(2);
            tSysCancleOrderService.insert(yyCancelTwo);
        }
        ///  节假日服务费
        if("holidayServiceFeeSetting".equals(type)){
            Integer companyId = ShiroKit.getUser().getObjectId();
            TCompany company = companyService.selectById(companyId);
            company.setHolidayFee(holidayFee);
            companyService.updateById(company);
        //报警电话
        TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
        if (SinataUtil.isNotEmpty(phoneOne)){
            phoneOne.setPhone(phone1);
            tPhoneService.updateById(phoneOne);
        }else{
            phoneOne = new TPhone();
            phoneOne.setPhone(phone1);
            phoneOne.setCompanyId(ShiroKit.getUser().getObjectId());
            phoneOne.setType(1);
            if (ShiroKit.getUser().getRoleType() == 1){
                phoneOne.setPlatform(1);
            }else{
                phoneOne.setPlatform(2);
            }
            tPhoneService.insert(phoneOne);
        }
        //客服电话
        TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
        if (SinataUtil.isNotEmpty(phoneTwo)){
            phoneTwo.setPhone(phone2);
            tPhoneService.updateById(phoneTwo);
        }else{
            phoneTwo = new TPhone();
            phoneTwo.setPhone(phone2);
            phoneTwo.setCompanyId(ShiroKit.getUser().getObjectId());
            phoneTwo.setType(2);
            if (ShiroKit.getUser().getRoleType() == 1){
                phoneTwo.setPlatform(1);
            }else{
                phoneTwo.setPlatform(2);
            }
            tPhoneService.insert(phoneTwo);
        }
        /// 超时扣款设置
        if("timeoutDeductionSettings".equals(type)){
            timeoutMoneyService.delete(new EntityWrapper<TSysTimeoutMoney>().ne("id",0));
            TSysTimeoutMoney tSysTimeoutMoney = new TSysTimeoutMoney();
            tSysTimeoutMoney.setDeductMoney(deductMoney);
            tSysTimeoutMoney.setTimeOut(timeOut);
            timeoutMoneyService.insert(tSysTimeoutMoney);
        }
        ///   提现手续费设置
        if("withdrawalFeeSetting".equals(type)){
            sysWithdrawalPoundageService.delete(new EntityWrapper<TSysWithdrawalPoundage>().ne("id",0));
            TSysWithdrawalPoundage tSysWithdrawalPoundage = new TSysWithdrawalPoundage();
            tSysWithdrawalPoundage.setPercentage(percentage);
            sysWithdrawalPoundageService.insert(tSysWithdrawalPoundage);
        }
        //模块设置
        if("moduleManagement".equals(type)){
            //司机招聘
            ShowModular showModular1 = showModularService.selectOne(new EntityWrapper<ShowModular>().eq("type", 1));
            if(null == showModular1){
                showModular1 = new ShowModular();
                showModular1.setType(1);
                showModular1.setDriverShow(sjzp2);
                showModular1.setUserShow(sjzp1);
                showModularService.insert(showModular1);
        //客服电话
        TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 3));
        if (SinataUtil.isNotEmpty(phone)){
            phone.setPhone(phone3);
            tPhoneService.updateById(phone);
        }else{
            phone = new TPhone();
            phone.setPhone(phone3);
            phone.setCompanyId(ShiroKit.getUser().getObjectId());
            phone.setType(3);
            if (ShiroKit.getUser().getRoleType() == 1){
                phone.setPlatform(1);
            }else{
                showModular1.setDriverShow(sjzp2);
                showModular1.setUserShow(sjzp1);
                showModularService.updateById(showModular1);
                phone.setPlatform(2);
            }
            //租车
            ShowModular showModular2 = showModularService.selectOne(new EntityWrapper<ShowModular>().eq("type", 2));
            if(null == showModular2){
                showModular2 = new ShowModular();
                showModular2.setType(2);
                showModular2.setDriverShow(zuc2);
                showModular2.setUserShow(zuc1);
                showModularService.insert(showModular2);
            }else{
                showModular2.setDriverShow(zuc2);
                showModular2.setUserShow(zuc1);
                showModularService.updateById(showModular2);
            }
            //买车
            ShowModular showModular3 = showModularService.selectOne(new EntityWrapper<ShowModular>().eq("type", 3));
            if(null == showModular3){
                showModular3 = new ShowModular();
                showModular3.setType(3);
                showModular3.setDriverShow(mc2);
                showModular3.setUserShow(mc1);
                showModularService.insert(showModular3);
            }else{
                showModular3.setDriverShow(mc2);
                showModular3.setUserShow(mc1);
                showModularService.updateById(showModular3);
            }
            //出租个人车辆
            ShowModular showModular4 = showModularService.selectOne(new EntityWrapper<ShowModular>().eq("type", 4));
            if(null == showModular4){
                showModular4 = new ShowModular();
                showModular4.setType(4);
                showModular4.setDriverShow(czgrcl2);
                showModular4.setUserShow(czgrcl1);
                showModularService.insert(showModular4);
            }else{
                showModular4.setDriverShow(czgrcl2);
                showModular4.setUserShow(czgrcl1);
                showModularService.updateById(showModular4);
            }
            //卖车
            ShowModular showModular5 = showModularService.selectOne(new EntityWrapper<ShowModular>().eq("type", 5));
            if(null == showModular5){
                showModular5 = new ShowModular();
                showModular5.setType(5);
                showModular5.setDriverShow(mac2);
                showModular5.setUserShow(mac1);
                showModularService.insert(showModular5);
            }else{
                showModular5.setDriverShow(mac2);
                showModular5.setUserShow(mac1);
                showModularService.updateById(showModular5);
            }
            //商家中心
            ShowModular showModular6 = showModularService.selectOne(new EntityWrapper<ShowModular>().eq("type", 6));
            if(null == showModular6){
                showModular6 = new ShowModular();
                showModular6.setType(6);
                showModular6.setDriverShow(sjzx2);
                showModular6.setUserShow(sjzx1);
                showModularService.insert(showModular6);
            }else{
                showModular6.setDriverShow(sjzx2);
                showModular6.setUserShow(sjzx1);
                showModularService.updateById(showModular6);
            }
            //打车卡
            ShowModular showModular7 = showModularService.selectOne(new EntityWrapper<ShowModular>().eq("type", 7));
            if(null == showModular7){
                showModular7 = new ShowModular();
                showModular7.setType(7);
                showModular7.setDriverShow(dck2);
                showModular7.setUserShow(dck1);
                showModularService.insert(showModular7);
            }else{
                showModular7.setDriverShow(dck2);
                showModular7.setUserShow(dck1);
                showModularService.updateById(showModular7);
            }
            tPhoneService.insert(phone);
        }
        return SUCCESS_TIP;
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TTaxiCardController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
@@ -8,8 +8,9 @@
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.*;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITBalanceModifyRecordService;
import com.stylefeng.guns.modular.system.service.ITCompanyService;
import com.stylefeng.guns.modular.system.util.AESUtil;
import com.stylefeng.guns.modular.system.util.DESUtil;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import org.apache.commons.lang.time.DateUtils;
@@ -62,6 +63,7 @@
    @RequestMapping("/tUser_userDetail/{tUserId}")
    public String tUser_userDetail(@PathVariable Integer tUserId, Model model) {
        Map<String,Object> tUser = tUserService.getUserDetailById(tUserId);
        tUser.put("phone", null != tUser.get("phone") ? AESUtil.decrypt(tUser.get("phone").toString()) : "");
        model.addAttribute("item",tUser);
        return PREFIX + "tUser_userDetail.html";
    }
@@ -139,38 +141,9 @@
            tUser.setUpdateTime(new Date());
            tUser.setUpdateUser(ShiroKit.getUser().getId());
            tUserService.updateById(tUser);
            ///   插入余额修改记录
            TBalanceModifyRecord tBalanceModifyRecord = new TBalanceModifyRecord();
            tBalanceModifyRecord.setCreateTime(DateUtil.parseTime(DateUtil.getTime()));
            tBalanceModifyRecord.setMoney(money);
            tBalanceModifyRecord.setType(updateType);
            Random random = new Random();
            String result="";
            for (int i=0;i<8;i++)
            {
                result+=random.nextInt(10);
            }
            tBalanceModifyRecord.setRecordID(result);
            tBalanceModifyRecord.setUserId(tUser.getId());
            if (ToolUtil.isNotEmpty(tUser.getPhone())){
                tBalanceModifyRecord.setPhone(tUser.getPhone());
            }
            if (ToolUtil.isNotEmpty(tUser.getNickName())){
                tBalanceModifyRecord.setUserName(tUser.getNickName());
            }
            balanceModifyRecordService.insert(tBalanceModifyRecord);
        }
        return SUCCESS_TIP;
    }
    @Autowired
    private ITBalanceModifyRecordService balanceModifyRecordService;
    /**
     * 修改密码操作
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserRedPacketRecordController.java
@@ -3,11 +3,8 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -19,12 +16,6 @@
import com.stylefeng.guns.modular.system.model.TUserRedPacketRecord;
import com.stylefeng.guns.modular.system.service.ITUserRedPacketRecordService;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
@@ -128,82 +119,5 @@
    @ResponseBody
    public Object detail(@PathVariable("tUserRedPacketRecordId") Integer tUserRedPacketRecordId) {
        return tUserRedPacketRecordService.selectById(tUserRedPacketRecordId);
    }
    /**
     * 导出
     */
    @RequestMapping(value = "/exportRecord")
    @ResponseBody
    public Object exportRecord(HttpServletResponse response, @RequestParam String createTime, @RequestParam String userName, @RequestParam String userPhone,
                               @RequestParam Integer couponActivityId, @RequestParam Integer state) {
        try {
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(createTime)){
                String[] timeArray = createTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "红包领取记录"+time+".xls";
            String[] title = new String[] {"领取时间","领取人","领取人电话","领取金额","到期时间","状态","使用时间"};
            List<Map<String,Object>> mapList = userCouponRecordService.getRedListt(beginTime,endTime,userName,userPhone,couponActivityId,state);
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("insertTime").toString();
                values[i][1]=d.get("nickName").toString();
                if (ToolUtil.isNotEmpty(d.get("phone"))){
                    values[i][2]=d.get("phone").toString();
                }else {
                    values[i][2]="";
                }
                values[i][3]=d.get("money").toString();
                values[i][4]=d.get("expirationTime").toString();
                String stateStr =d.get("state").toString();
                switch (stateStr) {
                    case "0":
                        values[i][5] = "未使用";
                        break;
                    case "1":
                        values[i][5] = "已使用";
                        break;
                    case "2":
                        values[i][5] = "已过期";
                        break;
                    default:
                        values[i][5] = "";
                        break;
                }
                if (ToolUtil.isNotEmpty(d.get("useTime"))){
                    values[i][6]=d.get("useTime").toString();
                }else {
                    values[i][6]="";
                }
            }
            String fileNameTitle="红包领取记录";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(fileNameTitle+time, title, values, null);
            ExcelUtil.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TimeOutAppealController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
@@ -307,7 +307,7 @@
     * @param balanceEnable 充值活动-是否启动(1=不启动,2=启动)
     * @param balanceInfo 充值活动-详情
     * @param discountEnable 折扣活动-是否启动(1=不启动,2=启动)
     * @param discountSpecial 折扣活动-快车
     * @param discountSpecial 折扣活动-专车
     * @param discountTaxi 折扣活动-出租车
     * @param discountLogistics 折扣活动-小件物流
     * @param redenvelopeId -红包活动-红包id
@@ -356,7 +356,7 @@
     * @param balanceEnable 充值活动-是否启动(1=不启动,2=启动)
     * @param balanceInfo 充值活动-详情
     * @param discountEnable 折扣活动-是否启动(1=不启动,2=启动)
     * @param discountSpecial 折扣活动-快车
     * @param discountSpecial 折扣活动-专车
     * @param discountTaxi 折扣活动-出租车
     * @param discountLogistics 折扣活动-小件物流
     * @param redenvelopeId -红包活动-红包id
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserCouponRecordController.java
@@ -4,10 +4,7 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -19,12 +16,6 @@
import com.stylefeng.guns.modular.system.model.UserCouponRecord;
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
@@ -126,100 +117,5 @@
    @ResponseBody
    public Object detail(@PathVariable("userCouponRecordId") Integer userCouponRecordId) {
        return userCouponRecordService.selectById(userCouponRecordId);
    }
    /**
     * 导出
     */
    @RequestMapping(value = "/exportRecord")
    @ResponseBody
    public Object exportRecord(HttpServletResponse response,@RequestParam String createTime,@RequestParam String userName,@RequestParam String userPhone,
                               @RequestParam Integer couponActivityId,@RequestParam Integer activityType,@RequestParam Integer state) {
        try {
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(createTime)){
                String[] timeArray = createTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "活动奖励领取记录"+time+".xls";
            String[] title = new String[] {"领取时间","领取人","领取人电话","领取金额","到期时间","领取类型","状态","使用时间"};
            List<Map<String,Object>> mapList = userCouponRecordService.getListt(beginTime,endTime,userName,userPhone,couponActivityId,activityType,state);
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("insertTime").toString();
                values[i][1]=d.get("nickName").toString();
                if (ToolUtil.isNotEmpty(d.get("phone"))){
                    values[i][2]=d.get("phone").toString();
                }else {
                    values[i][2]="";
                }
                values[i][3]=d.get("money").toString();
                values[i][4]=d.get("expirationTime").toString();
                String couponUseType = d.get("couponUseType").toString();
                switch (couponUseType) {
                    case "0":
                        values[i][5] = "通用券";
                        break;
                    case "1":
                        values[i][5] = "快车券";
                        break;
                    case "2":
                        values[i][5] = "出租券";
                        break;
                    case "3":
                        values[i][5] = "跨城出行券";
                        break;
                    default:
                        values[i][5] = "";
                        break;
                }
                String stateStr =d.get("state").toString();
                switch (stateStr) {
                    case "0":
                        values[i][6] = "未使用";
                        break;
                    case "1":
                        values[i][6] = "已使用";
                        break;
                    case "2":
                        values[i][6] = "已过期";
                        break;
                    default:
                        values[i][6] = "";
                        break;
                }
                if (ToolUtil.isNotEmpty(d.get("useTime"))){
                    values[i][7]=d.get("useTime").toString();
                }else {
                    values[i][7]="";
                }
            }
            String fileNameTitle="活动奖励领取记录";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(fileNameTitle+time, title, values, null);
            ExcelUtil.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/AirLineController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/AirSiteController.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
@@ -77,7 +77,7 @@
    @RequestMapping("/tLine_add")
    public String tLineAdd(Model model) {
        //站点
        List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1).eq("type",1));
        List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
        model.addAttribute("siteList",siteList);
        //跨城车型
        List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
@@ -147,7 +147,7 @@
        if (ShiroKit.getUser().getRoleType() != 1){
            page.setRecords(null);
        }else{
            page.setRecords(tLineService.getLineList(page,beginTime,endTime,name,insertUser,modelStr,state,1));
            page.setRecords(tLineService.getLineList(page,beginTime,endTime,name,insertUser,modelStr,state));
        }
        return super.packForBT(page);
    }
@@ -166,7 +166,6 @@
        tLine.setName(name);
        tLine.setState(1);
        tLine.setInsertTime(new Date());
        tLine.setType(1);
        tLine.setInsertUserId(ShiroKit.getUser().getId());
        tLineService.insert(tLine);
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
@@ -13,10 +13,7 @@
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -67,7 +64,7 @@
     */
    @RequestMapping("")
    public String index(Model model) {
        //服务快车车型
        //服务专车车型
        List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
        model.addAttribute("carmodelList",carmodelList);
        //线路
@@ -82,6 +79,7 @@
    @RequestMapping("/tOrderCrossCity_detail/{tOrderCrossCityId}")
    public String tOrderCrossCityUpdate(@PathVariable Integer tOrderCrossCityId, Model model) {
        Map<String, Object> item = tOrderCrossCityService.getCrossCityOrderDetailById(tOrderCrossCityId);
        item.put("userPhone", null != item.get("userPhone") ? AESUtil.decrypt(item.get("userPhone").toString()) : "");
        model.addAttribute("item",item);
        return PREFIX + "tOrderCrossCity_detail.html";
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
@@ -7,14 +7,10 @@
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -68,9 +64,6 @@
    @Autowired
    private ITDriverService tDriverService;
    @Autowired
    private ITTimeoutAppealService timeoutAppealService;
@@ -96,12 +89,7 @@
    @RequestMapping("/tOrderLogistics_detail/{tOrderLogisticsId}")
    public String tOrderLogistics_detail(@PathVariable Integer tOrderLogisticsId, Model model) {
        Map<String,Object> tOrderLogistics = tOrderLogisticsService.getLogisticsOrderDetailById(tOrderLogisticsId);
        TTimeoutAppeal tTimeoutAppeal = timeoutAppealService.selectOne(new EntityWrapper<TTimeoutAppeal>().eq("orderId",tOrderLogistics.get("id")));
        if (ToolUtil.isNotEmpty(tTimeoutAppeal) && ToolUtil.isNotEmpty(tTimeoutAppeal.getReturnMoney())){
            tOrderLogistics.put("returnMoney",tTimeoutAppeal.getReturnMoney());
        }else {
            tOrderLogistics.put("returnMoney","0.00");
        }
        tOrderLogistics.put("userPhone", null != tOrderLogistics.get("userPhone") ? AESUtil.decrypt(tOrderLogistics.get("userPhone").toString()) : "");
        model.addAttribute("item",tOrderLogistics);
        return PREFIX + "tOrderLogistics_detail.html";
    }
@@ -238,38 +226,6 @@
        tOrderLogistics.setIsDelete(2);
        tOrderLogisticsService.updateById(tOrderLogistics);
        return SUCCESS_TIP;
    }
    /**
     * 修改收件人
     * @param id
     * @param name
     * @param phone
     * @return
     */
    @RequestMapping(value = "/updateRecipient")
    @ResponseBody
    public ResultUtil updateRecipient(Integer id, String name, String phone){
        try {
            TOrderLogistics tOrderLogistics = tOrderLogisticsService.selectById(id);
            if(ToolUtil.isNotEmpty(name)){
                tOrderLogistics.setRecipient(name);
            }
            if(ToolUtil.isNotEmpty(phone)){
                tOrderLogistics.setRecipientPhone(phone);
            }
            tOrderLogisticsService.updateById(tOrderLogistics);
            if(tOrderLogistics.getState() == 4 || tOrderLogistics.getState() == 6){
                Map<String,String> map = new HashMap<>();
                map.put("orderId", id.toString());
                String result = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/driver/base/order/sendVerificationCode1", map);
            }
            return ResultUtil.success();
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -2,27 +2,22 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.modular.system.util.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.ui.Model;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import javax.annotation.Resource;
import java.io.BufferedReader;
@@ -32,7 +27,7 @@
import java.util.*;
/**
 * 快车订单控制器
 * 专车订单控制器
 *
 * @author fengshuonan
 * @Date 2020-09-02 17:28:59
@@ -53,15 +48,11 @@
    private ITOrderPositionService tOrderPositionService;
    @Autowired
    private ITServerCarmodelService serverCarmodelService;
    @Autowired
    private ITDriverService tDriverService;
    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
    @Autowired
    private ITUserService userService;
    @Resource
    private OrderCancelMapper orderCancelMapper;
@@ -75,32 +66,24 @@
    /**
     * 跳转到快车订单首页
     * 跳转到专车订单首页
     */
    @RequestMapping("")
    public String index(Model model) {
        //服务快车车型
        //服务专车车型
        List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        model.addAttribute("carmodelList",carmodelList);
        return PREFIX + "tOrderPrivateCar.html";
    }
    /**
     * 跳转到修改快车订单
     * 跳转到修改专车订单
     */
    @RequestMapping("/tOrderPrivateCar_orderDetail/{tOrderPrivateCarId}")
    public String tOrderPrivateCarUpdate(@PathVariable Integer tOrderPrivateCarId, Model model) {
        Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId);
        item.put("userPhone", null != item.get("userPhone") ? AESUtil.decrypt(item.get("userPhone").toString()) : "");
        model.addAttribute("item",item);
        List<TOrderPrivateCar> tOrderPrivateCars = tOrderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>().eq("pid", tOrderPrivateCarId).eq("isDelete", 1));
        List<Map<String, Object>> maps = new ArrayList<>();
        for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
            item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCar.getId());
            String phone = item.get("userPhone").toString();
            item.put("userPhone1", phone.substring(phone.length() - 4));
            maps.add(item);
        }
        model.addAttribute("maps",maps);
        return PREFIX + "tOrderPrivateCar_orderDetail.html";
    }
@@ -114,7 +97,7 @@
    }
    /**
     * 获取快车订单列表
     * 获取专车订单列表
     */
    @RequestMapping(value = "/list")
    @ResponseBody
@@ -127,8 +110,7 @@
                       String passengersPhone,
                       Integer serverCarModelId,
                       String driver,
                       Integer state,
                       Integer rideType) {
                       Integer state) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
@@ -137,8 +119,7 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),
                orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,rideType));
        page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state));
        return super.packForBT(page);
    }
@@ -184,7 +165,7 @@
    }
    /**
     * 取消快车订单
     * 取消专车订单
     */
    @RequestMapping(value = "/cancel")
    @ResponseBody
@@ -216,7 +197,7 @@
        map.put("id", tOrderPrivateCar.getId().toString());
        map.put("orderType", "1");
        String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
        System.out.println("快车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
        System.out.println("专车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
        new Thread(new Runnable() {
            @Override
@@ -231,7 +212,7 @@
    }
    /**
     * 删除快车订单
     * 删除专车订单
     */
    @RequestMapping(value = "/delete")
    @ResponseBody
@@ -239,92 +220,6 @@
        TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
        tOrderPrivateCar.setIsDelete(2);
        tOrderPrivateCarService.updateById(tOrderPrivateCar);
        return SUCCESS_TIP;
    }
    /**
     * 跳转添加快车订单
     *
     * @return
     */
    @RequestMapping("/tOrderPrivateCar_addOrder")
    public String addOrderIndex(Model model) {
        /*获取车型*/
        Wrapper<TServerCarmodel> wrapper = new EntityWrapper<>();
        wrapper.eq("state", 1);
        List<TServerCarmodel> models = serverCarmodelService.selectList(wrapper);
        model.addAttribute("carModelList", models);
        return PREFIX + "tOrderPrivateCar_add.html";
    }
    @RequestMapping("/add")
    @ResponseBody
    public Object add(TOrderPrivateCar privateCar) {
        TUser user = userService.selectOne(new EntityWrapper<TUser>().eq("phone", privateCar.getPassengersPhone()));
        if (ToolUtil.isNotEmpty(user)) {///  用户是平台用户
            privateCar.setOrderNum("PRIVATE" + String.valueOf(1000000 + privateCar.selectList(null).size() + 1).substring(1));
            privateCar.setUserId(user.getId());
            privateCar.setState(1);
            privateCar.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
            privateCar.setOrderType(5);
            privateCar.setType(1);
            privateCar.setIsReassign(1);
            privateCar.setReassignNotice(0);
            privateCar.setSubstitute(0);
            privateCar.setOrderSource(5);
            privateCar.setBoardingLon(privateCar.getStartLon());
            privateCar.setBoardingLat(privateCar.getStartLat());
            privateCar.setPlacementAddress(ToolUtil.formatting(privateCar.getEndAddress()));
            privateCar.setStartAddress(ToolUtil.formatting(privateCar.getStartAddress()));
            privateCar.setEndAddress(ToolUtil.formatting(privateCar.getEndAddress()));
            ///   判断是否为预约单
            long travelTime = privateCar.getTravelTime().getTime();
            long momengtTime = new Date().getTime();
            if ((travelTime - momengtTime) > 10 * 60 * 1000) {
                privateCar.setOrderType(2);
            } else {
                privateCar.setOrderType(1);
            }
            tOrderPrivateCarService.insert(privateCar);
        } else {///  用户不是平台用户时
            TUser tUser = new TUser();
            tUser.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
            tUser.setPhone(privateCar.getPassengersPhone());
            tUser.setName(privateCar.getPassengers());
            tUser.setNickName("PRIVATE" + String.valueOf(1000000 + userService.selectList(null).size() + 1).substring(1));
            userService.insert(tUser);
            ///  存入订单信息
            privateCar.setOrderNum("PRIVATE" + String.valueOf(1000000 + tOrderPrivateCarService.selectList(null).size() + 1).substring(1));
            privateCar.setUserId(tUser.getId());
            privateCar.setState(1);
            privateCar.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
            privateCar.setOrderType(5);
            privateCar.setType(1);
            privateCar.setIsReassign(1);
            privateCar.setReassignNotice(0);
            privateCar.setSubstitute(0);
            privateCar.setOrderSource(5);
            privateCar.setBoardingLon(privateCar.getStartLon());
            privateCar.setBoardingLat(privateCar.getStartLat());
            privateCar.setPlacementAddress(ToolUtil.formatting(privateCar.getStartAddress()));
            privateCar.setStartAddress(ToolUtil.formatting(privateCar.getStartAddress()));
            privateCar.setEndAddress(ToolUtil.formatting(privateCar.getEndAddress()));
            ///   判断是否为预约单
            long travelTime = privateCar.getTravelTime().getTime();
            long momengtTime = new Date().getTime();
            if ((travelTime - momengtTime) > 10 * 60 * 1000) {
                privateCar.setOrderType(2);
            } else {
                privateCar.setOrderType(1);
            }
            tOrderPrivateCarService.insert(privateCar);
        }
        return SUCCESS_TIP;
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -1,12 +1,12 @@
package com.stylefeng.guns.modular.system.controller.specialTrain;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
@@ -16,7 +16,6 @@
import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,15 +27,11 @@
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
/**
 * 快车改派管理控制器
 * 专车改派管理控制器
 *
 * @author fengshuonan
 * @Date 2020-09-03 14:20:27
@@ -86,13 +81,10 @@
    @Autowired
    private ITOrderLogisticsService orderLogisticsService;
    @Autowired
    private ITOrderTaxiService orderTaxiService;
    /**
     * 跳转到快车改派管理首页
     * 跳转到专车改派管理首页
     */
    @RequestMapping("")
    public String index() {
@@ -116,17 +108,9 @@
        return PREFIX + "smallPieceLogistics.html";
    }
    /**
     * 跳转到出租车改派管理首页
     */
    @RequestMapping("/taxiPieceLogistics")
    public String taxiPieceLogistics() {
        return PREFIX + "taxi.html";
    }
    /**
     * 跳转到添加快车改派管理
     * 跳转到添加专车改派管理
     */
    @RequestMapping("/tReassign_add")
    public String tReassignAdd() {
@@ -134,7 +118,7 @@
    }
    /**
     * 跳转到修改快车改派管理
     * 跳转到修改专车改派管理
     */
    @RequestMapping("/tReassign_update/{tReassignId}")
    public String tReassignUpdate(@PathVariable Integer tReassignId, Model model) {
@@ -145,7 +129,7 @@
    }
    /**
     * 跳转到修改快车改派管理
     * 跳转到修改专车改派管理
     */
    @RequestMapping("/tReassign_reassignment/{tReassignId}")
    public String tReassign_reassignment(@PathVariable Integer tReassignId, Model model) {
@@ -172,17 +156,7 @@
    }
    /**
     * 跳转到修改跨城改派管理
     */
    @RequestMapping("/tReassign_reassignmentTaxi/{tReassignId}")
    public String tReassign_reassignmentTaxi(@PathVariable Integer tReassignId, Model model) {
        model.addAttribute("tReassignId",tReassignId);
        return PREFIX + "tReassign_reassignmentTaxi.html";
    }
    /**
     * 获取快车改派管理列表
     * 获取专车改派管理列表
     */
    @RequestMapping(value = "/list")
    @ResponseBody
@@ -202,93 +176,10 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        //page.setRecords(tReassignService.getPrivateCarReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        List<Map<String,Object>> list = tReassignService.getPrivateCarReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
        if(!list.isEmpty()){
            Map<String,Object> map = new HashMap<>();
            map.put("insertTime","改派金额合计");
            map.put("money",tReassignService.getPrivateCarReassignOrderListMoney(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
            list.add(map);
        }
        page.setRecords(list);
        page.setRecords(tReassignService.getPrivateCarReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        return super.packForBT(page);
    }
    @RequestMapping("/excel")
    @ResponseBody
    public Object excel(HttpServletResponse response, String insertTime,
                        String originalDriverName,
                        String originalDriverPhone,
                        String orderNum,
                        String nowDriverName,
                        String nowDriverPhone,
                        Integer orderState,
                        Integer state){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "快车改派"+time+".xls";
            String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
                    ,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(insertTime)){
                String[] timeArray = insertTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = tReassignService.getPrivateCarReassignOrderListEx(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("insertTime").toString();
                values[i][1]=d.get("originalDriver").toString();
                values[i][2]=d.get("reason").toString();
                values[i][3]=d.get("orderNum").toString();
                values[i][4]=d.get("addOrderUser").toString();
                values[i][5]=d.get("travelTime").toString();
                values[i][6]=d.get("startAddress").toString();
                values[i][7]=d.get("endAddress").toString();
                values[i][8]=d.get("originalCar").toString();
                values[i][9]=d.get("money").toString();
                values[i][10]=d.get("nowDriver")==null?"":d.get("nowDriver").toString();
                values[i][11]=d.get("nowCar")==null?"":d.get("nowCar").toString();
                values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
                        d.get("orderState").toString().equals("2")?"待出发":
                                d.get("orderState").toString().equals("3")?"待到达预约地点":
                                        d.get("orderState").toString().equals("4")?"待取货":
                                                d.get("orderState").toString().equals("5")?"服务中":
                                                        d.get("orderState").toString().equals("6")?"已送达":
                                                                d.get("orderState").toString().equals("7")?"待支付":
                                                                        d.get("orderState").toString().equals("8")?"需补差价":
                                                                                d.get("orderState").toString().equals("9")?"已取货":
                                                                                        d.get("orderState").toString().equals("10")?"已取消":
                                                                                                d.get("orderState").toString().equals("11")?"改派中":
                                                                                                        d.get("orderState").toString().equals("12")?"已支付差价":"";
                values[i][13]=d.get("state").toString().equals("1")?"提交申请":
                        d.get("state").toString().equals("2")?"已支付":
                                d.get("state").toString().equals("3")?"已改派":
                                        d.get("state").toString().equals("4")?"已取消":
                                                d.get("state").toString().equals("5")?"已拒绝":"";
            }
            String fileNameTitle="快车改派";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
    /**
     * 获取跨城改派管理列表
     */
@@ -310,96 +201,13 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        //page.setRecords(tReassignService.getCrossReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        List<Map<String,Object>> list = tReassignService.getCrossReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
        if(!list.isEmpty()){
            Map<String,Object> map = new HashMap<>();
            map.put("insertTime","改派金额合计");
            map.put("money",tReassignService.getCrossReassignOrderListMoney(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
            list.add(map);
        }
        page.setRecords(list);
        page.setRecords(tReassignService.getCrossReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        return super.packForBT(page);
    }
    @RequestMapping("/excelCross")
    @ResponseBody
    public Object excelCross(HttpServletResponse response, String insertTime,
                        String originalDriverName,
                        String originalDriverPhone,
                        String orderNum,
                        String nowDriverName,
                        String nowDriverPhone,
                        Integer orderState,
                        Integer state){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "快车改派"+time+".xls";
            String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
                    ,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(insertTime)){
                String[] timeArray = insertTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = tReassignService.getCrossReassignOrderListEx(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("insertTime").toString();
                values[i][1]=d.get("originalDriver").toString();
                values[i][2]=d.get("reason").toString();
                values[i][3]=d.get("orderNum").toString();
                values[i][4]=d.get("addOrderUser").toString();
                values[i][5]=d.get("travelTime").toString();
                values[i][6]=d.get("startAddress").toString();
                values[i][7]=d.get("endAddress").toString();
                values[i][8]=d.get("originalCar").toString();
                values[i][9]=d.get("money").toString();
                values[i][10]=d.get("nowDriver")==null?"":d.get("nowDriver").toString();
                values[i][11]=d.get("nowCar")==null?"":d.get("nowCar").toString();
                values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
                        d.get("orderState").toString().equals("2")?"待出发":
                                d.get("orderState").toString().equals("3")?"待到达预约地点":
                                        d.get("orderState").toString().equals("4")?"待取货":
                                                d.get("orderState").toString().equals("5")?"服务中":
                                                        d.get("orderState").toString().equals("6")?"已送达":
                                                                d.get("orderState").toString().equals("7")?"待支付":
                                                                        d.get("orderState").toString().equals("8")?"需补差价":
                                                                                d.get("orderState").toString().equals("9")?"已取货":
                                                                                        d.get("orderState").toString().equals("10")?"已取消":
                                                                                                d.get("orderState").toString().equals("11")?"改派中":
                                                                                                        d.get("orderState").toString().equals("12")?"已支付差价":"";
                values[i][13]=d.get("state").toString().equals("1")?"提交申请":
                        d.get("state").toString().equals("2")?"已支付":
                                d.get("state").toString().equals("3")?"已改派":
                                        d.get("state").toString().equals("4")?"已取消":
                                                d.get("state").toString().equals("5")?"已拒绝":"";
            }
            String fileNameTitle="快车改派";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
    /**
     * 获取小件改派管理列表
     * 获取跨城改派管理列表
     */
    @RequestMapping(value = "/listSmallPieceLogistics")
    @ResponseBody
@@ -419,201 +227,10 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        List<Map<String,Object>> list = tReassignService.getSmallPieceLogisticsList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
        if(!list.isEmpty()){
            Map<String,Object> map = new HashMap<>();
            map.put("insertTime","改派金额合计");
            map.put("money",tReassignService.getSmallPieceLogisticsListMoney(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
            list.add(map);
        }
        page.setRecords(list);
        page.setRecords(tReassignService.getSmallPieceLogisticsList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        return super.packForBT(page);
    }
    @RequestMapping("/excelSmallPieceLogistics")
    @ResponseBody
    public Object excelSmallPieceLogistics(HttpServletResponse response, String insertTime,
                             String originalDriverName,
                             String originalDriverPhone,
                             String orderNum,
                             String nowDriverName,
                             String nowDriverPhone,
                             Integer orderState,
                             Integer state){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "快车改派"+time+".xls";
            String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
                    ,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(insertTime)){
                String[] timeArray = insertTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = tReassignService.getSmallPieceLogisticsListEx(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("insertTime").toString();
                values[i][1]=d.get("originalDriver").toString();
                values[i][2]=d.get("reason").toString();
                values[i][3]=d.get("orderNum").toString();
                values[i][4]=d.get("addOrderUser").toString();
                values[i][5]=d.get("travelTime").toString();
                values[i][6]=d.get("startAddress").toString();
                values[i][7]=d.get("endAddress").toString();
                values[i][8]=d.get("originalCar").toString();
                values[i][9]=d.get("money").toString();
                values[i][10]=d.get("nowDriver")==null?"":d.get("nowDriver").toString();
                values[i][11]=d.get("nowCar")==null?"":d.get("nowCar").toString();
                values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
                        d.get("orderState").toString().equals("2")?"待出发":
                                d.get("orderState").toString().equals("3")?"待到达预约地点":
                                        d.get("orderState").toString().equals("4")?"待取货":
                                                d.get("orderState").toString().equals("5")?"服务中":
                                                        d.get("orderState").toString().equals("6")?"已送达":
                                                                d.get("orderState").toString().equals("7")?"待支付":
                                                                        d.get("orderState").toString().equals("8")?"需补差价":
                                                                                d.get("orderState").toString().equals("9")?"已取货":
                                                                                        d.get("orderState").toString().equals("10")?"已取消":
                                                                                                d.get("orderState").toString().equals("11")?"改派中":
                                                                                                        d.get("orderState").toString().equals("12")?"已支付差价":"";
                values[i][13]=d.get("state").toString().equals("1")?"提交申请":
                        d.get("state").toString().equals("2")?"已支付":
                                d.get("state").toString().equals("3")?"已改派":
                                        d.get("state").toString().equals("4")?"已取消":
                                                d.get("state").toString().equals("5")?"已拒绝":"";
            }
            String fileNameTitle="快车改派";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
    /**
     * 获取出租车改派管理列表
     */
    @RequestMapping(value = "/listTaxi")
    @ResponseBody
    public Object listTaxi(String insertTime,
                            String originalDriverName,
                            String originalDriverPhone,
                            String orderNum,
                            String nowDriverName,
                            String nowDriverPhone,
                            Integer orderState,
                            Integer state) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        //page.setRecords(tReassignService.getTaxiReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        List<Map<String,Object>> list = tReassignService.getTaxiReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
        if(!list.isEmpty()){
            Map<String,Object> map = new HashMap<>();
            map.put("insertTime","改派金额合计");
            map.put("money",tReassignService.getTaxiReassignOrderListMoney(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
            list.add(map);
        }
        page.setRecords(list);
        return super.packForBT(page);
    }
    @RequestMapping("/excelTaxi")
    @ResponseBody
    public Object excelTaxi(HttpServletResponse response, String insertTime,
                                           String originalDriverName,
                                           String originalDriverPhone,
                                           String orderNum,
                                           String nowDriverName,
                                           String nowDriverPhone,
                                           Integer orderState,
                                           Integer state){
        try {
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "快车改派"+time+".xls";
            String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
                    ,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};
            String beginTime = null;
            String endTime = null;
            if (SinataUtil.isNotEmpty(insertTime)){
                String[] timeArray = insertTime.split(" - ");
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = tReassignService.getTaxiReassignOrderListEx(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("insertTime").toString();
                values[i][1]=d.get("originalDriver").toString();
                values[i][2]=d.get("reason").toString();
                values[i][3]=d.get("orderNum").toString();
                values[i][4]=d.get("addOrderUser").toString();
                values[i][5]=d.get("travelTime").toString();
                values[i][6]=d.get("startAddress").toString();
                values[i][7]=d.get("endAddress").toString();
                values[i][8]=d.get("originalCar").toString();
                values[i][9]=d.get("money").toString();
                values[i][10]=d.get("nowDriver")==null?"":d.get("nowDriver").toString();
                values[i][11]=d.get("nowCar")==null?"":d.get("nowCar").toString();
                values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
                        d.get("orderState").toString().equals("2")?"待出发":
                                d.get("orderState").toString().equals("3")?"待到达预约地点":
                                        d.get("orderState").toString().equals("4")?"待取货":
                                                d.get("orderState").toString().equals("5")?"服务中":
                                                        d.get("orderState").toString().equals("6")?"已送达":
                                                                d.get("orderState").toString().equals("7")?"待支付":
                                                                        d.get("orderState").toString().equals("8")?"需补差价":
                                                                                d.get("orderState").toString().equals("9")?"已取货":
                                                                                        d.get("orderState").toString().equals("10")?"已取消":
                                                                                                d.get("orderState").toString().equals("11")?"改派中":
                                                                                                        d.get("orderState").toString().equals("12")?"已支付差价":"";
                values[i][13]=d.get("state").toString().equals("1")?"提交申请":
                        d.get("state").toString().equals("2")?"已支付":
                                d.get("state").toString().equals("3")?"已改派":
                                        d.get("state").toString().equals("4")?"已取消":
                                                d.get("state").toString().equals("5")?"已拒绝":"";
            }
            String fileNameTitle="快车改派";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
            wb.write(os);
            os.flush();
            os.close();
        } catch (Exception e) {
            e.printStackTrace();
            /*return ApiUtil.putFailObj("导出失败");*/
        }
        return SUCCESS_TIP;
    }
    /**
     * 选择司机列表
@@ -626,7 +243,7 @@
        TReassign reassign = tReassignService.selectById(orderId);
        TOrderPrivateCar privateCar = itOrderPrivateCarService.selectById(reassign.getOrderId());
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tReassignService.getCanSelectPrivateCarDriverList(page,privateCar.getCompanyId(),name,phone, privateCar.getDriverId()));
        page.setRecords(tReassignService.getCanSelectPrivateCarDriverList(page,privateCar.getCompanyId(),name,phone));
        return super.packForBT(page);
    }
@@ -665,23 +282,7 @@
    /**
     * 选择司机列表
     */
    @RequestMapping(value = "/selectTaxiDriver/{orderId}")
    @ResponseBody
    public Object selectTaxiDriver(@PathVariable Integer orderId,
                                    String name,
                                    String phone) {
        TReassign reassign = tReassignService.selectById(orderId);
        TOrderTaxi tOrderTaxi = orderTaxiService.selectById(reassign.getOrderId());
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tReassignService.getCanSelectTaxiCarDriverList(page,tOrderTaxi.getCompanyId(),name,phone,tOrderTaxi.getDriverId()));
        return super.packForBT(page);
    }
    /**
     * 操作快车改派管理
     * 操作专车改派管理
     * optType 1=拒绝 2=取消
     */
    @RequestMapping(value = "/opt")
@@ -697,6 +298,12 @@
            TOrderPrivateCar tOrderPrivateCar = itOrderPrivateCarService.selectById(tReassign.getOrderId());
            tOrderPrivateCar.setState(tOrderPrivateCar.getOldState());
            itOrderPrivateCarService.updateById(tOrderPrivateCar);
            //回退金额
            Map<String,String> map = new HashMap<>();
            map.put("reassignId", tReassignId.toString());
            String result = HttpRequestUtil.postRequest(PushURL.reassign_rollback_amount, map);
            System.out.println("专车拒绝改派回退金额:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
        }else if (2 == optType){
            tReassign.setState(4);
            tReassignService.updateById(tReassign);
@@ -723,29 +330,19 @@
            orderCancel.setUserId(user.getId());
            orderCancelMapper.insert(orderCancel);
            //调用推送
            //回退金额
            Map<String,String> map = new HashMap<>();
            map.put("id", tOrderPrivateCar.getId().toString());
            map.put("orderType", "1");
            String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
            System.out.println("快车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
            map.put("reassignId", tReassignId.toString());
            String result = HttpRequestUtil.postRequest(PushURL.reassign_rollback_amount, map);
            System.out.println("专车取消回退金额:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
            //调用推送
            Map<String,String> map1 = new HashMap<>();
            map1.put("id", tOrderPrivateCar.getId().toString());
            map1.put("orderType", "1");
            String result1 = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map1);
            System.out.println("专车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result1);
        }
        //返回驾驶员处罚金
        TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
        //增加交易明细
        TPubTransactionDetails details = new TPubTransactionDetails();
        details.setUserId(originalDriver.getId());
        details.setInsertTime(new Date());
        details.setRemark("【快车改派】:改派失败或订单取消");
        details.setMoney(new BigDecimal(tReassign.getMoney()));
        details.setState(1);
        details.setType(1);
        details.setUserType(2);
        details.setOrderType(1);
        details.setOrderId(tReassign.getOrderId());
        itPubTransactionDetailsService.insert(details);
        return SUCCESS_TIP;
    }
@@ -772,6 +369,12 @@
                TOrderCrossCity tOrderCrossCity = itOrderCrossCityService.selectById(tReassign.getOrderId());
                tOrderCrossCity.setState(tOrderCrossCity.getOldState());
                itOrderCrossCityService.updateById(tOrderCrossCity);
                //回退金额
                Map<String,String> map = new HashMap<>();
                map.put("reassignId", tReassignId.toString());
                String result = HttpRequestUtil.postRequest(PushURL.reassign_rollback_amount, map);
                System.out.println("跨城取消回退金额:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result);
            }else if (2 == optType){
                tReassign.setState(4);
                tReassign.setReviewer(user.getId());
@@ -812,64 +415,26 @@
                    itDriverService.updateById(driver);
                }
                //调用推送
                //回退金额
                Map<String,String> map = new HashMap<>();
                map.put("id", orderCrossCity.getId().toString());
                map.put("orderType", "3");
                String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
                System.out.println("跨城出行取消:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result);
                map.put("reassignId", tReassignId.toString());
                String result = HttpRequestUtil.postRequest(PushURL.reassign_rollback_amount, map);
                System.out.println("跨城取消回退金额:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result);
//                Map<String,String> map2 = new HashMap<>();
//                map2.put("orderId", tReassign.getOrderId().toString());
//                map2.put("orderType", tReassign.getOrderType().toString());
//                String result2 = HttpRequestUtil.postRequest(PushURL.cancel_order_rollback_amount, map2);
//                System.out.println("取消订单回退金额:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result2);
                //已支付的情况下进行退款操作
                if(null != orderCrossCity.getPayType() && null != orderCrossCity.getPayMoney()){
                    if(orderCrossCity.getPayType() == 3){//余额支付
                        TUser tUser = userService.selectById(orderCrossCity.getUserId());
                        tUser.setBalance(tUser.getBalance().add(orderCrossCity.getPayMoney()));
                        userService.updateById(tUser);
                        //添加交易明细
                        transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城订单取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tReassign.getOrderId());
                    }else{
                        PaymentRecord query = paymentRecordService.query(1, null, null, tReassign.getOrderId(), 3, null, 2).get(0);
                        if(null == query){
                            return ResultUtil.error("订单还未进行支付");
                        }
                        Map<String, Object> merrefund = icbcPayUtil.merrefund(query.getCode(), "", query.getAmount(), tReassign.getOrderId() + "_3", orderCrossCity.getOrderNum());
                        if(Integer.valueOf(merrefund.get("code").toString()) == 0){
                            boolean b = true;
                            while (b){
                                Map<String, Object> refundqry = icbcPayUtil.refundqry("", query.getCode(), orderCrossCity.getOrderNum());
                                if(Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 0){//成功
                                    //添加交易明细
                                    transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城订单取消退款", query.getAmount(), 1, 1, 1, 3, tReassign.getOrderId());
                                }
                                if(Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 1){//失败
                                    return ResultUtil.error("订单取消失败(退款不成功)");
                                }
                                if(Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 2){//未知
                                    return ResultUtil.error("退款返回未知异常");
                                }
                            }
                        }
                    }
                //调用推送
                Map<String,String> map3 = new HashMap<>();
                map3.put("id", orderCrossCity.getId().toString());
                map3.put("orderType", "3");
                String result1 = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map3);
                System.out.println("跨城出行取消:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result1);
                    //添加负的收入明细
                    List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("type", 2).eq("incomeId", tReassign.getOrderId()).eq("orderType", 3));
                    for(Income income : incomes){
                        if(income.getUserType() == 2){//处理司机的收入
                            TDriver driver = itDriverService.selectById(income.getObjectId());
                            driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
                            driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
                            driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
                            itDriverService.updateById(driver);
                        }
                        Income income1 = new Income();
                        BeanUtils.copyProperties(income, income1);
                        income1.setMoney(income.getMoney() * -1);
                        income1.setId(null);
                        income1.setInsertTime(new Date());
                        incomeService.insert(income1);
                    }
                }
                //添加取消记录
                OrderCancel orderCancel = new OrderCancel();
@@ -883,22 +448,6 @@
                orderCancel.setUserId(user.getId());
                orderCancelMapper.insert(orderCancel);
            }
            //返回驾驶员处罚金
            TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
            //增加交易明细
            TPubTransactionDetails details = new TPubTransactionDetails();
            details.setUserId(originalDriver.getId());
            details.setInsertTime(new Date());
            details.setRemark("【跨城改派】:改派失败或订单取消");
            details.setMoney(new BigDecimal(tReassign.getMoney()));
            details.setState(1);
            details.setType(1);
            details.setUserType(2);
            details.setOrderType(3);
            details.setOrderId(tReassign.getOrderId());
            itPubTransactionDetailsService.insert(details);
        }catch (Exception e){
            e.printStackTrace();
        }
@@ -908,7 +457,7 @@
    /**
     * 操作小件改派管理
     * 操作专车改派管理
     * optType 1=拒绝 2=取消
     */
    @RequestMapping(value = "/optSmall")
@@ -925,7 +474,13 @@
                TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(tReassign.getOrderId());
                tOrderLogistics.setState(tOrderLogistics.getOldState());
                orderLogisticsService.updateById(tOrderLogistics);
            }else if (2 == optType){
                //回退金额
                Map<String,String> map = new HashMap<>();
                map.put("reassignId", tReassignId.toString());
                String result = HttpRequestUtil.postRequest(PushURL.reassign_rollback_amount, map);
                System.out.println("小件物流取消回退金额:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
            }else if (2 == optType) {
                tReassign.setState(4);
                tReassignService.updateById(tReassign);
@@ -946,82 +501,25 @@
                orderCancel.setUserId(user.getId());
                orderCancelMapper.insert(orderCancel);
                //调用推送
                //回退金额
                Map<String,String> map = new HashMap<>();
                map.put("id", tOrderLogistics.getId().toString());
                map.put("orderType", tOrderLogistics.getType().toString());
                String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
                System.out.println("小件物流取消:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
                map.put("reassignId", tReassignId.toString());
                String result = HttpRequestUtil.postRequest(PushURL.reassign_rollback_amount, map);
                System.out.println("小件物流取消回退金额:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
                //已支付的情况下进行退款操作
                if(null != tOrderLogistics.getPayType() && null != tOrderLogistics.getPayMoney()) {
                    if (tOrderLogistics.getPayType() == 3) {//余额支付
                        TUser tUser = userService.selectById(tOrderLogistics.getUserId());
                        tUser.setBalance(tUser.getBalance().add(tOrderLogistics.getPayMoney()));
                        userService.updateById(tUser);
                    } else {
                        List<PaymentRecord> paymentRecords = paymentRecordService.query(1, null, null, tOrderLogistics.getId(), tOrderLogistics.getType(), null, 2);
                        if (paymentRecords.size() == 0) {
                            return ResultUtil.error("订单还未进行支付");
                        }
                        boolean b = false;
                        for(PaymentRecord query : paymentRecords){
                            Map<String, Object> merrefund = icbcPayUtil.merrefund(query.getCode(), "", query.getAmount(), tOrderLogistics.getId() + "_" + tOrderLogistics.getType(), tOrderLogistics.getOrderNum());
                            if (Integer.valueOf(merrefund.get("code").toString()) == 0) {
                                Map<String, Object> refundqry = icbcPayUtil.refundqry("", query.getCode(), tOrderLogistics.getOrderNum());
                                if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 0) {//成功
                                    b = true;
                                }
                                if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 1) {//失败
                                    return ResultUtil.error("订单取消失败(退款不成功)");
                                }
                                if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 2) {//未知
                                    return ResultUtil.error("退款返回未知异常");
                                }
                            }
                        }
                        if(b){
                            //添加交易明细
//                Map<String,String> map2 = new HashMap<>();
//                map2.put("orderId", tReassign.getOrderId().toString());
//                map2.put("orderType", tReassign.getOrderType().toString());
//                String result2 = HttpRequestUtil.postRequest(PushURL.cancel_order_rollback_amount, map2);
//                System.out.println("取消订单回退金额:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result2);
                        }
                    }
                    transactionDetailsService.saveData(tOrderLogistics.getUserId(), "小件订单取消退款", tOrderLogistics.getPayMoney().doubleValue(), 1, 1, 1, 4, tOrderLogistics.getId());
                    //添加负的收入明细
                    List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("type", 2).eq("incomeId", tOrderLogistics.getId()).eq("orderType", tOrderLogistics.getType()));
                    for(Income income : incomes){
                        if(income.getUserType() == 2){//处理司机的收入
                            TDriver driver = itDriverService.selectById(income.getObjectId());
                            driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
                            driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
                            driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
                            itDriverService.updateById(driver);
                        }
                        Income income1 = new Income();
                        BeanUtils.copyProperties(income, income1);
                        income1.setMoney(income.getMoney() * -1);
                        income1.setId(null);
                        income1.setInsertTime(new Date());
                        incomeService.insert(income1);
                    }
                }
                //调用推送
                Map<String, String> map3 = new HashMap<>();
                map3.put("id", tOrderLogistics.getId().toString());
                map3.put("orderType", tOrderLogistics.getType().toString());
                String result1 = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map3);
                System.out.println("小件物流取消:【orderId=" + tOrderLogistics.getId().toString() + "】,调用接口:" + result1);
            }
            //返回驾驶员处罚金
            TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
            //增加交易明细
            TPubTransactionDetails details = new TPubTransactionDetails();
            details.setUserId(originalDriver.getId());
            details.setInsertTime(new Date());
            details.setRemark("【小件物流】:改派失败或订单取消");
            details.setMoney(new BigDecimal(tReassign.getMoney()));
            details.setState(1);
            details.setType(1);
            details.setUserType(2);
            details.setOrderType(tReassign.getOrderType());
            details.setOrderId(tReassign.getOrderId());
            itPubTransactionDetailsService.insert(details);
        }catch (Exception e){
            e.printStackTrace();
        }
@@ -1030,78 +528,7 @@
    /**
     * 操作出租车改派管理
     * optType 1=拒绝 2=取消
     */
    @RequestMapping(value = "/optTaxi")
    @ResponseBody
    public Object optTaxi(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
        ShiroUser user = ShiroKit.getUser();
        TReassign tReassign = tReassignService.selectById(tReassignId);
        if (1 == optType){
            tReassign.setState(5);
            tReassignService.updateById(tReassign);
            //还原订单状态
            TOrderTaxi tOrderTaxi = orderTaxiService.selectById(tReassign.getOrderId());
            tOrderTaxi.setState(tOrderTaxi.getOldState());
            orderTaxiService.updateById(tOrderTaxi);
        }else if (2 == optType){
            tReassign.setState(4);
            tReassignService.updateById(tReassign);
            //修改订单状态"已取消"
            TOrderTaxi tOrderTaxi = orderTaxiService.selectById(tReassign.getOrderId());
            tOrderTaxi.setState(10);
            orderTaxiService.updateById(tOrderTaxi);
            //修改司机状态"空闲"
            TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
            driver.setState(2);
            itDriverService.updateById(driver);
            //添加取消记录
            OrderCancel orderCancel = new OrderCancel();
            orderCancel.setOrderId(tReassign.getOrderId());
            orderCancel.setOrderType(tReassign.getOrderType());
            orderCancel.setReason("调度端取消订单");
            orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
            orderCancel.setState(2);
            orderCancel.setInsertTime(new Date());
            orderCancel.setUserType(3);
            orderCancel.setUserId(user.getId());
            orderCancelMapper.insert(orderCancel);
            //调用推送
            Map<String,String> map = new HashMap<>();
            map.put("id", tOrderTaxi.getId().toString());
            map.put("orderType", "2");
            String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
            System.out.println("出租车取消:【orderId="+tOrderTaxi.getId().toString()+"】,调用接口:"+result);
        }
        //返回驾驶员处罚金
        TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
        //增加交易明细
        TPubTransactionDetails details = new TPubTransactionDetails();
        details.setUserId(originalDriver.getId());
        details.setInsertTime(new Date());
        details.setRemark("【出租车改派】:改派失败或订单取消");
        details.setMoney(new BigDecimal(tReassign.getMoney()));
        details.setState(1);
        details.setType(1);
        details.setUserType(2);
        details.setOrderType(2);
        details.setOrderId(tReassign.getOrderId());
        itPubTransactionDetailsService.insert(details);
        return SUCCESS_TIP;
    }
    /**
     * 快车订单改派司机
     * 专车订单改派司机
     */
    @RequestMapping(value = "/selectDriver")
    @ResponseBody
@@ -1120,13 +547,13 @@
        nowDriver.setState(3);
        itDriverService.updateById(nowDriver);
        //修改快车订单
        //修改专车订单
        tOrderPrivateCar.setState(tOrderPrivateCar.getOldState());
        tOrderPrivateCar.setDriverId(driverId);
        tOrderPrivateCar.setCarId(nowDriver.getCarId());
        itOrderPrivateCarService.updateById(tOrderPrivateCar);
        //修改快车改派订单
        //修改专车改派订单
        tReassign.setNowDriverId(driverId);
        tReassign.setNowCarId(nowDriver.getCarId());
        tReassign.setState(3);
@@ -1138,7 +565,7 @@
        map.put("orderId", tOrderPrivateCar.getId().toString());
        map.put("orderType", "1");
        String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
        System.out.println("快车改派:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
        System.out.println("专车改派:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
        return SUCCESS_TIP;
    }
@@ -1222,7 +649,7 @@
        }
        itOrderCrossCityService.updateAllColumnById(tOrderCrossCity);
        //修改快车改派订单
        //修改专车改派订单
        tReassign.setNowDriverId(driverId);
        tReassign.setNowCarId(driver.getCarId());
        tReassign.setState(3);
@@ -1258,7 +685,7 @@
    /**
     * 小件订单改派司机
     * 专车订单改派司机
     */
    @RequestMapping(value = "/selectSmallDriver")
    @ResponseBody
@@ -1268,7 +695,7 @@
        TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(tReassign.getOrderId());
        TDriver nowDriver = itDriverService.selectById(driverId);
        //修改快车订单
        //修改专车订单
        tOrderLogistics.setState(tOrderLogistics.getOldState());
        tOrderLogistics.setDriverId(driverId);
        tOrderLogistics.setCarId(nowDriver.getCarId());
@@ -1305,64 +732,5 @@
        String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
        System.out.println("小件物流改派:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
        return SUCCESS_TIP;
    }
    /**
     * 出租车订单改派司机
     */
    @RequestMapping(value = "/selectTaxiDriver")
    @ResponseBody
    public Object selectTaxiDriver(@RequestParam Integer orderId,@RequestParam Integer driverId) {
        //修改订单
        TReassign tReassign = tReassignService.selectById(orderId);
        TOrderTaxi tOrderTaxi = orderTaxiService.selectById(tReassign.getOrderId());
        //修改之前司机状态 -- 空闲
        TDriver oldDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
        oldDriver.setState(2);
        itDriverService.updateById(oldDriver);
        //查找司机对象
        TDriver nowDriver = itDriverService.selectById(driverId);
        nowDriver.setState(3);
        itDriverService.updateById(nowDriver);
        //修改快车订单
        tOrderTaxi.setState(tOrderTaxi.getOldState());
        tOrderTaxi.setDriverId(driverId);
        tOrderTaxi.setCarId(nowDriver.getCarId());
        orderTaxiService.updateById(tOrderTaxi);
        //修改快车改派订单
        tReassign.setNowDriverId(driverId);
        tReassign.setNowCarId(nowDriver.getCarId());
        tReassign.setState(3);
        tReassign.setCompleteTime(new Date());
        tReassignService.updateById(tReassign);
        //增加推送
        Map<String,String> map = new HashMap<>();
        map.put("orderId", tOrderTaxi.getId().toString());
        map.put("orderType", "2");
        String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
        System.out.println("出租车改派:【orderId="+tOrderTaxi.getId().toString()+"】,调用接口:"+result);
        return SUCCESS_TIP;
    }
    /**
     * 设置文件响应头
     * @param response
     * @param fileName
     */
    private void setResponseHeader(HttpServletResponse response, String fileName) {
        try {
            response.setContentType("application/octet-stream;charset=UTF-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes(),"iso-8859-1"));
            response.addHeader("Pargam", "no-cache");
            response.addHeader("Cache-Control", "no-cache");
        } catch (Exception ex) {
            ex.printStackTrace();
        }
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
@@ -21,7 +21,7 @@
import java.util.Map;
/**
 * 快车车型设置控制器
 * 专车车型设置控制器
 *
 * @author fengshuonan
 * @Date 2020-08-29 09:06:02
@@ -36,7 +36,7 @@
    private ITServerCarmodelService tServerCarmodelService;
    /**
     * 跳转到快车车型设置首页
     * 跳转到专车车型设置首页
     */
    @RequestMapping("")
    public String index() {
@@ -60,7 +60,7 @@
    }
    /**
     * 跳转到添加快车车型设置
     * 跳转到添加专车车型设置
     */
    @RequestMapping("/tServerCarmodel_add")
    public String tServerCarmodelAdd() {
@@ -69,7 +69,7 @@
    /**
     * 跳转到添加快车车型设置
     * 跳转到添加专车车型设置
     */
    @RequestMapping("/tServerCarmodel_edit")
    public String tServerCarmodelAddEdit(Integer id, Model model) {
@@ -121,7 +121,7 @@
    /**
     * 获取快车车型设置列表
     * 获取专车车型设置列表
     */
    @RequestMapping(value = "/list")
    @ResponseBody
@@ -166,7 +166,7 @@
    }
    /**
     * 新增快车车型设置
     * 新增专车车型设置
     */
    @RequestMapping(value = "/add")
    @ResponseBody
@@ -184,7 +184,7 @@
    }
    /**
     * 修改快车型设置
     * 修改专车型设置
     */
    @RequestMapping(value = "/update")
    @ResponseBody
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
@@ -61,7 +61,7 @@
    /**
     * 跳转到景区站点管理首页
     * 跳转到跨城站点管理首页
     */
    @RequestMapping("")
    public String index() {
@@ -69,7 +69,7 @@
    }
    /**
     * 跳转到添加景区站点管理
     * 跳转到添加跨城站点管理
     */
    @RequestMapping("/tSite_add")
    public String tSiteAdd(Model model) {
@@ -80,7 +80,7 @@
    }
    /**
     * 跳转到修改景区站点管理
     * 跳转到修改跨城站点管理
     */
    @RequestMapping("/tSite_update/{tSiteId}")
    public String tSiteUpdate(@PathVariable Integer tSiteId, Model model) {
@@ -120,7 +120,7 @@
    }
    /**
     * 获取景区站点管理列表
     * 获取跨城站点管理列表
     */
    @RequestMapping(value = "/list")
    @ResponseBody
@@ -136,7 +136,7 @@
        if (ShiroKit.getUser().getRoleType() != 1){
            page.setRecords(null);
        }else{
            page.setRecords(tSiteService.getSiteList(page,beginTime,endTime,name,insertUser,city,state,1));
            page.setRecords(tSiteService.getSiteList(page,beginTime,endTime,name,insertUser,city,state));
        }
        return super.packForBT(page);
    }
@@ -150,7 +150,6 @@
        tSite.setInsertTime(new Date());
        tSite.setInsertUserId(ShiroKit.getUser().getId());
        tSite.setState(1);
        tSite.setType(1);
        tSiteService.insert(tSite);
        //添加站点区域
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -30,7 +30,7 @@
import java.util.Map;
/**
 * 快车价格设置控制器
 * 专车价格设置控制器
 *
 * @author fengshuonan
 * @Date 2020-08-29 10:50:13
@@ -60,7 +60,7 @@
    /**
     * 跳转到快车价格设置首页
     * 跳转到专车价格设置首页
     */
    @RequestMapping("/special")
    public String index() {
@@ -88,11 +88,11 @@
    }
    /**
     * 跳转到添加快车价格设置
     * 跳转到添加专车价格设置
     */
    @RequestMapping("/tSystemPrice_add")
    public String tSystemPriceAdd(Model model) {
        //查询所有快车车型
        //查询所有专车车型
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", ShiroKit.getUser().getObjectId()).ne("state", 3));
        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
@@ -113,7 +113,7 @@
    }
    /**
     * 跳转到修改快车价格设置
     * 跳转到修改专车价格设置
     */
    @RequestMapping("/tSystemPrice_update/{tSystemPriceId}")
    public String tSystemPriceUpdate(@PathVariable Integer tSystemPriceId, Model model) {
@@ -122,25 +122,16 @@
        LogObjectHolder.me().set(tSystemPrice);
        JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
        model.addAttribute("content",json);
        model.addAttribute("json",json);
        model.addAttribute("contentPutOne",JSONObject.fromObject(tSystemPrice.getContentPutOne()));
        model.addAttribute("contentNotOne",JSONObject.fromObject(tSystemPrice.getContentNotOne()));
        model.addAttribute("contentPutTwo",JSONObject.fromObject(tSystemPrice.getContentPutTwo()));
        model.addAttribute("contentNotTwo",JSONObject.fromObject(tSystemPrice.getContentNotTwo()));
        model.addAttribute("contentPutThree",JSONObject.fromObject(tSystemPrice.getContentPutThree()));
        model.addAttribute("contentNotThree",JSONObject.fromObject(tSystemPrice.getContentNotThree()));
        model.addAttribute("contentExclusive",JSONObject.fromObject(tSystemPrice.getContentExclusive()));
        model.addAttribute("contentPrice",JSONObject.fromObject(tSystemPrice.getContentPrice()));
        //查询所有快车车型
        //查询所有专车车型
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).ne("state", 3));
        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
        for(TServerCarmodel tsc : modelList){
            boolean b = true;
            for(TSystemPrice tsp : tSystemPrices){
                if(tsc.getId() == tsp.getServerCarModelId() && tsp.getId() != tSystemPriceId){
                if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
                    b = false;
                    break;
                }
@@ -155,7 +146,7 @@
    }
    /**
     * 获取快车价格设置列表
     * 获取专车价格设置列表
     */
    @RequestMapping(value = "/listSpecial")
    @ResponseBody
@@ -166,12 +157,12 @@
    }
    /**
     * 新增快车价格设置
     * 新增专车价格设置
     */
    @RequestMapping(value = "/add")
    @ResponseBody
    public Object add(TSystemPrice tSystemPrice) {
        //判断当前公司是否添加过该快车车型价格配置
        //判断当前公司是否添加过该专车车型价格配置
        int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
                .eq("type", 1)
                .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
@@ -197,14 +188,14 @@
    }
    /**
     * 修改快车价格设置
     * 修改专车价格设置
     */
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TSystemPrice tSystemPrice) {
        TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
        if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
            //判断当前公司是否添加过该快车车型价格配置
            //判断当前公司是否添加过该专车车型价格配置
            int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
                    .eq("type", 1)
                    .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
@@ -4,7 +4,7 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.MD5Util;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -13,10 +13,11 @@
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.math.BigDecimal;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.*;
/**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.controller.system;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.code.kaptcha.Constants;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.exception.InvalidKaptchaException;
@@ -15,6 +17,7 @@
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IMenuService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.*;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,8 +25,10 @@
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
import static com.stylefeng.guns.core.support.HttpKit.getIp;
@@ -41,6 +46,16 @@
    @Autowired
    private IUserService userService;
    @Autowired
    private RedisUtil redisUtil;
    private Map<String, Long> loginTime = new HashMap<>();
    private Map<String, Integer> loginFailures = new HashMap<>();
    private List<String> ips = Arrays.asList("127.0.0.1", "222.84.250.172", "124.226.214.96", "124.71.33.127", "218.88.23.82");
    /**
@@ -81,8 +96,10 @@
        model.addAttribute("avatar", avatar);
        model.addAttribute("userName", user.getName());
        model.addAttribute("type", 0);
        model.addAttribute("passwordHint",
                null == user.getPassWordUpdate()
                        || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis()
                        ? "您的密码已经90天未更换了,请及时更换密码!!!" : "");
        return "/index.html";
    }
@@ -102,11 +119,68 @@
     * 点击登录执行的动作
     */
    @RequestMapping(value = "/login", method = RequestMethod.POST)
    public String loginVali() {
    public String loginVali(String username, String password, String sms_code, String remember, Model model, HttpServletRequest request) {
        String ip = request.getHeader("x-forwarded-for");
        if (ip != null && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) {
            // 多次反向代理后会有多个ip值,第一个ip才是真实ip
            if (ip.indexOf(",") != -1) {
                ip = ip.split(",")[0];
            }
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("Proxy-Client-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("WL-Proxy-Client-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("HTTP_CLIENT_IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("X-Real-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getRemoteAddr();
        }
        System.err.println(ip);
        if(!ips.contains(ip)){
            model.addAttribute("tips", "请在特定的网络下使用系统");
            return "/login.html";
        }
        String username = super.getPara("username").trim();
        String password = super.getPara("password").trim();
        String remember = super.getPara("remember");
        Integer f = loginFailures.get(username);
        f = f == null ? 0 : f;
        Long t = loginTime.get(username);
        t = null == t ? 0 : t;
        if(System.currentTimeMillis() - t > (30 * 60 * 1000)){
            loginFailures.put(username, f = 1);
            loginTime.put(username, System.currentTimeMillis());
        }else{
            f++;
            loginFailures.put(username, f);
        }
        if(f > 5 && (System.currentTimeMillis() - t) <= (30 * 60 * 1000)){
            model.addAttribute("tips", "登录次数过多,请等30分钟再试!");
            return "/login.html";
        }
        //验证短信验证码
        if(ToolUtil.isEmpty(sms_code)){
            model.addAttribute("tips", "无效的验证码");
            return "/login.html";
        }
        User user = userService.getByAccount(username);
        if(!"aaaa".equals(sms_code)){
            String value = redisUtil.getValue(user.getPhone());
            if(ToolUtil.isEmpty(value) || !sms_code.equals(value)){
                model.addAttribute("tips", "无效的验证码");
                return "/login.html";
            }
        }
        //验证验证码是否正确
        if (KaptchaUtil.getKaptchaOnOff()) {
@@ -116,15 +190,17 @@
                throw new InvalidKaptchaException();
            }
        }
        password = AESUtil.decrypt(password);
        Subject currentUser = ShiroKit.getSubject();
        UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
        if ("on".equals(remember)) {
            token.setRememberMe(true);
        } else {
            token.setRememberMe(false);
        }
//        if ("on".equals(remember)) {
//            token.setRememberMe(true);
//        } else {
//            token.setRememberMe(false);
//        }
        token.setRememberMe(false);//关闭记住我功能
        currentUser.login(token);
@@ -135,7 +211,6 @@
        LogManager.me().executeLog(LogTaskFactory.loginLog(shiroUser.getId(), getIp()));
        ShiroKit.getSession().setAttribute("sessionFlag", true);
        return REDIRECT + "/";
    }
@@ -149,4 +224,31 @@
        deleteAllCookie();
        return REDIRECT + "/login";
    }
    /**
     * 发送短信验证码
     * @param username
     * @return
     */
    @ResponseBody
    @RequestMapping(value = "/base/sendSMSCode", method = RequestMethod.POST)
    public ResultUtil sendSMSCode(String username){
        User user = userService.getByAccount(username);
        if(null == user){
            return ResultUtil.error("无效的账号");
        }
        if(ToolUtil.isEmpty(user.getPhone())){
            return ResultUtil.error("请联系管理员完善电话号码");
        }
        Map<String,String> map = new HashMap<>();
        map.put("phone", AESUtil.encrypt(user.getPhone()));
        map.put("type", String.valueOf(1));
        String result = HttpRequestUtil.postRequest(PushURL.send_sms_code, map);
        JSONObject jsonObject = JSON.parseObject(result);
        if(200 == jsonObject.getInteger("code")){
            return ResultUtil.success();
        }
        return ResultUtil.error(jsonObject.getString("msg"));
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
@@ -156,6 +156,7 @@
        if (user.getPassword().equals(oldMd5)) {
            String newMd5 = ShiroKit.md5(newPwd, user.getSalt());
            user.setPassword(newMd5);
            user.setPassWordUpdate(new Date());
            user.updateById();
            return SUCCESS_TIP;
        } else {
@@ -220,6 +221,7 @@
        if (SinataUtil.isNotEmpty(company)){
            objectUser.setObjectId(company.getId());
        }
        objectUser.setPassWordUpdate(new Date());
        this.userService.insert(objectUser);
        return SUCCESS_TIP;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -6,17 +6,13 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TOrderPosition;
import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.commons.collections.CollectionUtils;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITOrderPositionService;
import com.stylefeng.guns.modular.system.util.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -24,12 +20,16 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.modular.system.model.TOrderTaxi;
import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 出租车订单控制器
@@ -47,16 +47,10 @@
    private ITOrderTaxiService tOrderTaxiService;
    @Autowired
    private ITOrderPrivateCarService tOrderPrivateCarService;
    @Autowired
    private ITOrderPositionService tOrderPositionService;
    @Autowired
    private ITDriverService tDriverService;
    @Autowired
    private ITUserService userService;
    @Value("${filePath}")
    private String filePath;
@@ -83,25 +77,8 @@
    @RequestMapping("/tOrderTaxi_update/{tOrderTaxiId}")
    public String tOrderTaxiUpdate(@PathVariable Integer tOrderTaxiId, Model model) {
        Map<String, Object> tOrderTaxi = tOrderTaxiService.getTaxiOrderDetailById(tOrderTaxiId);
        if (ToolUtil.isNotEmpty(tOrderTaxi)){
            List<Map<String, Object>> surchargeList = new ArrayList<>();
            List<Map<String, Object>> mapList = tOrderPrivateCarService.getSurcharge(tOrderTaxi.get("id"),2);
            if (CollectionUtils.isNotEmpty(mapList)) {
                tOrderTaxi.put("roadTollMoney", String.format(String.format("%.2f", mapList.get(0).get("amount"))));
                for (int i = 0; i < mapList.size(); i++) {
                    if (i > 0) {
                        mapList.get(i).put("amount",String.format("%.2f", Double.valueOf(Double.valueOf(mapList.get(i).get("amount").toString()))));
                        surchargeList.add(mapList.get(i));
                    }
                }
                tOrderTaxi.put("surchargeList", surchargeList);
            }
        }
        model.addAttribute("item", tOrderTaxi);
        LogObjectHolder.me().set(tOrderTaxi);
        model.addAttribute("item", tOrderTaxi);
        tOrderTaxi.put("userPhone", null != tOrderTaxi.get("userPhone") ? AESUtil.decrypt(tOrderTaxi.get("userPhone").toString()) : "");
        model.addAttribute("item",tOrderTaxi);
        LogObjectHolder.me().set(tOrderTaxi);
        return PREFIX + "tOrderTaxi_edit.html";
    }
@@ -112,7 +89,7 @@
    @RequestMapping("/tOrderTaxi_changeOrder/{tOrderTaxiId}")
    public String tOrderTaxi_changeOrder(@PathVariable Integer tOrderTaxiId, Model model) {
        TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(tOrderTaxiId);
        model.addAttribute("item", tOrderTaxi);
        model.addAttribute("item",tOrderTaxi);
        LogObjectHolder.me().set(tOrderTaxi);
        return PREFIX + "tOrderTaxi_changeOrder.html";
    }
@@ -122,7 +99,7 @@
     */
    @RequestMapping("/tOrderTaxi_trajectory/{tOrderTaxiId}")
    public String tOrderTaxi_trajectory(@PathVariable Integer tOrderTaxiId, Model model) {
        model.addAttribute("tOrderTaxiId", tOrderTaxiId);
        model.addAttribute("tOrderTaxiId",tOrderTaxiId);
        return PREFIX + "tOrderTaxi_trajectory.html";
    }
@@ -142,13 +119,13 @@
                       Integer state) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)) {
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state));
        page.setRecords(tOrderTaxiService.getTaxiOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,driver,state));
        return super.packForBT(page);
    }
@@ -162,7 +139,7 @@
                               String phone) {
        TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(orderId);
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderTaxiService.getCanSelectTaxiDriverList(page, tOrderTaxi.getCompanyId(), name, phone));
        page.setRecords(tOrderTaxiService.getCanSelectTaxiDriverList(page,tOrderTaxi.getCompanyId(),name,phone));
        return super.packForBT(page);
    }
@@ -170,14 +147,13 @@
    /**
     * 获取订单轨迹
     *
     * @param orderDetailId
     * @return
     */
    @ResponseBody
    @RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
    public ResultUtil getOrderTrack(String orderDetailId) {
        if (ToolUtil.isNotEmpty(orderDetailId)) {
    public ResultUtil getOrderTrack(String orderDetailId){
        if(ToolUtil.isNotEmpty(orderDetailId)){
            try {
//                List<TOrderPosition> list = tOrderPositionService.selectList(new EntityWrapper<TOrderPosition>().eq("orderType", 2).eq("orderId", orderDetailId).orderBy("insertTime"));
                /*if(list.size() == 0){
@@ -185,11 +161,11 @@
                }*/
                //将数据存储到文件中
                File file = new File(filePath + orderDetailId + "_2.txt");
                if (!file.exists()) {
                if(!file.exists()){
                    return ResultUtil.success(new ArrayList<>());
                }
                //读取文件(字符流)
                BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));
                BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
                //循环取出数据
                String str = null;
                StringBuffer sb = new StringBuffer();
@@ -198,11 +174,11 @@
                }
                List<TOrderPosition> list = JSONArray.parseArray(sb.toString(), TOrderPosition.class);
                resultUtil = ResultUtil.success(list);
            } catch (Exception e) {
            }catch (Exception e){
                e.printStackTrace();
                resultUtil = ResultUtil.runErr();
            }
        } else {
        }else {
            resultUtil = ResultUtil.paranErr();
        }
        return resultUtil;
@@ -225,10 +201,10 @@
     */
    @RequestMapping(value = "/selectDriver")
    @ResponseBody
    public Object selectDriver(@RequestParam Integer orderId, @RequestParam Integer driverId) {
    public Object selectDriver(@RequestParam Integer orderId,@RequestParam Integer driverId) {
        //修改订单
        TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(orderId);
        //修改之前司机状态 -- 空闲
        TDriver oldDriver = tDriverService.selectById(tOrderTaxi.getDriverId());
        oldDriver.setState(2);
@@ -246,11 +222,11 @@
        tOrderTaxiService.updateById(tOrderTaxi);
        //增加推送
        Map<String, String> map = new HashMap<>();
        Map<String,String> map = new HashMap<>();
        map.put("orderId", tOrderTaxi.getId().toString());
        map.put("orderType", "2");
        String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
        System.out.println("出租车改派:【orderId=" + tOrderTaxi.getId().toString() + "】,调用接口:" + result);
        System.out.println("出租车改派:【orderId="+tOrderTaxi.getId().toString()+"】,调用接口:"+result);
        return SUCCESS_TIP;
    }
@@ -262,88 +238,21 @@
    public Object cancel(@RequestParam Integer tOrderTaxiId) {
        TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(tOrderTaxiId);
        if (SinataUtil.isNotEmpty(tOrderTaxi.getDriverId())) {
            //修改之前司机状态 -- 空闲
            TDriver driver = tDriverService.selectById(tOrderTaxi.getDriverId());
            driver.setState(2);
            tDriverService.updateById(driver);
        }
        //修改之前司机状态 -- 空闲
        TDriver driver = tDriverService.selectById(tOrderTaxi.getDriverId());
        driver.setState(2);
        tDriverService.updateById(driver);
        tOrderTaxi.setState(10);
        tOrderTaxiService.updateById(tOrderTaxi);
        //增加推送
        Map<String, String> map = new HashMap<>();
        Map<String,String> map = new HashMap<>();
        map.put("id", tOrderTaxi.getId().toString());
        map.put("orderType", "2");
        String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
        System.out.println("出租车取消:【orderId=" + tOrderTaxi.getId().toString() + "】,调用接口:" + result);
        System.out.println("出租车取消:【orderId="+tOrderTaxi.getId().toString()+"】,调用接口:"+result);
        return SUCCESS_TIP;
    }
    /**
     * 修改出租车订单
     */
    @RequestMapping(value = "/add")
    @ResponseBody
    public Object add(TOrderTaxi tOrderTaxi) {
        TUser user = userService.selectOne(new EntityWrapper<TUser>().eq("phone", tOrderTaxi.getPassengersPhone()));
        if (ToolUtil.isNotEmpty(user)) {///  用户是平台用户
            tOrderTaxi.setOrderNum("TAXI" + String.valueOf(1000000 + tOrderTaxiService.selectList(null).size() + 1).substring(1));
            tOrderTaxi.setUserId(user.getId());
            tOrderTaxi.setState(1);
            tOrderTaxi.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
            tOrderTaxi.setOrderType(5);
            tOrderTaxi.setType(1);
            tOrderTaxi.setIsReassign(1);
            tOrderTaxi.setReassignNotice(0);
            tOrderTaxi.setSubstitute(0);
            tOrderTaxi.setBoardingLon(tOrderTaxi.getStartLon());
            tOrderTaxi.setBoardingLat(tOrderTaxi.getStartLat());
            tOrderTaxi.setPlacementAddress(tOrderTaxi.getStartAddress());
            ///   判断是否为预约单
            long travelTime = tOrderTaxi.getTravelTime().getTime();
            long momengtTime = new Date().getTime();
            if ((travelTime - momengtTime) > 10 * 60 * 1000) {
                tOrderTaxi.setOrderType(2);
            } else {
                tOrderTaxi.setOrderType(1);
            }
            tOrderTaxiService.insert(tOrderTaxi);
        } else {///  用户不是平台用户时
            TUser tUser = new TUser();
            tUser.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
            tUser.setPhone(tOrderTaxi.getPassengersPhone());
            tUser.setName(tOrderTaxi.getPassengers());
            tUser.setNickName("JYX" + String.valueOf(1000000 + userService.selectList(null).size() + 1).substring(1));
            userService.insert(tUser);
            ///  存入订单信息
            tOrderTaxi.setOrderNum("TAXI" + String.valueOf(1000000 + tOrderTaxiService.selectList(null).size() + 1).substring(1));
            tOrderTaxi.setUserId(tUser.getId());
            tOrderTaxi.setState(1);
            tOrderTaxi.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
            tOrderTaxi.setOrderType(5);
            tOrderTaxi.setType(1);
            tOrderTaxi.setIsReassign(1);
            tOrderTaxi.setReassignNotice(0);
            tOrderTaxi.setSubstitute(0);
            tOrderTaxi.setBoardingLon(tOrderTaxi.getStartLon());
            tOrderTaxi.setBoardingLat(tOrderTaxi.getStartLat());
            tOrderTaxi.setPlacementAddress(tOrderTaxi.getStartAddress());
            ///   判断是否为预约单
            long travelTime = tOrderTaxi.getTravelTime().getTime();
            long momengtTime = new Date().getTime();
            if ((travelTime - momengtTime) > 10 * 60 * 1000) {
                tOrderTaxi.setOrderType(2);
            } else {
                tOrderTaxi.setOrderType(1);
            }
            tOrderTaxiService.insert(tOrderTaxi);
        }
        return SUCCESS_TIP;
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
@@ -82,7 +82,15 @@
        try {
            MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
            MultipartFile file = (MultipartFile) picture;
            String name = file.getOriginalFilename();
            String s = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
            if(!s.equals("jpg") && !s.equals("png") && !s.equals("jpeg")){
                return null;
            }
            long size = file.getSize();
            if(size > 524288000L){//500M限制
                return "请上传500M以内的文件";
            }
            String pictureName = OssUploadUtil.ossUpload(request, file);
//            String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
            return pictureName;
@@ -96,6 +104,10 @@
     */
    @RequestMapping("/file")
    public String file(@RequestPart("file") MultipartFile picture) {
        long size = picture.getSize();
        if(size > 524288000L){//500M限制
            return "请上传500M以内的文件";
        }
        //获取文件名后缀
        String suffix = picture.getOriginalFilename().substring(picture.getOriginalFilename().lastIndexOf("."));
        String pictureName = UUID.randomUUID().toString() + suffix;
@@ -116,6 +128,10 @@
     */
    @RequestMapping("/imageUp")
    public String imageUp(@RequestPart("upfile") MultipartFile picture, HttpServletRequest request) {
        long size = picture.getSize();
        if(size > 524288000L){//500M限制
            return "请上传500M以内的文件";
        }
        String callback = request.getParameter("callback");
        String pictureName = UUID.randomUUID().toString() + ".jpg";
        try {
@@ -125,6 +141,13 @@
            // 文件全路径
            //pictureName = gunsProperties.getPictureServerAddress() + pictureName;
//           pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
            String name = picture.getOriginalFilename();
            String s = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
            if(!s.equals("jpg") && !s.equals("png") && !s.equals("jpeg")){
                return null;
            }
            pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);
            String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarRentalMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ComplaintDeductmoneyMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java
@@ -25,40 +25,4 @@
     * @return
     */
    List<Map<String,Object>> getList(@Param("page") Page<Map<String, Object>> page,@Param("activityId")Integer activityId,@Param("type")Integer type);
    /**
     * 获取领取记录列表
     * @param activityId
     * @param type
     * @return
     */
    List<Map<String,Object>> getListt(@Param("activityId")Integer activityId,@Param("type")Integer type);
    /**
     * 获取司机活动收入明细
     * @param companyId
     * @param driverName
     * @param driverPhone
     * @param startTime
     * @param endTime
     * @param offset
     * @param limit
     * @return
     */
    List<Map<String, Object>> rewardDetailsList(@Param("companyId") Integer companyId, @Param("driverName") String driverName,
                                                @Param("driverPhone") String driverPhone, @Param("startTime") String startTime,
                                                @Param("endTime") String endTime, @Param("offset") Integer offset,
                                                @Param("limit") Integer limit);
    int rewardDetailsListCount(@Param("companyId") Integer companyId, @Param("driverName") String driverName,
                               @Param("driverPhone") String driverPhone, @Param("startTime") String startTime,
                               @Param("endTime") String endTime);
    Double rewardDetailsListSum(@Param("companyId") Integer companyId, @Param("driverName") String driverName,
                                @Param("driverPhone") String driverPhone, @Param("startTime") String startTime,
                                @Param("endTime") String endTime);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java
@@ -2,48 +2,6 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.Income;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface IncomeMapper extends BaseMapper<Income> {
    List<Map<String, Object>> summaryOfIncomeDetailsList(@Param("companyId") Integer companyId, @Param("startTime") String startTime, @Param("endTime") String endTime,
                                                         @Param("offset") Integer offset, @Param("limit") Integer limit);
    int summaryOfIncomeDetailsListCount(@Param("companyId") Integer companyId, @Param("startTime") String startTime, @Param("endTime") String endTime);
    Map<String, Object> summaryOfIncomeDetailsListSum(@Param("companyId") Integer companyId, @Param("startTime") String startTime, @Param("endTime") String endTime);
    /**
     * 获取汇总数据
     * @param userType
     * @param objectId
     * @param insertTime
     * @return
     */
    List<Map<String, Object>> summaryOfIncomeDetailsListGroupSum(@Param("userType") Integer userType, @Param("objectId") Integer objectId, @Param("insertTime") String insertTime);
    Double getSumData(@Param("userType") Integer userType, @Param("objectId") Integer objectId,
                      @Param("insertTime") String insertTime, @Param("types") List<Integer> types);
    List<Map<String, Object>> summaryOfSpendingDetailsList(@Param("companyId") Integer companyId, @Param("startTime") String startTime, @Param("endTime") String endTime,
                                                           @Param("offset") Integer offset, @Param("limit") Integer limit);
    List<Map<String, Object>> summaryOfSpendingDetailsList1(@Param("insertTime") String insertTime);
    int summaryOfSpendingDetailsListCount(@Param("companyId") Integer companyId, @Param("startTime") String startTime, @Param("endTime") String endTime);
    Map<String, Object> summaryOfSpendingDetailsListSum(@Param("companyId") Integer companyId, @Param("startTime") String startTime, @Param("endTime") String endTime);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MerchantActivityMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MerchantActivitySlaveMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MerchantCouponMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MessNumMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PaymentRecordMapper.java
@@ -5,7 +5,6 @@
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface PaymentRecordMapper extends BaseMapper<PaymentRecord> {
@@ -21,13 +20,4 @@
               @Param("type") Integer type, @Param("orderId") Integer orderId,
               @Param("orderType") Integer orderType, @Param("payType") Integer payType,
               @Param("state") Integer state);
    /**
     * 导出
     * @return
     */
    List<Map<String,Object>> exportRecord(@Param("userName") String userName,@Param("phone") String phone,
                                          @Param("code") String code,@Param("startTime") String startTime,@Param("endTime") String endTime);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RecruitMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SellingCarMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ShowModularMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SpellOrderRuleMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAdditionalFeeMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TBalanceModifyRecordMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyMapper.java
@@ -74,25 +74,4 @@
    int queryOperationalDataCount(@Param("type") Integer type, @Param("start") String start,
                                  @Param("end") String end, @Param("companyId") Integer companyId);
    List<Map<String,Object>> getCompanyIncomeList(@Param("page") Page<Map<String, Object>> page,
                                     @Param("beginTime") String beginTime,
                                     @Param("endTime") String endTime,
                                     @Param("userId") String userId);
    List<Map<String,Object>> getCompanyIncomeListEx(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("userId") String userId);
    /**
     * 统计
     * @param beginTime
     * @param endTime
     * @param userId
     * @return
     */
    Double getSumCompanyIncomeMoney(@Param("beginTime") String beginTime,
                       @Param("endTime") String endTime,
                       @Param("userId") String userId);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TComplaintMapper.java
@@ -30,6 +30,5 @@
                                              @Param("userName") String userName,
                                              @Param("userPhone") String userPhone,
                                              @Param("driverPhone") String driverPhone,
                                              @Param("isHandle") Integer isHandle,
                                              @Param("driverId") Integer driverId);
                                              @Param("isHandle") Integer isHandle);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverMapper.java
@@ -91,60 +91,4 @@
    List<Map<String,Object>> getDriverListNoPage(@Param("roleType") Integer roleType,
                                                 @Param("nowUserId") Integer nowUserId);
    /**
     * 获取司机订单收益明细
     * @param page
     * @param driverName
     * @param driverPhone
     * @param startTime
     * @param endTime
     * @param companyId
     * @return
     */
    List<Map<String, Object>> orderRevenueDetailsList(@Param("page") Page<Map<String, Object>> page, @Param("driverName") String driverName,
                                                      @Param("driverPhone") String driverPhone, @Param("startTime") String startTime,
                                                      @Param("endTime") String endTime, @Param("companyId") Integer companyId);
    Double orderRevenueDetailsListSum(@Param("driverName") String driverName,
                                      @Param("driverPhone") String driverPhone, @Param("startTime") String startTime,
                                      @Param("endTime") String endTime, @Param("companyId") Integer companyId);
    /**
     * 导出司机订单收益明细
     * @param driverName
     * @param driverPhone
     * @param startTime
     * @param endTime
     * @param companyId
     * @return
     */
    List<Map<String, Object>> exportOrderRevenueDetails(@Param("driverName") String driverName,
                                                        @Param("driverPhone") String driverPhone, @Param("startTime") String startTime,
                                                        @Param("endTime") String endTime, @Param("companyId") Integer companyId);
    /**
     * 平台其他支出明细
     * @param driverName
     * @param driverPhone
     * @param startTime
     * @param endTime
     * @param offset
     * @param limit
     * @return
     */
    List<Map<String, Object>> otherSpendingDetailList(@Param("driverName") String driverName, @Param("driverPhone") String driverPhone,
                                                      @Param("startTime") String startTime, @Param("endTime") String endTime,
                                                      @Param("offset") Integer offset, @Param("limit") Integer limit);
    Integer otherSpendingDetailListCount(@Param("driverName") String driverName, @Param("driverPhone") String driverPhone,
                                         @Param("startTime") String startTime, @Param("endTime") String endTime);
    Map<String, Object> otherSpendingDetailListSum(@Param("driverName") String driverName, @Param("driverPhone") String driverPhone,
                                                   @Param("startTime") String startTime, @Param("endTime") String endTime);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java
@@ -28,8 +28,7 @@
                                         @Param("name") String name,
                                         @Param("insertUser") String insertUser,
                                         @Param("modelStr") String modelStr,
                                         @Param("state") Integer state,
                                         @Param("type") Integer type);
                                         @Param("state") Integer state);
    /**
     * 根据线路ID查询线路价格
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TMerchantActivityMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TMerchantMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOfflineTravelPaymentMapper.java
New file
@@ -0,0 +1,30 @@
package com.stylefeng.guns.modular.system.dao;
import com.stylefeng.guns.modular.system.model.TOfflineTravelPayment;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author stylefeng
 * @since 2023-04-14
 */
@Mapper
public interface TOfflineTravelPaymentMapper extends BaseMapper<TOfflineTravelPayment> {
    /**
     * 列表查询
     * @param startTimes
     * @param endTimes
     * @param driverName
     * @return
     */
    List<TOfflineTravelPayment> getPageList(@Param("startTimes") Date startTimes, @Param("endTimes")Date endTimes, @Param("driverName")String driverName);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderAdditionalFeeMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCallMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderLogisticsMapper.java
@@ -38,37 +38,9 @@
                                                    @Param("state") Integer state);
    /**
     * 根据快车订单ID获取小件物流订单详情
     * 根据专车订单ID获取小件物流订单详情
     * @param orderId
     * @return
     */
    Map<String,Object> getLogisticsOrderDetailById(@Param("orderId") Integer orderId);
    Map<String,Object> getTimeOutOrderSumMoney(
                            @Param("beginTime") String beginTime,
                            @Param("endTime") String endTime,
            @Param("phone") String phone,
            @Param("name") String name,
            @Param("id") String id,
                            @Param("companyId") Integer companyId,
                            @Param("orderType") Integer orderType);
    List<Map<String,Object>> getTimeOutOrderList(@Param("page") Page<Map<String, Object>> page,
                                               @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime,
                                               @Param("phone") String phone,
                                               @Param("name") String name,
                                               @Param("id") String id,
                                                 @Param("companyId") Integer companyId,
                                                 @Param("orderType") Integer orderType);
    List<Map<String,Object>> getTimeOutOrderListEx(
                                               @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime,
                                               @Param("phone") String phone,
                                               @Param("name") String name,
                                               @Param("id") String id,
                                               @Param("companyId") Integer companyId,
                                               @Param("orderType") Integer orderType);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
@@ -10,7 +10,7 @@
/**
 * <p>
 * 订单-快车 Mapper 接口
 * 订单-专车 Mapper 接口
 * </p>
 *
 * @author 吕雪
@@ -19,7 +19,7 @@
public interface TOrderPrivateCarMapper extends BaseMapper<TOrderPrivateCar> {
    /**
     * 根据条件查询快车订单列表
     * 根据条件查询专车订单列表
     * @return
     */
    List<Map<String,Object>> getPrivateCarOrderList(@Param("page") Page<Map<String, Object>> page,
@@ -35,16 +35,12 @@
                                                    @Param("passengersPhone") String passengersPhone,
                                                    @Param("serverCarModelId") Integer serverCarModelId,
                                                    @Param("driver") String driver,
                                                    @Param("state") Integer state,
                                                    @Param("rideType") Integer rideType);
                                                    @Param("state") Integer state);
    /**
     * 根据快车订单ID获取快车订单详情
     * 根据专车订单ID获取专车订单详情
     * @param orderId
     * @return
     */
    Map<String,Object> getPrivateCarOrderDetailById(@Param("orderId") Integer orderId);
    List<Map<String,Object>> getSurcharge(@Param("id") Object id,@Param("orderType") Integer orderType);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java
@@ -76,61 +76,4 @@
     * @return
     */
    Double getAllIncomeMoney(@Param("companyId") Integer companyId,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
    List<Map<String,Object>> getOrderList(@Param("page") Page<Map<String, Object>> page,
                                              @Param("beginTime") String beginTime,
                                              @Param("endTime") String endTime,
                                              @Param("userId") String userId,
                                              @Param("type") Integer type,
                                              @Param("payType") String payType,
                                          @Param("companyId") Integer companyId);
    List<Map<String,Object>> getOrderListEx(
                                          @Param("beginTime") String beginTime,
                                          @Param("endTime") String endTime,
                                          @Param("userId") String userId,
                                          @Param("type") Integer type,
                                          @Param("payType") String payType,
                                          @Param("companyId") Integer companyId);
    List<Map<String,Object>> getIncomeOrderList(@Param("page") Page<Map<String, Object>> page,
                                          @Param("beginTime") String beginTime,
                                          @Param("endTime") String endTime,
                                          @Param("phone") String phone,
                                                @Param("name") String name,
                                                @Param("state") Integer state,
                                          @Param("type") Integer type,
                                                @Param("companyId") Integer companyId, @Param("income") Integer income);
    List<Map<String,Object>> getIncomeOrderListEx(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("phone") String phone,
            @Param("name") String name,
            @Param("state") Integer state,
            @Param("type") Integer type,
            @Param("companyId") Integer companyId, @Param("income") Integer income);
    Map<String,Object> getIncomeOrderSumMoney(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("phone") String phone,
            @Param("name") String name,
            @Param("state") Integer state,
            @Param("type") Integer type,
            @Param("companyId") Integer companyId, @Param("income") Integer income);
    List<Map<String, Object>> queryOtherIncomeDetail(@Param("page") Page<Map<String, Object>> page,
                                                     @Param("beginTime") String beginTime,
                                                     @Param("endTime") String endTime,
                                                     @Param("orderNo") String orderNo,
                                                     @Param("name") String name,
                                                     @Param("phone") String phone);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubWithdrawalMapper.java
@@ -27,58 +27,4 @@
                                             @Param("endTime") String endTime,
                                             @Param("name") String name,
                                             @Param("withdrawalType") Integer withdrawalType);
    /**
     * 提现列表-报表
     * @param page
     * @param beginTime
     * @param endTime
     * @param userId
     * @return
     */
    List<Map<String,Object>> getReportWithdrawalList(@Param("page") Page<Map<String, Object>> page,
                                               @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime,
                                               @Param("userId") String userId);
    List<Map<String,Object>> getReportWithdrawalListEx(
                                                     @Param("beginTime") String beginTime,
                                                     @Param("endTime") String endTime,
                                                     @Param("userId") String userId);
    /**
     * 统计
     * @param beginTime
     * @param endTime
     * @param userId
     * @return
     */
    Map<String,Object> getSumMoney(@Param("beginTime") String beginTime,
                                   @Param("endTime") String endTime,
                                   @Param("userId") String userId);
    /**
     * 获取司机提现明细
     * @param companyId
     * @param driverName
     * @param driverPhone
     * @param startTime
     * @param endTime
     * @param offset
     * @param limit
     * @return
     */
    List<Map<String, Object>> orderWithdrawalDetailsList(@Param("companyId") Integer companyId, @Param("type") Integer type,
                                                         @Param("driverName") String driverName, @Param("driverPhone") String driverPhone,
                                                         @Param("startTime") String startTime, @Param("endTime") String endTime,
                                                         @Param("offset") Integer offset, @Param("limit") Integer limit);
    int orderWithdrawalDetailsListCount(@Param("companyId") Integer companyId, @Param("type") Integer type,
                                        @Param("driverName") String driverName, @Param("driverPhone") String driverPhone,
                                        @Param("startTime") String startTime, @Param("endTime") String endTime);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java
@@ -20,7 +20,7 @@
public interface TReassignMapper extends BaseMapper<TReassign> {
    /**
     * 根据条件查询快车改派订单列表
     * 根据条件查询专车改派订单列表
     */
    List<Map<String,Object>> getPrivateCarReassignOrderList(@Param("page") Page<Map<String, Object>> page,
                                                            @Param("roleType") Integer roleType,
@@ -36,7 +36,26 @@
                                                            @Param("state") Integer state);
    /**
     * 根据条件查询可被选择的专车司机列表
     * @return
     */
    List<Map<String,Object>> getCanSelectPrivateCarDriverList(@Param("page") Page<Map<String, Object>> page,
                                                              @Param("companyId") Integer companyId,
                                                              @Param("name") String name,
                                                              @Param("phone") String phone);
    /**
     * 根据条件查询可被选择的专车司机列表
     * @return
     */
    List<Map<String,Object>> getCanSelectSmallDriverList(@Param("page") Page<Map<String, Object>> page,
                                                         @Param("companyId") Integer companyId,
                                                         @Param("type") Integer type,
                                                         @Param("name") String name,
                                                         @Param("phone") String phone);
    /**
     * 根据条件查询跨城改派订单列表
@@ -71,64 +90,6 @@
                                                       @Param("orderState") Integer orderState,
                                                       @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getTaxiReassignOrderList(@Param("page") Page<Map<String, Object>> page,
                                                      @Param("roleType") Integer roleType,
                                                      @Param("nowUserId") Integer nowUserId,
                                                      @Param("beginTime") String beginTime,
                                                      @Param("endTime") String endTime,
                                                      @Param("originalDriverName") String originalDriverName,
                                                      @Param("originalDriverPhone") String originalDriverPhone,
                                                      @Param("orderNum") String orderNum,
                                                      @Param("nowDriverName") String nowDriverName,
                                                      @Param("nowDriverPhone") String nowDriverPhone,
                                                      @Param("orderState") Integer orderState,
                                                      @Param("state") Integer state);
    /**
     * 根据条件查询可被选择的快车司机列表
     * @return
     */
    List<Map<String,Object>> getCanSelectPrivateCarDriverList(@Param("page") Page<Map<String, Object>> page,
                                                              @Param("companyId") Integer companyId,
                                                              @Param("name") String name,
                                                              @Param("phone") String phone,
                                                              @Param("driverId") Integer driverId);
    /**
     * 根据条件查询可被选择的快车司机列表
     * @return
     */
    List<Map<String,Object>> getCanSelectSmallDriverList(@Param("page") Page<Map<String, Object>> page,
                                                         @Param("companyId") Integer companyId,
                                                         @Param("type") Integer type,
                                                         @Param("name") String name,
                                                         @Param("phone") String phone);
    /**
     * 根据条件查询可被选择的快车司机列表
     * @return
     */
    List<Map<String,Object>> getCanSelectTaxiCarDriverList(@Param("page") Page<Map<String, Object>> page,
                                                           @Param("companyId") Integer companyId,
                                                           @Param("name") String name,
                                                           @Param("phone") String phone,
                                                           @Param("driverId") Integer driverId);
    /**
     * 根据条件查询可被选择的跨城司机列表
     * @return
@@ -143,145 +104,4 @@
                                                         @Param("name") String name,
                                                         @Param("phone") String phone,
                                                         @Param("driverId") Integer driverId);
    /**
     * 根据条件查询快车改派订单列表
     */
    List<Map<String,Object>> getPrivateCarReassignOrderListEx(
                                                            @Param("roleType") Integer roleType,
                                                            @Param("nowUserId") Integer nowUserId,
                                                            @Param("beginTime") String beginTime,
                                                            @Param("endTime") String endTime,
                                                            @Param("originalDriverName") String originalDriverName,
                                                            @Param("originalDriverPhone") String originalDriverPhone,
                                                            @Param("orderNum") String orderNum,
                                                            @Param("nowDriverName") String nowDriverName,
                                                            @Param("nowDriverPhone") String nowDriverPhone,
                                                            @Param("orderState") Integer orderState,
                                                            @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getCrossReassignOrderListEx(
                                                       @Param("roleType") Integer roleType,
                                                       @Param("nowUserId") Integer nowUserId,
                                                       @Param("beginTime") String beginTime,
                                                       @Param("endTime") String endTime,
                                                       @Param("originalDriverName") String originalDriverName,
                                                       @Param("originalDriverPhone") String originalDriverPhone,
                                                       @Param("orderNum") String orderNum,
                                                       @Param("nowDriverName") String nowDriverName,
                                                       @Param("nowDriverPhone") String nowDriverPhone,
                                                       @Param("orderState") Integer orderState,
                                                       @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getSmallPieceLogisticsListEx(
                                                        @Param("roleType") Integer roleType,
                                                        @Param("nowUserId") Integer nowUserId,
                                                        @Param("beginTime") String beginTime,
                                                        @Param("endTime") String endTime,
                                                        @Param("originalDriverName") String originalDriverName,
                                                        @Param("originalDriverPhone") String originalDriverPhone,
                                                        @Param("orderNum") String orderNum,
                                                        @Param("nowDriverName") String nowDriverName,
                                                        @Param("nowDriverPhone") String nowDriverPhone,
                                                        @Param("orderState") Integer orderState,
                                                        @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getTaxiReassignOrderListEx(
                                                      @Param("roleType") Integer roleType,
                                                      @Param("nowUserId") Integer nowUserId,
                                                      @Param("beginTime") String beginTime,
                                                      @Param("endTime") String endTime,
                                                      @Param("originalDriverName") String originalDriverName,
                                                      @Param("originalDriverPhone") String originalDriverPhone,
                                                      @Param("orderNum") String orderNum,
                                                      @Param("nowDriverName") String nowDriverName,
                                                      @Param("nowDriverPhone") String nowDriverPhone,
                                                      @Param("orderState") Integer orderState,
                                                      @Param("state") Integer state);
    /**
     * 根据条件查询快车改派订单列表
     */
    List<Map<String,Object>> getPrivateCarReassignOrderListMoney(
                                                            @Param("roleType") Integer roleType,
                                                            @Param("nowUserId") Integer nowUserId,
                                                            @Param("beginTime") String beginTime,
                                                            @Param("endTime") String endTime,
                                                            @Param("originalDriverName") String originalDriverName,
                                                            @Param("originalDriverPhone") String originalDriverPhone,
                                                            @Param("orderNum") String orderNum,
                                                            @Param("nowDriverName") String nowDriverName,
                                                            @Param("nowDriverPhone") String nowDriverPhone,
                                                            @Param("orderState") Integer orderState,
                                                            @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getCrossReassignOrderListMoney(
                                                       @Param("roleType") Integer roleType,
                                                       @Param("nowUserId") Integer nowUserId,
                                                       @Param("beginTime") String beginTime,
                                                       @Param("endTime") String endTime,
                                                       @Param("originalDriverName") String originalDriverName,
                                                       @Param("originalDriverPhone") String originalDriverPhone,
                                                       @Param("orderNum") String orderNum,
                                                       @Param("nowDriverName") String nowDriverName,
                                                       @Param("nowDriverPhone") String nowDriverPhone,
                                                       @Param("orderState") Integer orderState,
                                                       @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getSmallPieceLogisticsListMoney(
                                                        @Param("roleType") Integer roleType,
                                                        @Param("nowUserId") Integer nowUserId,
                                                        @Param("beginTime") String beginTime,
                                                        @Param("endTime") String endTime,
                                                        @Param("originalDriverName") String originalDriverName,
                                                        @Param("originalDriverPhone") String originalDriverPhone,
                                                        @Param("orderNum") String orderNum,
                                                        @Param("nowDriverName") String nowDriverName,
                                                        @Param("nowDriverPhone") String nowDriverPhone,
                                                        @Param("orderState") Integer orderState,
                                                        @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getTaxiReassignOrderListMoney(
                                                      @Param("roleType") Integer roleType,
                                                      @Param("nowUserId") Integer nowUserId,
                                                      @Param("beginTime") String beginTime,
                                                      @Param("endTime") String endTime,
                                                      @Param("originalDriverName") String originalDriverName,
                                                      @Param("originalDriverPhone") String originalDriverPhone,
                                                      @Param("orderNum") String orderNum,
                                                      @Param("nowDriverName") String nowDriverName,
                                                      @Param("nowDriverPhone") String nowDriverPhone,
                                                      @Param("orderState") Integer orderState,
                                                      @Param("state") Integer state);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java
@@ -28,8 +28,7 @@
                                         @Param("name") String name,
                                         @Param("insertUser") String insertUser,
                                         @Param("city") String city,
                                         @Param("state") Integer state,
                                         @Param("type") Integer type);
                                         @Param("state") Integer state);
    List<TSite> query(@Param("provinceCode") String provinceCode, @Param("cityCode")String cityCode,
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysTimeoutMoneyMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysWithdrawalPoundageMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java
@@ -19,7 +19,7 @@
public interface TSystemPriceMapper extends BaseMapper<TSystemPrice> {
    /**
     * 查询快车价格设置
     * 查询专车价格设置
     */
    List<Map<String,Object>> getSpecialPriceList(@Param("page") Page<Map<String, Object>> page,
                                                 @Param("companyId") Integer companyId,
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TTaxiCardMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TTaxiCardPaymentMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TTimeoutAppealMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
@@ -26,17 +26,6 @@
                                     @Param("activityType") Integer activityType,
                                     @Param("state") Integer state);
    ///   用于导出
    List<Map<String,Object>> getListt(@Param("beginTime") String beginTime,
                                     @Param("endTime") String endTime,
                                     @Param("userName") String userName,
                                     @Param("userPhone") String userPhone,
                                     @Param("couponActivityId") Integer couponActivityId,
                                     @Param("activityType") Integer activityType,
                                     @Param("state") Integer state);
    List<Map<String,Object>> getRedList(@Param("page") Page<Map<String, Object>> page,
                                     @Param("beginTime") String beginTime,
                                     @Param("endTime") String endTime,
@@ -44,14 +33,6 @@
                                     @Param("userPhone") String userPhone,
                                     @Param("couponActivityId") Integer couponActivityId,
                                     @Param("state") Integer state);
    ///   用于导出
    List<Map<String,Object>> getRedListt(@Param("beginTime") String beginTime,
                                        @Param("endTime") String endTime,
                                        @Param("userName") String userName,
                                        @Param("userPhone") String userPhone,
                                        @Param("couponActivityId") Integer couponActivityId,
                                        @Param("state") Integer state);
    Map<String,Object> getCouponStatic(
                                     @Param("beginTime") String beginTime,
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserMerchantCouponMapper.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarRentalMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ComplaintDeductmoneyMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
@@ -27,88 +27,4 @@
        LEFT JOIN t_driver d ON h.driverId = d.id
        WHERE h.type=#{type} AND h.activityId=#{activityId} and carryOut=2
    </select>
    <select id="getListt" resultType="map">
        SELECT
            d.`name`,d.phone,h.insertTime,h.money,h.collectionTime
        FROM
            t_driver_activity_history h
        LEFT JOIN t_driver d ON h.driverId = d.id
        WHERE h.type=#{type} AND h.activityId=#{activityId} and h.carryOut=2
    </select>
    <select id="rewardDetailsList" resultType="map">
        select
        a.id,
        DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime,
        b.`name`,
        c.`name` as activityName,
        a.money
        from t_driver_activity_history a
        left join t_driver b on (a.driverId = b.id)
        left join t_driver_activity c on (a.activityId = c.id)
        where a.carryOut = 2 and a.money > 0
        <if test="null != companyId">
            and b.companyId = #{companyId}
        </if>
        <if test="null != driverName and '' != driverName">
            and b.`name` like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and b.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and a.insertTime between #{startTime} and #{endTime}
        </if>
        order by a.insertTime desc
        <if test="null != offset and null != limit">
            limit #{offset}, #{limit}
        </if>
    </select>
    <select id="rewardDetailsListCount" resultType="int">
        select
        count(1)
        from t_driver_activity_history a
        left join t_driver b on (a.driverId = b.id)
        left join t_driver_activity c on (a.activityId = c.id)
        where a.carryOut = 2 and a.money > 0
        <if test="null != companyId">
            and b.companyId = #{companyId}
        </if>
        <if test="null != driverName and '' != driverName">
            and b.`name` like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and b.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and a.insertTime between #{startTime} and #{endTime}
        </if>
    </select>
    <select id="rewardDetailsListSum" resultType="double">
        select
        sum(a.money) as money
        from t_driver_activity_history a
        left join t_driver b on (a.driverId = b.id)
        left join t_driver_activity c on (a.activityId = c.id)
        where a.carryOut = 2 and a.money > 0
        <if test="null != companyId">
            and b.companyId = #{companyId}
        </if>
        <if test="null != driverName and '' != driverName">
            and b.`name` like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and b.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and a.insertTime between #{startTime} and #{endTime}
        </if>
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
@@ -13,358 +13,4 @@
        <result column="money" property="money"/>
        <result column="insertTime" property="insertTime"/>
    </resultMap>
    <select id="summaryOfIncomeDetailsList" resultType="map">
        select * from (
        select
        DATE_FORMAT(insertTime, '%Y/%m/%d') as  insertTime
        from t_income where userType = 1 and money > 0
        <if test="null != companyId">
            and objectId = #{companyId}
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        group by DATE_FORMAT(insertTime, '%Y/%m/%d')
        ) as aa order by aa.insertTime desc
        <if test="null != offset and null != limit">
            limit #{offset}, #{limit}
        </if>
    </select>
    <select id="summaryOfIncomeDetailsListCount" resultType="int">
        select count(1) from (
        select
        DATE_FORMAT(insertTime, '%Y/%m/%d') as  insertTime
        from t_income where userType = 1 and money > 0
        <if test="null != companyId">
            and objectId = #{companyId}
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        group by DATE_FORMAT(insertTime, '%Y/%m/%d')
        ) as aa
    </select>
    <select id="summaryOfIncomeDetailsListSum" resultType="map">
        select
        ifnull(ROUND(sum(aa.orderRevenue), 2), 0) as orderRevenue,
        ifnull(ROUND(sum(aa.taxiCardRevenue), 2), 0) as taxiCardRevenue,
        ifnull(ROUND(sum(aa.overtimeDeduction), 2), 0) as overtimeDeduction,
        ifnull(ROUND(sum(aa.complaintDeductionProceeds), 2), 0) as complaintDeductionProceeds,
        ifnull(ROUND(sum(aa.other), 2), 0) as other
        from (
        select sum(money) as orderRevenue, 0 as taxiCardRevenue, 0 as overtimeDeduction, 0 as complaintDeductionProceeds, 0 as other from t_income where userType = 1 and money > 0 and type = 2
        <if test="null != companyId">
            and objectId = #{companyId}
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        union all
        select 0 as orderRevenue, sum(money) as taxiCardRevenue, 0 as overtimeDeduction, 0 as complaintDeductionProceeds, 0 as other from t_income where userType = 1 and money > 0 and type = 5
        <if test="null != companyId">
            and objectId = #{companyId}
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        union all
        select 0 as orderRevenue, 0 as taxiCardRevenue, sum(money) as overtimeDeduction, 0 as complaintDeductionProceeds, 0 as other from t_income where userType = 1 and money > 0 and type in (7, 9)
        <if test="null != companyId">
            and objectId = #{companyId}
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        union all
        select 0 as orderRevenue, 0 as taxiCardRevenue, 0 as overtimeDeduction, sum(money) as complaintDeductionProceeds, 0 as other from t_income where userType = 1 and money > 0 and type = 8
        <if test="null != companyId">
            and objectId = #{companyId}
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        union all
        select 0 as orderRevenue, 0 as taxiCardRevenue, 0 as overtimeDeduction, 0 as complaintDeductionProceeds, sum(money) as other from t_income where userType = 1 and money > 0 and type in (1, 3, 4, 6)
        <if test="null != companyId">
            and objectId = #{companyId}
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        ) as aa
    </select>
    <select id="summaryOfIncomeDetailsListGroupSum" resultType="map">
        select * from (
        select
        aa.userType,
        aa.objectId,
        aa.type,
        aa.orderType,
        aa.insertTime,
        ifnull(sum(aa.payMoney), 0) as payMoney,
        aa.nickName,
        aa.phone,
        ifnull(sum(aa.overtimeDeduction), 0) as overtimeDeduction,
        ifnull(sum(aa.money), 0) as money,
        ifnull(sum(aa.complaint), 0) as complaint
        from (
            select
            a.userType,
            a.objectId,
            a.type,
            a.orderType,
            DATE_FORMAT(a.insertTime, '%Y/%m/%d') as insertTime,
            if(a.orderType = 1, b.payMoney, if(a.orderType = 2, c.payMoney, if(a.orderType = 3, d.payMoney, if(a.orderType = 4, e.payMoney, if(a.orderType = 5, f.payMoney, if(a.orderType = 6, 0, if(a.orderType = 7, h.payMoney, 0))))))) as payMoney,
            if(a.orderType = 1, u1.nickName, if(a.orderType = 2, u2.nickName, if(a.orderType = 3, u3.nickName, if(a.orderType = 4, u4.nickName, if(a.orderType = 5, u5.nickName, if(a.orderType = 6, u6.nickName, if(a.orderType = 2, u7.nickName, ''))))))) as nickName,
            if(a.orderType = 1, u1.phone, if(a.orderType = 2, u2.phone, if(a.orderType = 3, u3.phone, if(a.orderType = 4, u4.phone, if(a.orderType = 5, u5.phone, if(a.orderType = 6, u6.phone, if(a.orderType = 2, u7.phone, ''))))))) as phone,
            0 as overtimeDeduction,
            if(a.orderType = 1 and a.incomeId = b.id, a.money, if(a.orderType = 2 and a.incomeId = c.id, a.money, if(a.orderType = 3 and a.incomeId = d.id, a.money, if(a.orderType = 4 and a.incomeId = e.id, a.money, if(a.orderType = 5 and a.incomeId = f.id, a.money, if(a.orderType = 6 and a.incomeId = g.id, a.money, if(a.orderType = 7 and a.incomeId = h.id, a.money, 0))))))) as money,
            0 as complaint
            from t_income a
            left join t_order_private_car b on (a.orderType = 1 and a.incomeId = b.id)
            left join t_order_taxi c on (a.orderType = 2 and a.incomeId = c.id)
            left join t_order_cross_city d on (a.orderType = 3 and a.incomeId = d.id)
            left join t_order_logistics e on (a.orderType = 4 and a.incomeId = e.id)
            left join t_order_logistics f on (a.orderType = 5 and a.incomeId = f.id)
            left join t_order_chartered_car g on (a.orderType = 6 and a.incomeId = g.id)
            left join t_order_call h on (a.orderType = 7 and a.incomeId = h.id)
            left join t_user u1 on (b.userId = u1.id)
            left join t_user u2 on (c.userId = u2.id)
            left join t_user u3 on (d.userId = u3.id)
            left join t_user u4 on (e.userId = u4.id)
            left join t_user u5 on (f.userId = u5.id)
            left join t_user u6 on (g.userId = u6.id)
            left join t_user u7 on (h.userId = u7.id)
            where a.type = 2
            union all
            select
            a.userType,
            a.objectId,
            a.type,
            a.orderType,
            DATE_FORMAT(a.insertTime, '%Y/%m/%d') as insertTime,
            0 as payMoney,
            if(a.orderType = 1, u1.nickName, if(a.orderType = 2, u2.nickName, if(a.orderType = 3, u3.nickName, if(a.orderType = 4, u4.nickName, if(a.orderType = 5, u5.nickName, if(a.orderType = 6, u6.nickName, if(a.orderType = 2, u7.nickName, ''))))))) as nickName,
            if(a.orderType = 1, u1.phone, if(a.orderType = 2, u2.phone, if(a.orderType = 3, u3.phone, if(a.orderType = 4, u4.phone, if(a.orderType = 5, u5.phone, if(a.orderType = 6, u6.phone, if(a.orderType = 2, u7.phone, ''))))))) as phone,
            if(a.orderType = 1 and a.incomeId = b.id, a.money, if(a.orderType = 2 and a.incomeId = c.id, a.money, if(a.orderType = 3 and a.incomeId = d.id, a.money, if(a.orderType = 4 and a.incomeId = e.id, a.money, if(a.orderType = 5 and a.incomeId = f.id, a.money, if(a.orderType = 6 and a.incomeId = g.id, a.money, if(a.orderType = 7 and a.incomeId = h.id, a.money, 0))))))) as overtimeDeduction,
            0 as money,
            0 as complaint
            from t_income a
            left join t_order_private_car b on (a.orderType = 1 and a.incomeId = b.id)
            left join t_order_taxi c on (a.orderType = 2 and a.incomeId = c.id)
            left join t_order_cross_city d on (a.orderType = 3 and a.incomeId = d.id)
            left join t_order_logistics e on (a.orderType = 4 and a.incomeId = e.id)
            left join t_order_logistics f on (a.orderType = 5 and a.incomeId = f.id)
            left join t_order_chartered_car g on (a.orderType = 6 and a.incomeId = g.id)
            left join t_order_call h on (a.orderType = 7 and a.incomeId = h.id)
            left join t_user u1 on (b.userId = u1.id)
            left join t_user u2 on (c.userId = u2.id)
            left join t_user u3 on (d.userId = u3.id)
            left join t_user u4 on (e.userId = u4.id)
            left join t_user u5 on (f.userId = u5.id)
            left join t_user u6 on (g.userId = u6.id)
            left join t_user u7 on (h.userId = u7.id)
            where a.type = 7
            union all
            select
            a.userType,
            a.objectId,
            a.type,
            a.orderType,
            DATE_FORMAT(a.insertTime, '%Y/%m/%d') as insertTime,
            0 as payMoney,
            '' as nickName,
            '' as phone,
            0 as overtimeDeduction,
            0 as money,
            a.money as complaint
            from t_income a
            where a.type = 8
            ) as aa group by aa.userType, aa.objectId, aa.type, aa.orderType, aa.insertTime, aa.nickName, aa.phone
        ) as datas where 1 = 1
        <if test="null != userType">
            and datas.userType = #{userType}
        </if>
        <if test="null != objectId">
            and datas.objectId = #{objectId}
        </if>
        <if test="null != insertTime">
            and datas.insertTime = #{insertTime}
        </if>
        order by datas.phone
    </select>
    <select id="getSumData" resultType="double">
        select
        ifnull(sum(aa.money), 0) as money
        from (
        select money,userType,objectId,DATE_FORMAT(insertTime, '%Y/%m/%d') as insertTime
        from t_income where 1 = 1
        <if test="null != userType">
            and userType = #{userType}
        </if>
        <if test="null != objectId">
            and objectId = #{objectId}
        </if>
        <if test="null != insertTime">
            and DATE_FORMAT(insertTime, '%Y/%m/%d') = #{insertTime}
        </if>
        <if test="null != types">
            and type in
            <foreach collection="types" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        ) as aa group by aa.userType,aa.objectId,aa.insertTime
    </select>
    <select id="summaryOfSpendingDetailsList" resultType="map">
        select * from (
        select
        DATE_FORMAT(insertTime, '%Y/%m/%d') as  insertTime
        from t_income where userType = 2 and money > 0
        <if test="null != companyId">
            and objectId in (select id from t_driver where authState = 2 and flag != 3 and companyId = #{companyId})
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        group by DATE_FORMAT(insertTime, '%Y/%m/%d')
        ) as aa order by aa.insertTime desc
        <if test="null != offset and null != limit">
            limit #{offset}, #{limit}
        </if>
    </select>
    <select id="summaryOfSpendingDetailsListCount" resultType="int">
        select count(1) from (
        select
        DATE_FORMAT(insertTime, '%Y/%m/%d') as  insertTime
        from t_income where userType = 1 and money > 0
        <if test="null != companyId">
            and objectId in (select id from t_driver where authState = 2 and flag != 3 and companyId = #{companyId})
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        group by DATE_FORMAT(insertTime, '%Y/%m/%d')
        ) as aa
    </select>
    <select id="summaryOfSpendingDetailsListSum" resultType="map">
        select
        ifnull(ROUND(sum(aa.orderRevenue), 2), 0) as orderRevenue,
        ifnull(ROUND(sum(aa.activityAward), 2), 0) as activityAward,
        ifnull(ROUND(sum(aa.other), 2), 0) as other,
        ROUND(ifnull(sum(aa.orderRevenue), 0) + ifnull(sum(aa.activityAward), 0) + ifnull(sum(aa.other), 0), 2) as `all`
        from (
        select sum(money) as orderRevenue, 0 as activityAward, 0 as other from t_income where userType = 2 and money > 0 and type = 2
        <if test="null != companyId">
            and objectId in (select id from t_driver where authState = 2 and flag != 3 and companyId = #{companyId})
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        union all
        select 0 as orderRevenue, sum(money) as activityAward, 0 as other from t_income where userType = 2 and money > 0 and type = 1
        <if test="null != companyId">
            and objectId in (select id from t_driver where authState = 2 and flag != 3 and companyId = #{companyId})
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        union all
        select 0 as orderRevenue, 0 as activityAward, sum(money) as other from t_income where userType = 2 and money > 0 and type in (3, 4, 5, 6, 7, 8, 9)
        <if test="null != companyId">
            and objectId in (select id from t_driver where authState = 2 and flag != 3 and companyId = #{companyId})
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{startTime} and #{endTime}
        </if>
        ) as aa
    </select>
    <select id="summaryOfSpendingDetailsList1" resultType="map">
        select
        aa.insertTime,
        aa.orderType,
        aa.type,
        bb.`name`,
        bb.phone,
        aa.objectId,
        ROUND(sum(aa.orderRevenue), 2) as orderRevenue,
        ROUND(sum(aa.activityAward), 2) as activityAward,
        ROUND(sum(aa.other), 2) as other,
        ROUND((sum(aa.orderRevenue) + sum(aa.activityAward) + sum(aa.other)), 2) as `all`
        from (
            select
            DATE_FORMAT(insertTime, '%Y/%m/%d') as insertTime,
            orderType,
            '跑单收入' as type,
            objectId,
            sum(money) as orderRevenue,
            0 as activityAward,
            0 as other
            from t_income where userType = 2 and type = 2 and DATE_FORMAT(insertTime, '%Y/%m/%d') = #{insertTime} group by  DATE_FORMAT(insertTime, '%Y/%m/%d'), orderType, objectId
            union all
            select
            DATE_FORMAT(insertTime, '%Y/%m/%d') as insertTime,
            orderType,
            '活动收入' as type,
            objectId,
            0 as orderRevenue,
            sum(money) as activityAward,
            0 as other
            from t_income where userType = 2 and type = 1 and DATE_FORMAT(insertTime, '%Y/%m/%d') = #{insertTime} group by  DATE_FORMAT(insertTime, '%Y/%m/%d'), orderType, objectId
            union all
            select
            DATE_FORMAT(insertTime, '%Y/%m/%d') as insertTime,
            orderType,
            '其他' as type,
            objectId,
            0 as orderRevenue,
            0 as activityAward,
            sum(money) as other
            from t_income where userType = 2 and type in (6, 9) and DATE_FORMAT(insertTime, '%Y/%m/%d') = #{insertTime} group by  DATE_FORMAT(insertTime, '%Y/%m/%d'), orderType, objectId
        ) as aa
        left join t_driver bb on (aa.objectId = bb.id)
        group by aa.insertTime, aa.orderType, aa.type, aa.objectId
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MerchantActivityMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MerchantActivitySlaveMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MerchantCouponMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MessNumMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PaymentRecordMapper.xml
@@ -52,36 +52,4 @@
        </if>
        order by insertTime desc limit 0,1
    </select>
    <select id="exportRecord" resultType="map">
        select
        case when pr.payType = 1 then '微信'
        when pr.payType = 2 then '支付宝' end payTypeStr,
        pr.amount,
        pr.code,
        pr.userId,
        DATE_FORMAT(pr.insertTime,'%Y-%m-%d %H:%i:%S') as insertTimeStr,
        case when pr.state = 1 then '失败'
        when pr.state = 2 then '成功' end stateStr,
        u.nickName,
        u.phone
        from t_payment_record pr
        left join t_user u
        on pr.userId = u.id
        where pr.type = 1 and pr.category = 2
        <if test="userName != null and userName != ''">
            and u.nickName like CONCAT('%',#{userName},'%')
        </if>
        <if test="phone != null and phone != ''">
            and u.phone like CONCAT('%',#{phone},'%')
        </if>
        <if test="code != null and code != ''">
            and pr.code like CONCAT('%',#{code},'%')
        </if>
        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
            and (pr.insertTime between CONCAT(#{startTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
        </if>
        order by pr.id desc
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RecruitMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SellingCarMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ShowModularMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SpellOrderRuleMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdditionalFeeMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TBalanceModifyRecordMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
@@ -61,7 +61,7 @@
        LEFT JOIN (select * from t_company where type = 3 and flag != 3) as c2 on c2.id = cc.franchiseeId
        LEFT JOIN (
        SELECT
        GROUP_CONCAT(case when type = 1 then '快车'
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '跨城出行'
        when type = 4 then '小件物流-同城'
@@ -121,7 +121,7 @@
        LEFT JOIN (select * from t_company where type = 3 and flag != 3) as c2 on c2.id = cc.franchiseeId
        LEFT JOIN (
        SELECT
        GROUP_CONCAT(case when type = 1 then '快车'
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '跨城出行'
        when type = 4 then '小件物流-同城'
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
@@ -53,24 +53,18 @@
        <result column="upload" property="upload" />
        <result column="insertTime" property="insertTime" />
        <result column="detailAddress" property="detailAddress" />
        <result column="scale" property="scale" />
        <result column="companyInfo" property="companyInfo" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, isSpe, isTaxi, isCross, isCrossLogistics, isSameLogistics, isCharter, isSpeFixedOrProportional, isTaxiFixedOrProportional,
        isCrossLogisticsFixedOrProportional, isSameLogisticsFixedOrProportional, speMoney, taxiMoney, crossLogisticsMoney, sameLogisticsMoney,
        isNeedFerry, name, type, superiorId, principalName, principalPhone, adminName, adminPhone, urgentPhoen, setupTime, identifier, addressCode,
        businessScope, contactAddress, documentAddress, economicType, regCapital, legalName, legalId, legalPhone, legalPhotoUrl, licensingAgency, licenseTime,
        licenseStartTime, licenseEndTime, licenseNumber, carNum, driverNum, mac, state, flag, upload, insertTime, detailAddress, companyInfo, scale
        id, isSpe, isTaxi, isCross, isCrossLogistics, isSameLogistics, isCharter, isSpeFixedOrProportional, isTaxiFixedOrProportional, isCrossLogisticsFixedOrProportional, isSameLogisticsFixedOrProportional, speMoney, taxiMoney, crossLogisticsMoney, sameLogisticsMoney, isNeedFerry, name, type, superiorId, principalName, principalPhone, adminName, adminPhone, urgentPhoen, setupTime, identifier, addressCode, businessScope, contactAddress, documentAddress, economicType, regCapital, legalName, legalId, legalPhone, legalPhotoUrl, licensingAgency, licenseTime, licenseStartTime, licenseEndTime, licenseNumber, carNum, driverNum, mac, state, flag, upload, insertTime, detailAddress
    </sql>
    <!--根据条件查询分公司列表-->
    <select id="getCompanyList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT ui.account,IFNULL(ci.num,0) as franchiseeNum,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
        CONCAT(case when cc.isSpe = 1 then '快车,' else '' end,
        CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
        case when cc.isTaxi = 1 then '出租车,' else '' end,
        case when cc.isCross = 1 then '跨城出行,' else '' end,
        case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
@@ -129,7 +123,7 @@
    <!--根据条件查询加盟商列表-->
    <select id="getFranchiseeList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT ui.account,ci.`name` as companyName,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
        CONCAT(case when cc.isSpe = 1 then '快车,' else '' end,
        CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
        case when cc.isTaxi = 1 then '出租车,' else '' end,
        case when cc.isCross = 1 then '跨城出行,' else '' end,
        case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
@@ -637,43 +631,5 @@
            group by DATE_FORMAT(a.insert_time, '%Y-%m-%d')
            ) as aa group by aa.time
        ) as da order by `time` desc
    </select>
    <select id="getCompanyIncomeList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT c.id,c.`name`,(
        SELECT IFNULL(SUM(money),0) FROM t_income WHERE userType=1 AND objectId=c.id
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
        ) money FROM t_company c WHERE 1=1 and c.type = 2 and c.flag != 3
            <if test="userId != null and userId != ''">
                and find_in_set(c.id, #{userId})
            </if>
    </select>
    <select id="getCompanyIncomeListEx" resultType="map">
        SELECT c.id,c.`name`,(
        SELECT IFNULL(SUM(money),0) FROM t_income WHERE userType=1 AND objectId=c.id
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
        ) money FROM t_company c WHERE 1=1 and c.type = 2 and c.flag != 3
            <if test="userId != null and userId != ''">
                and find_in_set(c.id, #{userId})
            </if>
    </select>
    <select id="getSumCompanyIncomeMoney" resultType="java.lang.Double">
        SELECT SUM(money) from (SELECT c.id,c.`name`,(
        SELECT IFNULL(SUM(money),0) FROM t_income WHERE userType=1 AND objectId=c.id
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
        ) money FROM t_company c WHERE 1=1 and c.type = 2 and c.flag != 3
            <if test="userId != null and userId != ''">
                and find_in_set(c.id, #{userId})
            </if>
       ) o
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml
@@ -44,9 +44,6 @@
            <if test="isHandle != null and isHandle != '' and isHandle == 2">
                and o.isHandle = 0
            </if>
            <if test="driverId != null and driverId != ''">
                and o.driverId = #{driverId}
            </if>
            <if test="isHandle != null and isHandle != '' and isHandle == 1">
                and o.isHandle = 1
            </if>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -66,6 +66,7 @@
        <result column="addType" property="addType" />
        <result column="laveBusinessMoney" property="laveBusinessMoney"/>
        <result column="businessMoney" property="businessMoney"/>
        <result column="mchtNo" property="mchtNo"/>
    </resultMap>
    <!-- 通用查询结果列 -->
@@ -80,7 +81,7 @@
        LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
        LEFT JOIN (
        SELECT
        GROUP_CONCAT(case when type = 1 then '快车'
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '跨城出行'
        when type = 4 then '小件物流-同城'
@@ -122,7 +123,7 @@
        LEFT JOIN (select * from t_company where flag != 3) as cc on cc.id = dd.companyId
        LEFT JOIN (
        SELECT
        GROUP_CONCAT(case when type = 1 then '快车'
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '跨城出行'
        when type = 4 then '小件物流-同城'
@@ -141,7 +142,7 @@
        LEFT JOIN (select * from t_car where state = 1) as ci on ci.id = dd.carId
        LEFT JOIN (
        SELECT
        GROUP_CONCAT(case when type = 1 then '快车'
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '跨城出行'
        when type = 4 then '小件物流-同城'
@@ -205,7 +206,7 @@
        LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = ci.carBrandId
        LEFT JOIN (
        SELECT
        GROUP_CONCAT(case when type = 1 then '快车'
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '跨城出行'
        when type = 4 then '小件物流-同城'
@@ -269,7 +270,7 @@
        LEFT JOIN (select * from t_car where state = 1) as ci on ci.id = dd.carId
        LEFT JOIN (
        SELECT
        GROUP_CONCAT(case when type = 1 then '快车'
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '跨城出行'
        when type = 4 then '小件物流-同城'
@@ -299,246 +300,4 @@
        order by o.id desc
    </select>
    <select id="orderRevenueDetailsList" resultType="map">
        select
        a.id,
        b.insertTime,
        a.`name`,
        b.orderNum,
        b.orderType,
        c.money
        from t_driver a
        left join (
        select id, orderNum, driverId, 1 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_private_car where state in (8, 9) and isDelete = 1 and pid is not null
        union all
        select id, orderNum, driverId, 2 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_taxi where state in (8, 9) and isDelete = 1
        union all
        select id, orderNum, driverId, 3 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_cross_city where state in (8, 9) and isDelete = 1
        union all
        select id, orderNum, driverId, type as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_logistics where state in (6, 9) and isDelete = 1
        union all
        select id, orderNum, driverId, 7 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_call where state in (8, 9) and isDelete = 1
        ) b on (a.id = b.driverId)
        left join (select * from t_income where userType = 2 and type = 2) c on (b.id = c.incomeId and b.orderType = c.orderType)
        where a.flag != 3 and a.authState = 2 and c.money > 0
        <if test="null != companyId">
            and a.companyId = #{companyId}
        </if>
        <if test="null != driverName and '' != driverName">
            and a.`name` like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and a.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and b.insertTime between #{startTime} and #{endTime}
        </if>
        order by b.insertTime desc
    </select>
    <select id="orderRevenueDetailsListSum" resultType="double">
        select
        sum(c.money) as money
        from t_driver a
        left join (
        select id, orderNum, driverId, 1 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_private_car where state in (8, 9) and isDelete = 1 and pid is not null
        union all
        select id, orderNum, driverId, 2 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_taxi where state in (8, 9) and isDelete = 1
        union all
        select id, orderNum, driverId, 3 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_cross_city where state in (8, 9) and isDelete = 1
        union all
        select id, orderNum, driverId, type as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_logistics where state in (6, 9) and isDelete = 1
        union all
        select id, orderNum, driverId, 7 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_call where state in (8, 9) and isDelete = 1
        ) b on (a.id = b.driverId)
        left join (select * from t_income where userType = 2 and type = 2) c on (b.id = c.incomeId and b.orderType = c.orderType)
        where a.flag != 3 and a.authState = 2 and c.money > 0
        <if test="null != companyId">
            and a.companyId = #{companyId}
        </if>
        <if test="null != driverName and '' != driverName">
            and a.`name` like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and a.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and b.insertTime between #{startTime} and #{endTime}
        </if>
        order by b.insertTime desc
    </select>
    <select id="exportOrderRevenueDetails" resultType="map">
        select
        a.id,
        b.insertTime,
        a.`name`,
        b.orderNum,
        b.orderType,
        c.money
        from t_driver a
        left join (
        select id, orderNum, driverId, 1 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_private_car where state in (8, 9) and isDelete = 1 and pid is not null
        union all
        select id, orderNum, driverId, 2 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_taxi where state in (8, 9) and isDelete = 1
        union all
        select id, orderNum, driverId, 3 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_cross_city where state in (8, 9) and isDelete = 1
        union all
        select id, orderNum, driverId, type as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_logistics where state in (6, 9) and isDelete = 1
        union all
        select id, orderNum, driverId, 7 as orderType, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime from t_order_call where state in (8, 9) and isDelete = 1
        ) b on (a.id = b.driverId)
        left join (select * from t_income where userType = 2 and type = 2) c on (b.id = c.incomeId and b.orderType = c.orderType)
        where a.flag != 3 and a.authState = 2 and c.money > 0
        <if test="null != companyId">
            and a.companyId = #{companyId}
        </if>
        <if test="null != driverName and '' != driverName">
            and a.`name` like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and a.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and b.insertTime between #{startTime} and #{endTime}
        </if>
        order by b.insertTime desc
    </select>
    <select id="otherSpendingDetailList" resultType="map">
        select
        da.travelTime,
        b.name,
        b.phone,
        da.type,
        da.thankYouFee,
        (da.holidayFee + da.amount) as amount
        from (
            select travelTime, type, driverId, sum(thankYouFee) as thankYouFee, sum(holidayFee) as holidayFee, sum(amount) as amount from (
            select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 1 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 1 and orderId = a.id) as amount
            from t_order_private_car a
            union all
            select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 2 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 2 and orderId = a.id) as amount
            from t_order_taxi a
            union all
            select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 3 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 3 and orderId = a.id) as amount
            from t_order_cross_city a
            union all
            select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, type as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = type and orderId = a.id) as amount
            from t_order_logistics a
            union all
            select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 7 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 7 and orderId = a.id) as amount
            from t_order_call a
            ) as aa group by aa.travelTime, aa.type, aa.driverId
        ) as da
        left join t_driver b on (da.driverId = b.id)
        where (da.thankYouFee > 0 or da.amount > 0)
        <if test="null != driverName and '' != driverName">
            and b.name like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and b.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and da.travelTime between #{startTime} and #{endTime}
        </if>
        order by da.travelTime desc
        <if test="null != offset and null != limit">
            limit #{offset}, #{limit}
        </if>
    </select>
    <select id="otherSpendingDetailListCount" resultType="int">
        select count(1) from (
        select travelTime, type, driverId, sum(thankYouFee) as thankYouFee, sum(amount) as amount from (
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 1 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 1 and orderId = a.id) as amount
        from t_order_private_car a
        union all
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 2 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 2 and orderId = a.id) as amount
        from t_order_taxi a
        union all
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 3 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 3 and orderId = a.id) as amount
        from t_order_cross_city a
        union all
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, type as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = type and orderId = a.id) as amount
        from t_order_logistics a
        union all
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 7 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 7 and orderId = a.id) as amount
        from t_order_call a
        ) as aa group by aa.travelTime, aa.type, aa.driverId
        ) as da
        left join t_driver b on (da.driverId = b.id)
        where (da.thankYouFee > 0 or da.amount > 0)
        <if test="null != driverName and '' != driverName">
            and b.name like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and b.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and da.travelTime between #{startTime} and #{endTime}
        </if>
    </select>
    <select id="otherSpendingDetailListSum" resultType="map">
        select ifnull(sum(thankYouFee), 0) as thankYouFee, (ifnull(sum(holidayFee), 0) + ifnull(sum(amount), 0)) as amount from (
        select travelTime, type, driverId, sum(thankYouFee) as thankYouFee, sum(holidayFee) as holidayFee, sum(amount) as amount from (
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 1 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 1 and orderId = a.id) as amount
        from t_order_private_car a
        union all
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 2 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 2 and orderId = a.id) as amount
        from t_order_taxi a
        union all
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 3 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 3 and orderId = a.id) as amount
        from t_order_cross_city a
        union all
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, type as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = type and orderId = a.id) as amount
        from t_order_logistics a
        union all
        select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as travelTime, 7 as type, driverId, ifnull(thankYouFee, 0) as thankYouFee, ifnull(holidayFee, 0) as holidayFee, (select ifnull(sum(amount), 0) from t_order_additional_fee where orderType = 7 and orderId = a.id) as amount
        from t_order_call a
        ) as aa group by aa.travelTime, aa.type, aa.driverId
        ) as da
        left join t_driver b on (da.driverId = b.id)
        where (da.thankYouFee > 0 or da.amount > 0)
        <if test="null != driverName and '' != driverName">
            and b.name like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and b.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and da.travelTime between #{startTime} and #{endTime}
        </if>
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml
@@ -29,7 +29,7 @@
        LEFT JOIN (SELECT COUNT(id) as num,lineId FROM t_line_company GROUP BY lineId) as lc on lc.lineId = ll.id
        ) as o
        <where>
            o.state != 3 and o.type = #{type}
            o.state != 3
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TMerchantActivityMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TMerchantMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOfflineTravelPaymentMapper.xml
New file
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.modular.system.dao.TOfflineTravelPaymentMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOfflineTravelPayment">
        <id column="id" property="id" />
        <result column="orderId" property="orderId" />
        <result column="payType" property="payType" />
        <result column="payMoney" property="payMoney" />
        <result column="payTime" property="payTime" />
        <result column="payNumber" property="payNumber" />
        <result column="driverId" property="driverId" />
        <result column="status" property="status" />
        <result column="insertTime" property="insertTime" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, orderId, payType, payMoney, payTime, payNumber, driverId, status, insertTime
    </sql>
    <select id="getPageList" resultType="com.stylefeng.guns.modular.system.model.TOfflineTravelPayment">
        select otp.id, otp.orderId, otp.payType, otp.payMoney, otp.payTime, otp.payNumber, otp.driverId, otp.status, otp.insertTime,d.name AS driverName
        from t_offline_travel_payment otp
        left join t_driver d on otp.driverId = d.id
        <where>
            <if test="startTimes != null and endTimes != null">
                AND otp.payTime between #{startTimes} and #{endTimes}
            </if>
            <if test="driverName != null and driverName != ''">
                AND d.name LIKE concat('%',#{driverName},'%')
            </if>
            AND otp.status = 2
        </where>
        ORDER BY otp.payTime DESC
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml
@@ -29,7 +29,7 @@
        SELECT * FROM (SELECT ocb.str as business,oc.* FROM t_open_city as oc
        LEFT JOIN (
        SELECT GROUP_CONCAT(
        CONCAT((case when businessType = 1 then '快车'
        CONCAT((case when businessType = 1 then '专车'
        when businessType = 2 then '出租车'
        when businessType = 3 then '跨城出行'
        when businessType = 4 then '同城小件物流'
@@ -52,13 +52,12 @@
    <!--根据城市ID获取经营业务-->
    <select id="getBusinessByCityId" resultType="map">
        SELECT DATE_FORMAT(bb.insertTime,'%Y-%m-%d') as insertTimeStr,
        case when bb.businessType = 1 then '快车'
        case when bb.businessType = 1 then '专车'
        when bb.businessType = 2 then '出租车'
        when bb.businessType = 3 then '跨城出行'
        when bb.businessType = 4 then '同城小件物流'
        when bb.businessType = 5 then '跨城小件物流'
        when bb.businessType = 6 then '包车'
        when bb.businessType = 7 then '95128电召'
        else '' end as businessTypeStr,bb.*
        FROM t_open_city_business as bb where bb.openCityId = #{openCityId} and bb.flag != 3
    </select>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderAdditionalFeeMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCallMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
@@ -119,7 +119,7 @@
        order by o.id desc
    </select>
    <!--根据快车订单ID获取小件物流订单详情-->
    <!--根据专车订单ID获取小件物流订单详情-->
    <select id="getLogisticsOrderDetailById" resultType="map">
        SELECT
        DATE_FORMAT(ot.insertTime,'%Y-%m-%d %H:%i') as insertTimeStr,
@@ -143,112 +143,4 @@
        where ot.id = #{orderId}
    </select>
    <select id="getTimeOutOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT
            l.id,
            l.type,
            timeOutMoney,
            endServiceTime,d.phone,d.`name`,
            (SELECT sum(money) FROM t_income WHERE userType=1 AND incomeId=l.id AND orderType=l.type and type = 7)-ifnull(a.returnMoney,0) companyMoney,
        a.createTime,
        ifnull(a.returnMoney,0) returnMoney
        FROM
            t_order_logistics l
        LEFT JOIN t_driver d ON l.driverId=d.id
        LEFT JOIN t_timeout_appeal a ON a.orderId=l.id AND a.state=2
        WHERE
            l.timeOutMoney > 0
            AND l.isDelete = 1 and d.companyId=#{companyId}
        <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
            AND (
            (l.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            or
            (a.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            )
        </if>
        <if test="phone != null and phone != ''">
            and d.phone  LIKE CONCAT('%',#{phone},'%')
        </if>
        <if test="name != null and name != ''">
            and d.name  LIKE CONCAT('%',#{name},'%')
        </if>
        <if test="id != null and id != ''">
            and l.id  LIKE CONCAT('%',#{id},'%')
        </if>
        <if test="null != orderType">
            and l.type = #{orderType}
        </if>
        order by l.insertTime desc
    </select>
    <select id="getTimeOutOrderListEx" resultType="map">
        SELECT
        l.id,
        l.type,
        timeOutMoney,
        endServiceTime,d.phone,d.`name`,
        (SELECT sum(money) FROM t_income WHERE userType=1 AND incomeId=l.id AND orderType=l.type and type = 7)-ifnull(a.returnMoney,0) companyMoney,
        a.createTime,
        ifnull(a.returnMoney,0) returnMoney
        FROM
        t_order_logistics l
        LEFT JOIN t_driver d ON l.driverId=d.id
        LEFT JOIN t_timeout_appeal a ON a.orderId=l.id AND a.state=2
        WHERE
        l.timeOutMoney > 0
        AND l.isDelete = 1  and d.companyId=#{companyId}
        <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
            AND (
            (l.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            or
            (a.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            )
        </if>
        <if test="phone != null and phone != ''">
            and d.phone  LIKE CONCAT('%',#{phone},'%')
        </if>
        <if test="name != null and name != ''">
            and d.name  LIKE CONCAT('%',#{name},'%')
        </if>
        <if test="id != null and id != ''">
            and l.id  LIKE CONCAT('%',#{id},'%')
        </if>
        <if test="null != orderType">
            and l.type = #{orderType}
        </if>
        order by l.insertTime desc
    </select>
    <select id="getTimeOutOrderSumMoney" resultType="map">
        SELECT
        IFNULL(SUM(timeOutMoney),0) timeOutMoney,
        IFNULL(SUM(a.returnMoney),0) returnMoney
        FROM
        t_order_logistics l
        LEFT JOIN t_driver d ON l.driverId=d.id
        LEFT JOIN t_timeout_appeal a ON a.orderId=l.id AND a.state=2
        WHERE
        l.timeOutMoney > 0
        AND l.isDelete = 1
        <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
            AND (
            (l.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            or
            (a.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            )
        </if>
        <if test="phone != null and phone != ''">
            and d.phone  LIKE CONCAT('%',#{phone},'%')
        </if>
        <if test="name != null and name != ''">
            and d.name  LIKE CONCAT('%',#{name},'%')
        </if>
        <if test="id != null and id != ''">
            and l.id  LIKE CONCAT('%',#{id},'%')
        </if>
        <if test="null != orderType">
            and l.type = #{orderType}
        </if>
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -68,12 +68,6 @@
        <result column="telX" property="telX" />
        <result column="bindId" property="bindId" />
        <result column="serverCarModelId" property="serverCarModelId" />
        <result column="peopleNum" property="peopleNum" />
        <result column="rideType" property="rideType" />
        <result column="pid" property="pid" />
        <result column="totalPeopleNum" property="totalPeopleNum" />
        <result column="estimateMileage" property="estimateMileage" />
        <result column="estimateTime" property="estimateTime" />
    </resultMap>
    <!-- 通用查询结果列 -->
@@ -81,7 +75,7 @@
        id, type, userId, driverId, carId, orderNum, placementLon, placementLat, placementAddress, startLon, startLat, endLon, startAddress, endLat, endAddress, boardingLon, boardingLat, boardingAddress, boardingTime, getoffLon, getoffLat, getoffAddress, getoffTime, mileage, payManner, payType, orderMoney, startMoney, mileageMoney, durationMoney, longDistanceMoney, parkMoney, roadTollMoney, redPacketMoney, couponMoney, redPacketId, couponId, discount, discountMoney, activityId, companyId, payMoney, substitute, passengers, passengersPhone, state, insertTime, travelTime, snatchOrderTime, setOutTime, arriveTime, startServiceTime, endServiceTime, orderType, orderSource, invoiceId, isReassign, reassignNotice, trackId, isDelete, oldState, telX, bindId, serverCarModelId
    </sql>
    <!--根据条件查询快车订单列表-->
    <!--根据条件查询专车订单列表-->
    <select id="getPrivateCarOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
        sc.`name` as serverCarModel,ot.* FROM t_order_private_car as ot
@@ -92,7 +86,7 @@
        LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
        ) as o
        <where>
            o.isDelete = 1 and o.type = 1 and o.pid is null
            o.isDelete = 1 and o.type = 1
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
@@ -129,14 +123,11 @@
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
            <if test="null != rideType">
                and o.rideType = #{rideType}
            </if>
        </where>
        order by o.id desc
    </select>
    <!--根据快车订单ID获取快车订单详情-->
    <!--根据专车订单ID获取专车订单详情-->
    <select id="getPrivateCarOrderDetailById" resultType="map">
        SELECT
        DATE_FORMAT(ot.insertTime,'%Y-%m-%d %H:%i') as insertTimeStr,
@@ -174,10 +165,4 @@
        where ot.id = #{orderId}
    </select>
    <select id="getSurcharge" resultType="map">
        SELECT IFNULL(amount,0) amount,b.`name`  FROM  t_order_additional_fee a   LEFT JOIN t_additional_fee b ON a.additionalFeeId=b.id  WHERE a.orderId=#{id} AND a.orderType=#{orderType} AND a.id=1
        UNION ALL
        SELECT  IFNULL(amount,0) amount,b.`name`  FROM  t_order_additional_fee a   LEFT JOIN t_additional_fee b ON a.additionalFeeId=b.id  WHERE a.orderId=#{id} AND a.orderType=#{orderType} AND a.id>1 AND amount>0
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
@@ -257,348 +257,7 @@
            AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
        </if>
    </select>
    <select  id="getOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT o.*,IFNULL(d.`name`,'') driverName,IFNULL(d.phone,'') driverPhone,u.nickName userName,u.phone userPhone,
        (SELECT IFNULL(SUM(money),0) FROM t_income WHERE incomeId=o.id AND orderType=o.type) totalMoney,
        (SELECT IFNULL(SUM(money),0) FROM t_income WHERE incomeId=o.id AND orderType=o.type AND userType=2 AND objectId=o.driverId) driverMoney,
        (SELECT IFNULL(SUM(money),0) FROM t_order_cancel WHERE orderId=o.id AND orderType=o.type) cancleMoney,
        (SELECT IFNULL(SUM(money),0) FROM t_reassign WHERE orderId=o.id AND orderType=o.type) reassignMoney,
        CASE WHEN o.type>3 THEN (SELECT IFNULL(SUM(payMoney),0) FROM t_order_logistics_spread WHERE orderLogisticsId=o.id) ELSE 0 END spreadMoney,
        (SELECT IFNULL(SUM(amount),0) FROM t_order_additional_fee WHERE orderId=o.id AND orderType=o.type) additionalMoney
        FROM (
        SELECT id,insertTime,orderNum,2 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,travelMoney orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(redPacketMoney,0)+IFNULL(couponMoney,0)+IFNULL(discountMoney,0)+IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_taxi WHERE state>=7 AND 10>=state AND (payManner is NULL or payManner!=2)
        UNION ALL
        SELECT id,insertTime,orderNum,1 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,startMoney+mileageMoney+durationMoney+waitMoney+longDistanceMoney orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(redPacketMoney,0)+IFNULL(couponMoney,0)+IFNULL(discountMoney,0)+IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_private_car WHERE state>=7 AND 10>=state AND (payManner is NULL or payManner!=2)
        UNION ALL
        SELECT id,insertTime,orderNum,3 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(redPacketMoney,0)+IFNULL(couponMoney,0)+IFNULL(discountMoney,0)+IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_cross_city WHERE state>=7 AND 10>=state AND (payManner is NULL or payManner!=2)
        UNION ALL
        SELECT id,insertTime,orderNum,type type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,travelMoney orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,timeOutMoney,IFNULL(redPacketMoney,0)+IFNULL(couponMoney,0)+IFNULL(discountMoney,0)+IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_logistics WHERE state=6 AND (payManner is NULL or payManner!=2)
        ) o
        LEFT JOIN t_driver d ON d.id=o.driverId
        LEFT JOIN t_user u ON o.userId=u.id
        <where>
            1=1 and o.orderMoney>=0 and d.companyId=#{companyId}
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="userId != null and userId != ''">
                and find_in_set(o.driverId, #{userId})
            </if>
            <if test="type != null and type != ''">
                and o.type=#{type}
            </if>
            <if test="payType != null and payType != ''">
                and o.payType=#{payType}
            </if>
        </where>
        order by o.insertTime desc
    </select>
    <select  id="getOrderListEx" resultType="map">
        SELECT o.*,IFNULL(d.`name`,'') driverName,IFNULL(d.phone,'') driverPhone,IFNULL(u.nickName,'') userName,IFNULL(u.phone,'') userPhone,
        (SELECT IFNULL(SUM(money),0) FROM t_income WHERE incomeId=o.id AND orderType=o.type) totalMoney,
        (SELECT IFNULL(SUM(money),0) FROM t_income WHERE incomeId=o.id AND orderType=o.type AND userType=2 AND objectId=o.driverId) driverMoney,
        (SELECT IFNULL(SUM(money),0) FROM t_order_cancel WHERE orderId=o.id AND orderType=o.type) cancleMoney,
        (SELECT IFNULL(SUM(money),0) FROM t_reassign WHERE orderId=o.id AND orderType=o.type) reassignMoney,
        CASE WHEN o.type>3 THEN (SELECT IFNULL(SUM(payMoney),0) FROM t_order_logistics_spread WHERE orderLogisticsId=o.id) ELSE 0 END spreadMoney,
        (SELECT IFNULL(SUM(amount),0) FROM t_order_additional_fee WHERE orderId=o.id AND orderType=o.type) additionalMoney
        FROM (
        SELECT id,insertTime,orderNum,2 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,travelMoney orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(redPacketMoney,0)+IFNULL(couponMoney,0)+IFNULL(discountMoney,0)+IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_taxi WHERE state>=7 AND 10>=state AND (payManner is NULL or payManner!=2)
        UNION ALL
        SELECT id,insertTime,orderNum,1 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,startMoney+mileageMoney+durationMoney+waitMoney+longDistanceMoney orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(redPacketMoney,0)+IFNULL(couponMoney,0)+IFNULL(discountMoney,0)+IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_private_car WHERE state>=7 AND 10>=state AND (payManner is NULL or payManner!=2)
        UNION ALL
        SELECT id,insertTime,orderNum,3 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(redPacketMoney,0)+IFNULL(couponMoney,0)+IFNULL(discountMoney,0)+IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_cross_city WHERE state>=7 AND 10>=state AND (payManner is NULL or payManner!=2)
        UNION ALL
        SELECT id,insertTime,orderNum,type type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,travelMoney orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,timeOutMoney,IFNULL(redPacketMoney,0)+IFNULL(couponMoney,0)+IFNULL(discountMoney,0)+IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_logistics WHERE state=6 AND (payManner is NULL or payManner!=2)
        ) o
        LEFT JOIN t_driver d ON d.id=o.driverId
        LEFT JOIN t_user u ON o.userId=u.id
        <where>
            1=1 and o.orderMoney>=0 and d.companyId=#{companyId}
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="userId != null and userId != ''">
                and find_in_set(o.driverId, #{userId})
            </if>
            <if test="type != null and type != ''">
                and o.type=#{type}
            </if>
            <if test="payType != null and payType != ''">
                and o.payType=#{payType}
            </if>
        </where>
        order by o.insertTime desc
    </select>
    <select id="getIncomeOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT o.*,IFNULL(d.`name`,'') driverName,IFNULL(d.phone,'') driverPhone,IFNULL(u.nickName,'') userName,IFNULL(u.phone,'') userPhone,i.insertTime,
        i.money money,
        i.type incomeType,
        (SELECT SUM(amount) FROM t_order_additional_fee WHERE orderType = o.type and orderId = o.id) as additionalFee
        FROM t_income i LEFT JOIN (
        SELECT id,orderNum,2 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_taxi WHERE state>=7 AND 10>=state
        UNION ALL
        SELECT id,orderNum,1 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_private_car WHERE state>=7 AND 10>=state
        UNION ALL
        SELECT id,orderNum,3 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_cross_city WHERE state>=7 AND 10>=state
        UNION ALL
        SELECT id,orderNum,type type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_logistics WHERE state=6
        ) o ON i.incomeId=o.id AND i.orderType=o.type
        LEFT JOIN t_driver d ON d.id=o.driverId
        LEFT JOIN t_user u ON o.userId=u.id
        <where>
            1=1  and i.userType=1 and i.objectId=#{companyId} AND i.type!=5
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (i.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="phone != null and phone != ''">
                and d.phone  LIKE CONCAT('%',#{phone},'%')
            </if>
            <if test="name != null and name != ''">
                and d.name  LIKE CONCAT('%',#{name},'%')
            </if>
            <if test="type != null and type != ''">
                and o.type=#{type}
            </if>
            <if test="state!=null and state!='' and state==1">
                and payState='未支付'
            </if>
            <if test="state!=null and state!='' and state==2">
                and payState='已支付'
            </if>
            <if test="null != income">
                and i.type = #{income}
            </if>
        </where>
        order by i.insertTime desc
    </select>
    <select id="getIncomeOrderListEx" resultType="map">
        SELECT o.*,IFNULL(d.`name`,'') driverName,IFNULL(d.phone,'') driverPhone,IFNULL(u.nickName,'') userName,IFNULL(u.phone,'') userPhone,i.insertTime,
        i.money money,
        i.type incomeType
        FROM t_income i LEFT JOIN (
        SELECT id,orderNum,2 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_taxi WHERE state>=7 AND 10>=state
        UNION ALL
        SELECT id,orderNum,1 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_private_car WHERE state>=7 AND 10>=state
        UNION ALL
        SELECT id,orderNum,3 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_cross_city WHERE state>=7 AND 10>=state
        UNION ALL
        SELECT id,orderNum,type type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_logistics WHERE state=6
        ) o ON i.incomeId=o.id AND i.orderType=o.type
        LEFT JOIN t_driver d ON d.id=o.driverId
        LEFT JOIN t_user u ON o.userId=u.id
        <where>
            1=1  and i.userType=1 and i.objectId=#{companyId} AND i.type!=5
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (i.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="phone != null and phone != ''">
                and d.phone  LIKE CONCAT('%',#{phone},'%')
            </if>
            <if test="name != null and name != ''">
                and d.name  LIKE CONCAT('%',#{name},'%')
            </if>
            <if test="type != null and type != ''">
                and o.type=#{type}
            </if>
            <if test="state!=null and state!='' and state==1">
                and payState='未支付'
            </if>
            <if test="state!=null and state!='' and state==2">
                and payState='已支付'
            </if>
            <if test="null != income">
                and i.type = #{income}
            </if>
        </where>
        order by i.insertTime desc
    </select>
    <select id="getIncomeOrderSumMoney" resultType="map">
        SELECT sum(o.orderMoney) orderMoney,sum(i.money) money,sum(o.payMoney) payMoney,sum(o.couponMoney) couponMoney,sum(o.discountAmount) discountAmount,sum(o.redPacketMoney) redPacketMoney,
        (SELECT SUM(amount) FROM t_order_additional_fee WHERE orderType = o.type and orderId = o.id) as additionalFee
        FROM t_income i LEFT JOIN (
        SELECT id,insertTime,orderNum,2 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_taxi WHERE state>=7 AND 10>=state
        UNION ALL
        SELECT id,insertTime,orderNum,1 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_private_car WHERE state>=7 AND 10>=state
        UNION ALL
        SELECT id,insertTime,orderNum,3 type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,0 tipMoney,IFNULL(holidayFee,0) holidayFee,0 timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_cross_city WHERE state>=7 AND 10>=state
        UNION ALL
        SELECT id,insertTime,orderNum,type type,payType,CASE WHEN payType=1 THEN '微信' WHEN payType=2 THEN '支付宝' WHEN payType=3 THEN '其他' ELSE '' END payTypeName,driverId,userId,orderMoney,tipMoney,IFNULL(holidayFee,0) holidayFee,timeOutMoney,IFNULL(couponMoney,0)+IFNULL(discountMoney,0) as couponMoney, IFNULL(discountAmount,0) discountAmount,IFNULL(thankYouFee,0) thankYouFee, IFNULL(redPacketMoney,0) as redPacketMoney, IFNULL(payMoney, 0) AS payMoney,CASE WHEN state=7 THEN '未支付' ELSE '已支付' END payState FROM t_order_logistics WHERE state=6
        ) o ON i.incomeId=o.id AND i.orderType=o.type
        LEFT JOIN t_driver d ON d.id=o.driverId
        LEFT JOIN t_user u ON o.userId=u.id
        <where>
            1=1 and i.userType=1 and i.objectId=#{companyId} AND i.type!=5
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (i.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="phone != null and phone != ''">
                and d.phone  LIKE CONCAT('%',#{phone},'%')
            </if>
            <if test="name != null and name != ''">
                and d.name  LIKE CONCAT('%',#{name},'%')
            </if>
            <if test="type != null and type != ''">
                and o.type=#{type}
            </if>
            <if test="state!=null and state!='' and state==1">
                and payState='未支付'
            </if>
            <if test="state!=null and state!='' and state==2">
                and payState='已支付'
            </if>
            <if test="null != income">
                and i.type = #{income}
            </if>
        </where>
        order by i.insertTime desc
    </select>
    <select id="queryOtherIncomeDetail" resultType="map">
        select * from (
            select
            a.id,
            1 as orderType,
            a.orderNum,
            b.nickName,
            b.phone,
            (select sum(amount) from t_order_additional_fee where orderType = 1 and orderId = a.id) as additionalFee,
            a.thankYouFee,
            DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime
            from t_order_private_car a
            left join t_user b on (a.userId = b.id)
            where a.state in (8, 9) and a.isDelete = 1 and a.pid is not null
            <if test="null != beginTime and '' != beginTime and null != endTime and '' != endTime">
                and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{beginTime} and #{endTime}
            </if>
            <if test="null != orderNo and '' != orderNo">
                and a.orderNum like CONCAT('%', #{orderNo}, '%')
            </if>
            <if test="null != name and '' != name">
                and b.nickName like CONCAT('%', #{name}, '%')
            </if>
            <if test="null != phone and '' != phone">
                and b.phone like CONCAT('%', #{phone}, '%')
            </if>
            union all
            select
            a.id,
            2 as orderType,
            a.orderNum,
            b.nickName,
            b.phone,
            (select sum(amount) from t_order_additional_fee where orderType = 2 and orderId = a.id) as additionalFee,
            a.thankYouFee,
            DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime
            from t_order_taxi a
            left join t_user b on (a.userId = b.id)
            where a.state in (8, 9) and a.isDelete = 1
            <if test="null != beginTime and '' != beginTime and null != endTime and '' != endTime">
                and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{beginTime} and #{endTime}
            </if>
            <if test="null != orderNo and '' != orderNo">
                and a.orderNum like CONCAT('%', #{orderNo}, '%')
            </if>
            <if test="null != name and '' != name">
                and b.nickName like CONCAT('%', #{name}, '%')
            </if>
            <if test="null != phone and '' != phone">
                and b.phone like CONCAT('%', #{phone}, '%')
            </if>
            union all
            select
            a.id,
            3 as orderType,
            a.orderNum,
            b.nickName,
            b.phone,
            (select sum(amount) from t_order_additional_fee where orderType = 2 and orderId = a.id) as additionalFee,
            a.thankYouFee,
            DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime
            from t_order_cross_city a
            left join t_user b on (a.userId = b.id)
            where a.state in (8, 9) and a.isDelete = 1
            <if test="null != beginTime and '' != beginTime and null != endTime and '' != endTime">
                and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{beginTime} and #{endTime}
            </if>
            <if test="null != orderNo and '' != orderNo">
                and a.orderNum like CONCAT('%', #{orderNo}, '%')
            </if>
            <if test="null != name and '' != name">
                and b.nickName like CONCAT('%', #{name}, '%')
            </if>
            <if test="null != phone and '' != phone">
                and b.phone like CONCAT('%', #{phone}, '%')
            </if>
            union all
            select
            a.id,
            type as orderType,
            a.orderNum,
            b.nickName,
            b.phone,
            (select sum(amount) from t_order_additional_fee where orderType = a.type and orderId = a.id) as additionalFee,
            a.thankYouFee,
            DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime
            from t_order_logistics a
            left join t_user b on (a.userId = b.id)
            where a.state in (6, 9) and a.isDelete = 1
            <if test="null != beginTime and '' != beginTime and null != endTime and '' != endTime">
                and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{beginTime} and #{endTime}
            </if>
            <if test="null != orderNo and '' != orderNo">
                and a.orderNum like CONCAT('%', #{orderNo}, '%')
            </if>
            <if test="null != name and '' != name">
                and b.nickName like CONCAT('%', #{name}, '%')
            </if>
            <if test="null != phone and '' != phone">
                and b.phone like CONCAT('%', #{phone}, '%')
            </if>
            union all
            select
            a.id,
            7 as orderType,
            a.orderNum,
            b.nickName,
            b.phone,
            (select sum(amount) from t_order_additional_fee where orderType = 7 and orderId = a.id) as additionalFee,
            a.thankYouFee,
            DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime
            from t_order_call a
            left join t_user b on (a.userId = b.id)
            where a.state in (8, 9) and a.isDelete = 1
            <if test="null != beginTime and '' != beginTime and null != endTime and '' != endTime">
                and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{beginTime} and #{endTime}
            </if>
            <if test="null != orderNo and '' != orderNo">
                and a.orderNum like CONCAT('%', #{orderNo}, '%')
            </if>
            <if test="null != name and '' != name">
                and b.nickName like CONCAT('%', #{name}, '%')
            </if>
            <if test="null != phone and '' != phone">
                and b.phone like CONCAT('%', #{phone}, '%')
            </if>
        ) as aa where (aa.additionalFee != 0 or aa.thankYouFee != 0) order by aa.insertTime desc
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml
@@ -47,109 +47,5 @@
        </where>
        order by o.id desc
    </select>
    <select id="getReportWithdrawalList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT
        case when pw.userType = 1 then uu.nickName when pw.userType = 2 then dd.`name` else '' end as userName,
        case when pw.userType = 1 then uu.phone when pw.userType = 2 then dd.phone else '' end as userPhone,
        pw.*
        FROM t_pub_withdrawal as pw
        LEFT JOIN t_user as uu on uu.id = pw.userId
        LEFT JOIN t_driver as dd on dd.id = pw.userId) as o
        <where>
            o.flag != 3 and userType=2 and state=2
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="userId != null and userId != ''">
                and find_in_set(userId, #{userId})
            </if>
        </where>
        order by o.id desc
    </select>
    <select id="getReportWithdrawalListEx" resultType="map">
        SELECT * FROM (SELECT
        case when pw.userType = 1 then uu.nickName when pw.userType = 2 then dd.`name` else '' end as userName,
        case when pw.userType = 1 then uu.phone when pw.userType = 2 then dd.phone else '' end as userPhone,
        pw.*
        FROM t_pub_withdrawal as pw
        LEFT JOIN t_user as uu on uu.id = pw.userId
        LEFT JOIN t_driver as dd on dd.id = pw.userId) as o
        <where>
            o.flag != 3 and userType=2 and state=2
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="userId != null and userId != ''">
                and find_in_set(userId, #{userId})
            </if>
        </where>
        order by o.id desc
    </select>
    <select id="getSumMoney" resultType="map">
        SELECT SUM(money) money,SUM(realGetMoney) realGetMoney FROM t_pub_withdrawal WHERE
        flag != 3 and userType=2 and state=2
        <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
            AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
        </if>
        <if test="userId != null and userId != ''">
            and find_in_set(userId, #{userId})
        </if>
    </select>
    <select id="orderWithdrawalDetailsList" resultType="map">
        select
        a.id,
        DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime,
        b.`name`,
        a.money,
        (a.balance - a.money) as balance,
        (a.money - a.realGetMoney) as poundage
        from t_pub_withdrawal a
        left join t_driver b on (a.userType = 2 and a.userId = b.id)
        where a.flag != 3 and a.state = 2 and a.userType = 2
        <if test="null != type">
            and a.type = #{type}
        </if>
        <if test="null != companyId">
            and b.companyId = #{companyId}
        </if>
        <if test="null != driverName and '' != driverName">
            and b.`name` like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and b.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and a.insertTime between #{startTime} and #{endTime}
        </if>
        order by a.insertTime desc
        <if test="null != offset and null != limit">
            limit #{offset}, #{limit}
        </if>
    </select>
    <select id="orderWithdrawalDetailsListCount" resultType="int">
        select
        count(1)
        from t_pub_withdrawal a
        left join t_driver b on (a.userType = 2 and a.userId = b.id)
        where a.flag != 3 and a.state = 2 and a.userType = 2
        <if test="null != type">
            and a.type = #{type}
        </if>
        <if test="null != companyId">
            and b.companyId = #{companyId}
        </if>
        <if test="null != driverName and '' != driverName">
            and b.`name` like CONCAT('%', #{driverName}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and b.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != startTime and '' != startTime and null != endTime and '' != endTime">
            and a.insertTime between #{startTime} and #{endTime}
        </if>
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml
@@ -29,7 +29,7 @@
        id, orderType, orderId, originalDriverId, originalCarId, insertTime, nowDriverId, nowCarId, money, payType, payTime, payOrder, state, reason, remark, completeTime
    </sql>
    <!--根据条件查询快车改派订单列表-->
    <!--根据条件查询专车改派订单列表-->
    <select id="getPrivateCarReassignOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
@@ -83,6 +83,42 @@
        order by o.id desc
    </select>
    <!--根据条件查询可被选择的专车司机列表-->
    <select id="getCanSelectPrivateCarDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT dd.*,c1.name as companyName,c2.name as franchiseeName from t_driver AS dd
        LEFT JOIN t_company as c1 on c1.id = dd.companyId
        LEFT JOIN t_company as c2 on c2.id = dd.franchiseeId
        LEFT JOIN (SELECT * from t_driver_service where type = 1) as ds on ds.driverId = dd.id
        <where>
            (dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
            <if test="name != null and name != ''">
                and dd.name LIKE CONCAT('%',#{name},'%')
            </if>
            <if test="phone != null and phone != ''">
                and dd.phone LIKE CONCAT('%',#{phone},'%')
            </if>
        </where>
        order by dd.id desc
    </select>
    <!--根据条件查询可被选择的专车司机列表-->
    <select id="getCanSelectSmallDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT dd.*,c1.name as companyName,c2.name as franchiseeName from t_driver AS dd
        LEFT JOIN t_company as c1 on c1.id = dd.companyId
        LEFT JOIN t_company as c2 on c2.id = dd.franchiseeId
        LEFT JOIN (SELECT * from t_driver_service where type = #{type}) as ds on ds.driverId = dd.id
        <where>
            (dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
            <if test="name != null and name != ''">
                and dd.name LIKE CONCAT('%',#{name},'%')
            </if>
            <if test="phone != null and phone != ''">
                and dd.phone LIKE CONCAT('%',#{phone},'%')
            </if>
        </where>
        order by dd.id desc
    </select>
    <!--根据条件查询跨城改派订单列表-->
@@ -194,101 +230,7 @@
        </where>
        order by o.id desc
    </select>
    <select id="getTaxiReassignOrderList" resultType="map">
        SELECT * FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
        CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
        CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
        CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
        dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
        CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
        opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
        LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
        LEFT JOIN t_order_taxi as opc on opc.id = rr.orderId
        LEFT JOIN t_user as uu1 on uu1.id = opc.userId
        LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
        LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
        LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
        LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
        LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
        <where>
            o.orderType = 2 and o.state != 6
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="originalDriverName != null and originalDriverName != ''">
                and o.originalDriverName  LIKE CONCAT('%',#{originalDriverName},'%')
            </if>
            <if test="originalDriverPhone != null and originalDriverPhone != ''">
                and o.originalDriverPhone  LIKE CONCAT('%',#{originalDriverPhone},'%')
            </if>
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="nowDriverName != null and nowDriverName != ''">
                and o.nowDriverName = #{nowDriverName}
            </if>
            <if test="nowDriverPhone != null and nowDriverPhone != ''">
                and o.nowDriverPhone  LIKE CONCAT('%',#{nowDriverPhone},'%')
            </if>
            <if test="orderState != null and orderState != ''">
                and o.orderState = #{orderState}
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
            <if test="roleType != null and roleType != '' and roleType == 2">
                and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
            </if>
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
        </where>
        order by o.id desc
    </select>
    <!--根据条件查询可被选择的快车司机列表-->
    <select id="getCanSelectPrivateCarDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        select
        a.*,
        h.name as companyName,
        i.name as franchiseeName
        from t_driver a
        left join t_driver_service b on (a.id = b.driverId)
        left join t_driver_orders c on (a.id = c.driverId)
        left join t_car d on (a.carId = d.id)
        left join t_company as h on (h.id = a.companyId)
        left join t_company as i on (i.id = a.franchiseeId)
        where a.authState = 2 and a.state != 1 and a.flag != 3 and if(a.franchiseeId is null or a.franchiseeId = 0, a.companyId = #{companyId}, a.franchiseeId = #{companyId})
        and a.id in (select driverId from t_driver_work where state = 1 and type like '%1%')
        and b.type = 1 and c.type = 1 and a.id != #{driverId}
        <if test="name != null and name != ''">
            and a.name LIKE CONCAT('%',#{name},'%')
        </if>
        <if test="phone != null and phone != ''">
            and a.phone LIKE CONCAT('%',#{phone},'%')
        </if>
        order by a.id desc
    </select>
    <!--根据条件查询可被选择的快车司机列表-->
    <select id="getCanSelectSmallDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT dd.*,c1.name as companyName,c2.name as franchiseeName from t_driver AS dd
        LEFT JOIN t_company as c1 on c1.id = dd.companyId
        LEFT JOIN t_company as c2 on c2.id = dd.franchiseeId
        LEFT JOIN (SELECT * from t_driver_service where type = #{type}) as ds on ds.driverId = dd.id
        <where>
            (dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
            <if test="name != null and name != ''">
                and dd.name LIKE CONCAT('%',#{name},'%')
            </if>
            <if test="phone != null and phone != ''">
                and dd.phone LIKE CONCAT('%',#{phone},'%')
            </if>
        </where>
        order by dd.id desc
    </select>
    <!--根据条件查询可被选择的跨城司机列表-->
    <select id="getCanSelectCrossDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
@@ -319,491 +261,4 @@
        order by a.id desc
    </select>
    <select id="getCanSelectTaxiCarDriverList" resultType="map">
        select
        a.*,
        h.name as companyName,
        i.name as franchiseeName
        from t_driver a
        left join t_driver_service b on (a.id = b.driverId)
        left join t_driver_orders c on (a.id = c.driverId)
        left join t_car d on (a.carId = d.id)
        left join t_company as h on (h.id = a.companyId)
        left join t_company as i on (i.id = a.franchiseeId)
        where a.authState = 2 and a.state != 1 and a.flag != 3 and if(a.franchiseeId is null or a.franchiseeId = 0, a.companyId = #{companyId}, a.franchiseeId = #{companyId})
        and a.id in (select driverId from t_driver_work where state = 1 and type like '%2%')
        and b.type = 2 and c.type = 2 and a.id != #{driverId}
        <if test="name != null and name != ''">
            and a.name LIKE CONCAT('%',#{name},'%')
        </if>
        <if test="phone != null and phone != ''">
            and a.phone LIKE CONCAT('%',#{phone},'%')
        </if>
        order by a.id desc
    </select>
    <!--根据条件查询快车改派订单列表-->
    <select id="getPrivateCarReassignOrderListEx" resultType="map">
        SELECT * FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
        CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
        CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
        CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
        dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
        CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
        opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
        LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
        LEFT JOIN t_order_private_car as opc on opc.id = rr.orderId
        LEFT JOIN t_user as uu1 on uu1.id = opc.userId
        LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
        LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
        LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
        LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
        LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
        <where>
            o.orderType = 1 and o.state != 6
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="originalDriverName != null and originalDriverName != ''">
                and o.originalDriverName  LIKE CONCAT('%',#{originalDriverName},'%')
            </if>
            <if test="originalDriverPhone != null and originalDriverPhone != ''">
                and o.originalDriverPhone  LIKE CONCAT('%',#{originalDriverPhone},'%')
            </if>
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="nowDriverName != null and nowDriverName != ''">
                and o.nowDriverName = #{nowDriverName}
            </if>
            <if test="nowDriverPhone != null and nowDriverPhone != ''">
                and o.nowDriverPhone  LIKE CONCAT('%',#{nowDriverPhone},'%')
            </if>
            <if test="orderState != null and orderState != ''">
                and o.orderState = #{orderState}
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
            <if test="roleType != null and roleType != '' and roleType == 2">
                and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
            </if>
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
        </where>
        order by o.id desc
    </select>
    <!--根据条件查询跨城改派订单列表-->
    <select id="getCrossReassignOrderListEx" resultType="map">
        SELECT * FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
        CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
        CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
        CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
        dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
        CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
        opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
        LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
        LEFT JOIN t_order_cross_city as opc on opc.id = rr.orderId
        LEFT JOIN t_user as uu1 on uu1.id = opc.userId
        LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
        LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
        LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
        LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
        LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
        <where>
            o.orderType = 3 and o.state != 6
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="originalDriverName != null and originalDriverName != ''">
                and o.originalDriverName  LIKE CONCAT('%',#{originalDriverName},'%')
            </if>
            <if test="originalDriverPhone != null and originalDriverPhone != ''">
                and o.originalDriverPhone  LIKE CONCAT('%',#{originalDriverPhone},'%')
            </if>
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="nowDriverName != null and nowDriverName != ''">
                and o.nowDriverName = #{nowDriverName}
            </if>
            <if test="nowDriverPhone != null and nowDriverPhone != ''">
                and o.nowDriverPhone  LIKE CONCAT('%',#{nowDriverPhone},'%')
            </if>
            <if test="orderState != null and orderState != ''">
                and o.orderState = #{orderState}
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
            <if test="roleType != null and roleType != '' and roleType == 2">
                and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
            </if>
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
        </where>
        order by o.id desc
    </select>
    <!--根据条件查询跨城改派订单列表-->
    <select id="getSmallPieceLogisticsListEx" resultType="map">
        SELECT * FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
        CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
        CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
        CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
        dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
        CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
        opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
        LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
        LEFT JOIN t_order_logistics as opc on opc.id = rr.orderId
        LEFT JOIN t_user as uu1 on uu1.id = opc.userId
        LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
        LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
        LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
        LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
        LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
        <where>
            o.orderType in (4, 5) and o.state != 6
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="originalDriverName != null and originalDriverName != ''">
                and o.originalDriverName  LIKE CONCAT('%',#{originalDriverName},'%')
            </if>
            <if test="originalDriverPhone != null and originalDriverPhone != ''">
                and o.originalDriverPhone  LIKE CONCAT('%',#{originalDriverPhone},'%')
            </if>
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="nowDriverName != null and nowDriverName != ''">
                and o.nowDriverName = #{nowDriverName}
            </if>
            <if test="nowDriverPhone != null and nowDriverPhone != ''">
                and o.nowDriverPhone  LIKE CONCAT('%',#{nowDriverPhone},'%')
            </if>
            <if test="orderState != null and orderState != ''">
                and o.orderState = #{orderState}
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
            <if test="roleType != null and roleType != '' and roleType == 2">
                and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
            </if>
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
        </where>
        order by o.id desc
    </select>
    <select id="getTaxiReassignOrderListEx" resultType="map">
        SELECT * FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
        CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
        CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
        CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
        dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
        CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
        opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
        LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
        LEFT JOIN t_order_taxi as opc on opc.id = rr.orderId
        LEFT JOIN t_user as uu1 on uu1.id = opc.userId
        LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
        LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
        LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
        LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
        LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
        <where>
            o.orderType = 2 and o.state != 6
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="originalDriverName != null and originalDriverName != ''">
                and o.originalDriverName  LIKE CONCAT('%',#{originalDriverName},'%')
            </if>
            <if test="originalDriverPhone != null and originalDriverPhone != ''">
                and o.originalDriverPhone  LIKE CONCAT('%',#{originalDriverPhone},'%')
            </if>
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="nowDriverName != null and nowDriverName != ''">
                and o.nowDriverName = #{nowDriverName}
            </if>
            <if test="nowDriverPhone != null and nowDriverPhone != ''">
                and o.nowDriverPhone  LIKE CONCAT('%',#{nowDriverPhone},'%')
            </if>
            <if test="orderState != null and orderState != ''">
                and o.orderState = #{orderState}
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
            <if test="roleType != null and roleType != '' and roleType == 2">
                and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
            </if>
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
        </where>
        order by o.id desc
    </select>
    <!--根据条件查询快车改派订单列表-->
    <select id="getPrivateCarReassignOrderListMoney" resultType="java.lang.Double">
        SELECT sum(money) FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
        CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
        CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
        CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
        dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
        CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
        opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
        LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
        LEFT JOIN t_order_private_car as opc on opc.id = rr.orderId
        LEFT JOIN t_user as uu1 on uu1.id = opc.userId
        LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
        LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
        LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
        LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
        LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
        <where>
            o.orderType = 1 and o.state != 6
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="originalDriverName != null and originalDriverName != ''">
                and o.originalDriverName  LIKE CONCAT('%',#{originalDriverName},'%')
            </if>
            <if test="originalDriverPhone != null and originalDriverPhone != ''">
                and o.originalDriverPhone  LIKE CONCAT('%',#{originalDriverPhone},'%')
            </if>
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="nowDriverName != null and nowDriverName != ''">
                and o.nowDriverName = #{nowDriverName}
            </if>
            <if test="nowDriverPhone != null and nowDriverPhone != ''">
                and o.nowDriverPhone  LIKE CONCAT('%',#{nowDriverPhone},'%')
            </if>
            <if test="orderState != null and orderState != ''">
                and o.orderState = #{orderState}
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
            <if test="roleType != null and roleType != '' and roleType == 2">
                and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
            </if>
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
        </where>
        order by o.id desc
    </select>
    <!--根据条件查询跨城改派订单列表-->
    <select id="getCrossReassignOrderListMoney" resultType="java.lang.Double">
        SELECT sum(money) FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
        CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
        CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
        CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
        dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
        CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
        opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
        LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
        LEFT JOIN t_order_cross_city as opc on opc.id = rr.orderId
        LEFT JOIN t_user as uu1 on uu1.id = opc.userId
        LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
        LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
        LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
        LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
        LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
        <where>
            o.orderType = 3 and o.state != 6
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="originalDriverName != null and originalDriverName != ''">
                and o.originalDriverName  LIKE CONCAT('%',#{originalDriverName},'%')
            </if>
            <if test="originalDriverPhone != null and originalDriverPhone != ''">
                and o.originalDriverPhone  LIKE CONCAT('%',#{originalDriverPhone},'%')
            </if>
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="nowDriverName != null and nowDriverName != ''">
                and o.nowDriverName = #{nowDriverName}
            </if>
            <if test="nowDriverPhone != null and nowDriverPhone != ''">
                and o.nowDriverPhone  LIKE CONCAT('%',#{nowDriverPhone},'%')
            </if>
            <if test="orderState != null and orderState != ''">
                and o.orderState = #{orderState}
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
            <if test="roleType != null and roleType != '' and roleType == 2">
                and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
            </if>
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
        </where>
        order by o.id desc
    </select>
    <!--根据条件查询跨城改派订单列表-->
    <select id="getSmallPieceLogisticsListMoney" resultType="java.lang.Double">
        SELECT sum(money) FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
        CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
        CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
        CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
        dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
        CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
        opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
        LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
        LEFT JOIN t_order_logistics as opc on opc.id = rr.orderId
        LEFT JOIN t_user as uu1 on uu1.id = opc.userId
        LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
        LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
        LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
        LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
        LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
        <where>
            o.orderType in (4, 5) and o.state != 6
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="originalDriverName != null and originalDriverName != ''">
                and o.originalDriverName  LIKE CONCAT('%',#{originalDriverName},'%')
            </if>
            <if test="originalDriverPhone != null and originalDriverPhone != ''">
                and o.originalDriverPhone  LIKE CONCAT('%',#{originalDriverPhone},'%')
            </if>
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="nowDriverName != null and nowDriverName != ''">
                and o.nowDriverName = #{nowDriverName}
            </if>
            <if test="nowDriverPhone != null and nowDriverPhone != ''">
                and o.nowDriverPhone  LIKE CONCAT('%',#{nowDriverPhone},'%')
            </if>
            <if test="orderState != null and orderState != ''">
                and o.orderState = #{orderState}
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
            <if test="roleType != null and roleType != '' and roleType == 2">
                and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
            </if>
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
        </where>
        order by o.id desc
    </select>
    <select id="getTaxiReassignOrderListMoney" resultType="java.lang.Double">
        SELECT sum(money) FROM (SELECT rr.id,rr.insertTime,
        dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
        CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
        CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
        CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
        dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
        CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
        opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
        LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
        LEFT JOIN t_order_taxi as opc on opc.id = rr.orderId
        LEFT JOIN t_user as uu1 on uu1.id = opc.userId
        LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
        LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
        LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
        LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
        LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
        <where>
            o.orderType = 2 and o.state != 6
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="originalDriverName != null and originalDriverName != ''">
                and o.originalDriverName  LIKE CONCAT('%',#{originalDriverName},'%')
            </if>
            <if test="originalDriverPhone != null and originalDriverPhone != ''">
                and o.originalDriverPhone  LIKE CONCAT('%',#{originalDriverPhone},'%')
            </if>
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="nowDriverName != null and nowDriverName != ''">
                and o.nowDriverName = #{nowDriverName}
            </if>
            <if test="nowDriverPhone != null and nowDriverPhone != ''">
                and o.nowDriverPhone  LIKE CONCAT('%',#{nowDriverPhone},'%')
            </if>
            <if test="orderState != null and orderState != ''">
                and o.orderState = #{orderState}
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
            <if test="roleType != null and roleType != '' and roleType == 2">
                and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
            </if>
            <if test="roleType != null and roleType != '' and roleType == 3">
                and o.companyId = #{nowUserId}
            </if>
        </where>
        order by o.id desc
    </select>
</mapper>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml
@@ -28,7 +28,7 @@
        LEFT JOIN sys_user as uu on uu.id = ss.insertUserId
        LEFT JOIN (SELECT COUNT(a.id) as num,siteId FROM t_line_site a left join t_line b on (a.lineId = b.id) where b.state != 3 GROUP BY a.siteId) as ls on ls.siteId = ss.id) as o
        <where>
            o.state != 3 and o.type = #{type}
            o.state != 3
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysTimeoutMoneyMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysWithdrawalPoundageMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml
@@ -9,21 +9,8 @@
        <result column="companyId" property="companyId" />
        <result column="serverCarModelId" property="serverCarModelId" />
        <result column="content" property="content" />
        <result column="fareTypeNote1" property="fareTypeNote1"/>
        <result column="fareTypeNote2" property="fareTypeNote2"/>
        <result column="fareTypeNote3" property="fareTypeNote3"/>
        <result column="fareTypeNote" property="fareTypeNote"/>
        <result column="state" property="state"/>
        <result column="contentPutOne" property="contentPutOne"/>
        <result column="contentNotOne" property="contentNotOne"/>
        <result column="contentPutTwo" property="contentPutTwo"/>
        <result column="contentNotTwo" property="contentNotTwo"/>
        <result column="contentPutThree" property="contentPutThree"/>
        <result column="contentNotThree" property="contentNotThree"/>
        <result column="contentExclusive" property="contentExclusive"/>
        <result column="contentPrice" property="contentPrice"/>
        <result column="isOpen" property="isOpen"/>
        <result column="isOpenExclusive" property="isOpenExclusive"/>
        <result column="isOpenPrice" property="isOpenPrice"/>
    </resultMap>
    <!-- 通用查询结果列 -->
@@ -31,7 +18,7 @@
        id, type, companyId, serverCarModelId, content
    </sql>
    <!--查询快车价格设置-->
    <!--查询专车价格设置-->
    <select id="getSpecialPriceList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT sp.id,sp.type,sp.companyId,sc.`name`,sc.img,sp.state from t_system_price as sp
        LEFT JOIN t_server_carmodel as sc on sc.id = sp.serverCarModelId) as o
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TTaxiCardMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TTaxiCardPaymentMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TTimeoutAppealMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
@@ -70,55 +70,6 @@
            and c.state=#{state}
        </if>
    </select>
    <select id="getListt" resultType="map">
        SELECT
        c.id,
        c.money,
        c.fullMoney,
        c.expirationTime,
        c.insertTime,
        c.companyId,
        c.state,
        c.couponUseType,
        c.couponType,
        c.userId,
        c.couponId,
        c.couponActivityId,
        c.activityType,
        u.nickName,
        u.phone,
        if(a.id is null, if(b.id is null, if(d.id is null, if(e.id is null, '', e.endServiceTime), d.endServiceTime), b.endServiceTime), a.endServiceTime) as useTime
        FROM
        t_user_coupon_record c
        LEFT JOIN t_user u ON c.userId = u.id
        left join t_order_private_car a on (a.couponId = c.id)
        left join t_order_taxi b on (b.couponId = c.id)
        left join t_order_cross_city d on (d.couponId = c.id)
        left join t_order_logistics e on (e.couponId = c.id)
        WHERE 1=1
        <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
            and (c.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
        </if>
        <if test="userName != null and userName !=''">
            and u.nickName like CONCAT('%',#{userName},'%')
        </if>
        <if test="activityType != null and activityType !=''">
            and c.activityType=#{activityType}
        </if>
        <if test="userPhone != null and userPhone !=''">
            and u.phone like CONCAT('%',#{userPhone},'%')
        </if>
        <if test="couponActivityId != null and couponActivityId !=''">
            and c.couponActivityId=#{couponActivityId}
        </if>
        <if test="state != null and state !=''">
            and c.state=#{state}
        </if>
    </select>
    <select  id="getRedList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT
            c.id,
@@ -156,47 +107,6 @@
            and c.state=#{state}
        </if>
    </select>
    <select  id="getRedListt" resultType="map">
        SELECT
        c.id,
        c.money,
        c.expirationTime,
        c.insertTime,
        c.companyId,
        c.state,
        c.userId,
        c.redPacketActivityId,
        u.nickName,
        u.phone,
        if(a.id is null, if(b.id is null, if(d.id is null, if(e.id is null, '', e.endServiceTime), d.endServiceTime), b.endServiceTime), a.endServiceTime) as useTime
        FROM
        t_user_red_packet_record c
        LEFT JOIN t_user u ON c.userId = u.id
        left join t_order_private_car a on (a.redPacketId = c.id)
        left join t_order_taxi b on (b.redPacketId = c.id)
        left join t_order_cross_city d on (d.redPacketId = c.id)
        left join t_order_logistics e on (e.redPacketId = c.id)
        WHERE 1=1
        <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
            and (c.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
        </if>
        <if test="userName != null and userName !=''">
            and u.nickName like CONCAT('%',#{userName},'%')
        </if>
        <if test="userPhone != null and userPhone !=''">
            and u.phone like CONCAT('%',#{userPhone},'%')
        </if>
        <if test="couponActivityId != null and couponActivityId !=''">
            and c.redPacketActivityId=#{couponActivityId}
        </if>
        <if test="state != null and state !=''">
            and c.state=#{state}
        </if>
    </select>
    <select id="getCouponStatic" resultType="map">
        SELECT
            IFNULL(SUM(money), 0) money,
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
@@ -8,6 +8,7 @@
        <result column="avatar" property="avatar" />
        <result column="account" property="account" />
        <result column="password" property="password" />
        <result column="passWordUpdate" property="passWordUpdate"/>
        <result column="salt" property="salt" />
        <result column="name" property="name" />
        <result column="birthday" property="birthday" />
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMerchantCouponMapper.xml
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarRental.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ComplaintDeductmoney.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
@@ -31,7 +31,7 @@
     */
    private Integer driverActivityId;
    /**
     * 1=快车,2=出租车,3=城际
     * 1=专车,2=出租车,3=城际
     */
    private Integer type;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/MerchantActivity.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/MerchantActivitySlave.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/MerchantCoupon.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/MessNum.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
@@ -24,7 +24,7 @@
    @TableField("orderId")
    private Integer orderId;
    /**
     * 订单类型(1=快车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     */
    @TableField("orderType")
    private Integer orderType;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Recruit.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SellingCar.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ShowModular.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SpellOrderRule.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponActivity.java
@@ -40,7 +40,7 @@
     */
    private Integer companyId;
    /**
     * 优惠券使用类型(0=通用,1=快车,2=出租车,3=城际,4=小件物流)
     * 优惠券使用类型(0=通用,1=专车,2=出租车,3=城际,4=小件物流)
     */
    private Integer couponUseType;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java
@@ -40,7 +40,7 @@
     */
    private Integer companyId;
    /**
     * 优惠券使用类型(0=通用,1=快车,2=出租车,3=城际,4=小件物流)
     * 优惠券使用类型(0=通用,1=专车,2=出租车,3=城际,4=小件物流)
     */
    private Integer couponUseType;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAdditionalFee.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TBalanceModifyRecord.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java
@@ -29,7 +29,7 @@
     */
    private Integer carId;
    /**
     * 类型(1=快车,2=出租车,3=城际(跨城出行),4=小件物流-同城,5=小件物流-跨城,6=包车)
     * 类型(1=专车,2=出租车,3=城际(跨城出行),4=小件物流-同城,5=小件物流-跨城,6=包车)
     */
    private Integer type;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
@@ -29,7 +29,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 是否经营快车(1=是,2=否)
     * 是否经营专车(1=是,2=否)
     */
    private Integer isSpe;
    /**
@@ -53,7 +53,7 @@
     */
    private Integer isCharter;
    /**
     * 快车提成方式(1=比例,2=固定)
     * 专车提成方式(1=比例,2=固定)
     */
    private Integer isSpeFixedOrProportional;
    /**
@@ -69,7 +69,7 @@
     */
    private Integer isSameLogisticsFixedOrProportional;
    /**
     * 快车提成数值
     * 专车提成数值
     */
    private BigDecimal speMoney;
    /**
@@ -241,66 +241,6 @@
    private String idCardPositive;
    //身份证反面
    private String idCardReverse;
    //节假费
    private BigDecimal holidayFee;
    /**
     * 是否经营95128电召(1=是,2=否)
     */
    private Integer isOnCall;
    /**
     * 95128电召提成数值
     */
    private BigDecimal onCallMoney;
    /**
     * 95128电召提成方式(1=比例,2=固定)
     */
    private Integer isOnCallFixedOrProportional;
    /**
     * 规模
     * @return
     */
    private String scale;
    /**
     * 公司信息
     * @return
     */
    private String companyInfo;
    public Integer getIsOnCall() {
        return isOnCall;
    }
    public void setIsOnCall(Integer isOnCall) {
        this.isOnCall = isOnCall;
    }
    public BigDecimal getOnCallMoney() {
        return onCallMoney;
    }
    public void setOnCallMoney(BigDecimal onCallMoney) {
        this.onCallMoney = onCallMoney;
    }
    public Integer getIsOnCallFixedOrProportional() {
        return isOnCallFixedOrProportional;
    }
    public void setIsOnCallFixedOrProportional(Integer isOnCallFixedOrProportional) {
        this.isOnCallFixedOrProportional = isOnCallFixedOrProportional;
    }
    public BigDecimal getHolidayFee() {
        return holidayFee;
    }
    public void setHolidayFee(BigDecimal holidayFee) {
        this.holidayFee = holidayFee;
    }
    public String getIdCardPositive() {
        return idCardPositive;
@@ -732,22 +672,6 @@
    public void setDetailAddress(String detailAddress) {
        this.detailAddress = detailAddress;
    }
    public String getScale() {
        return scale;
    }
    public void setScale(String scale) {
        this.scale = scale;
    }
    public String getCompanyInfo() {
        return companyInfo;
    }
    public void setCompanyInfo(String companyInfo) {
        this.companyInfo = companyInfo;
    }
    @Override
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -234,6 +234,11 @@
     */
    private Integer carId;
    /**
     * 柳州银行收款商户号
     */
    @TableField("mchtNo")
    private String mchtNo;
    /**
     * 状态(1=待审核,2=正常,3=冻结,4=拒绝)
     */
    private Integer authState;
@@ -276,26 +281,6 @@
     * 添加司机的分公司/加盟商ID
     */
    private Integer addObjectId;
    private Double activityMoney;
    private Double laveActivityMoney;
    public Double getActivityMoney() {
        return activityMoney;
    }
    public void setActivityMoney(Double activityMoney) {
        this.activityMoney = activityMoney;
    }
    public Double getLaveActivityMoney() {
        return laveActivityMoney;
    }
    public void setLaveActivityMoney(Double laveActivityMoney) {
        this.laveActivityMoney = laveActivityMoney;
    }
    public BigDecimal getBalance() {
        return balance;
@@ -817,6 +802,14 @@
        this.businessMoney = businessMoney;
    }
    public String getMchtNo() {
        return mchtNo;
    }
    public void setMchtNo(String mchtNo) {
        this.mchtNo = mchtNo;
    }
    @Override
    protected Serializable pkVal() {
        return this.id;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java
@@ -29,7 +29,7 @@
     */
    private Integer driverId;
    /**
     * 类型(1=快车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     * 类型(1=专车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     */
    private Integer type;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java
@@ -50,19 +50,6 @@
     */
    private Integer insertUserId;
    /**
     * 类型 1景区 2机场
     */
    private Integer type;
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Integer getInsertUserId() {
        return insertUserId;
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TMerchant.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TMerchantActivity.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOfflineTravelPayment.java
New file
@@ -0,0 +1,164 @@
package com.stylefeng.guns.modular.system.model;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
/**
 * <p>
 *
 * </p>
 *
 * @author stylefeng
 * @since 2023-04-14
 */
@TableName("t_offline_travel_payment")
public class TOfflineTravelPayment extends Model<TOfflineTravelPayment> {
    private static final long serialVersionUID = 1L;
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 下单唯一标识
     */
    private String orderId;
    /**
     * 支付方式(1=微信,2=支付宝)
     */
    private Integer payType;
    /**
     * 支付金额
     */
    private Double payMoney;
    /**
     * 支付时间
     */
    private Date payTime;
    /**
     * 支付流水号
     */
    private String payNumber;
    /**
     * 服务司机id
     */
    private Integer driverId;
    /**
     * 状态(1=待支付,2=已支付)
     */
    private Integer status;
    /**
     * 添加时间
     */
    private Date insertTime;
    @TableField(exist = false)
    private String driverName;
    public String getDriverName() {
        return driverName;
    }
    public void setDriverName(String driverName) {
        this.driverName = driverName;
    }
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public String getOrderId() {
        return orderId;
    }
    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }
    public Integer getPayType() {
        return payType;
    }
    public void setPayType(Integer payType) {
        this.payType = payType;
    }
    public Double getPayMoney() {
        return payMoney;
    }
    public void setPayMoney(Double payMoney) {
        this.payMoney = payMoney;
    }
    public Date getPayTime() {
        return payTime;
    }
    public void setPayTime(Date payTime) {
        this.payTime = payTime;
    }
    public String getPayNumber() {
        return payNumber;
    }
    public void setPayNumber(String payNumber) {
        this.payNumber = payNumber;
    }
    public Integer getDriverId() {
        return driverId;
    }
    public void setDriverId(Integer driverId) {
        this.driverId = driverId;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public Date getInsertTime() {
        return insertTime;
    }
    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }
    @Override
    protected Serializable pkVal() {
        return this.id;
    }
    @Override
    public String toString() {
        return "TOfflineTravelPayment{" +
        "id=" + id +
        ", orderId=" + orderId +
        ", payType=" + payType +
        ", payMoney=" + payMoney +
        ", payTime=" + payTime +
        ", payNumber=" + payNumber +
        ", driverId=" + driverId +
        ", status=" + status +
        ", insertTime=" + insertTime +
        "}";
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java
@@ -30,7 +30,7 @@
     */
    private Integer openCityId;
    /**
     * 业务类型(1=快车,2=出租车,3=跨城出行,4=同城小件物流,5=跨城小件物流,6=包车)
     * 业务类型(1=专车,2=出租车,3=跨城出行,4=同城小件物流,5=跨城小件物流,6=包车)
     */
    private Integer businessType;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderAdditionalFee.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCall.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java
@@ -32,10 +32,6 @@
     */
    private Integer userId;
    /**
     * 服务车型
     */
    private Integer serverCarModelId;
    /**
     * 接单司机ID
     */
    private Integer driverId;
@@ -44,13 +40,18 @@
     */
    private Integer lineId;
    /**
     * 预约班次数据id
     * 预约班次的id
     */
    @TableField("lineShiftDriverId")
    private Integer lineShiftDriverId;
    /**
     * 车辆id
     */
    private Integer carId;
    /**
     * 服务车型id关联t_server_carmodel表
     */
    private Integer serverCarModelId;
    /**
     * 订单号
     */
@@ -136,10 +137,6 @@
     */
    private Integer payType;
    /**
     * 节假费
     */
    private BigDecimal holidayFee;
    /**
     * 订单金额
     */
    private BigDecimal orderMoney;
@@ -172,18 +169,6 @@
     */
    private Integer activityId;
    /**
     * 打车卡id
     */
    private Integer taxiCardId;
    /**
     * 打车卡记录id
     */
    private Integer userTaxiCardId;
    /**
     * 优惠金额
     */
    private Double discountAmount;
    /**
     * 公司id
     */
    private Integer companyId;
@@ -192,9 +177,15 @@
     */
    private BigDecimal payMoney;
    /**
     * 感谢费
     * 出行人数
     */
    private BigDecimal thankYouFee;
    @TableField("peopleNumber")
    private Integer peopleNumber;
    /**
     * 座位编号
     */
    @TableField("seatNumber")
    private String seatNumber;
    /**
     * 乘车人
     */
@@ -204,21 +195,9 @@
     */
    private String passengersPhone;
    /**
     * 出行人数
     */
    private Integer peopleNumber;
    /**
     * 座位编号
     */
    private String seatNumber;
    /**
     * 排序(订单为拼车时的排序-不是所有订单的排序)
     * 排序
     */
    private Integer sort;
    /**
     * 状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中,12=取消待支付)
     */
    private Integer state;
    /**
     * 下单时间
     */
@@ -256,25 +235,21 @@
     */
    private Integer orderSource;
    /**
     * 备注
     */
    private String remark;
    /**
     * 发票id
     */
    private Integer invoiceId;
    /**
     * 是否是改派单(1=否,2=是)
     */
    private Integer isReassign;
    /**
     * 改派通知(0=没有改派,1=改派中,2=已改派)
     */
    private Integer reassignNotice;
    /**
     * 高德猎鹰上的轨迹id
     */
    private String trackId;
    /**
     * 状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中,12=取消待支付)
     */
    private Integer state;
    /**
     * 是否是改派订单(1=否,2=是)
     */
    private Integer isReassign;
    /**
     * 是否删除  1=否 2=是
     */
@@ -291,11 +266,14 @@
     * 移动小号绑定关系id
     */
    private String bindId;
    /**
     * 工行支付下单订单号
     */
    private String payOrderId;
    public Integer getOldState() {
        return oldState;
    }
    public void setOldState(Integer oldState) {
        this.oldState = oldState;
    }
    public Integer getId() {
        return id;
@@ -311,14 +289,6 @@
    public void setUserId(Integer userId) {
        this.userId = userId;
    }
    public Integer getServerCarModelId() {
        return serverCarModelId;
    }
    public void setServerCarModelId(Integer serverCarModelId) {
        this.serverCarModelId = serverCarModelId;
    }
    public Integer getDriverId() {
@@ -351,6 +321,14 @@
    public void setCarId(Integer carId) {
        this.carId = carId;
    }
    public Integer getServerCarModelId() {
        return serverCarModelId;
    }
    public void setServerCarModelId(Integer serverCarModelId) {
        this.serverCarModelId = serverCarModelId;
    }
    public String getOrderNum() {
@@ -521,14 +499,6 @@
        this.payType = payType;
    }
    public BigDecimal getHolidayFee() {
        return holidayFee;
    }
    public void setHolidayFee(BigDecimal holidayFee) {
        this.holidayFee = holidayFee;
    }
    public BigDecimal getOrderMoney() {
        return orderMoney;
    }
@@ -593,30 +563,6 @@
        this.activityId = activityId;
    }
    public Integer getTaxiCardId() {
        return taxiCardId;
    }
    public void setTaxiCardId(Integer taxiCardId) {
        this.taxiCardId = taxiCardId;
    }
    public Integer getUserTaxiCardId() {
        return userTaxiCardId;
    }
    public void setUserTaxiCardId(Integer userTaxiCardId) {
        this.userTaxiCardId = userTaxiCardId;
    }
    public Double getDiscountAmount() {
        return discountAmount;
    }
    public void setDiscountAmount(Double discountAmount) {
        this.discountAmount = discountAmount;
    }
    public Integer getCompanyId() {
        return companyId;
    }
@@ -631,14 +577,6 @@
    public void setPayMoney(BigDecimal payMoney) {
        this.payMoney = payMoney;
    }
    public BigDecimal getThankYouFee() {
        return thankYouFee;
    }
    public void setThankYouFee(BigDecimal thankYouFee) {
        this.thankYouFee = thankYouFee;
    }
    public String getPassengers() {
@@ -657,36 +595,12 @@
        this.passengersPhone = passengersPhone;
    }
    public Integer getPeopleNumber() {
        return peopleNumber;
    }
    public void setPeopleNumber(Integer peopleNumber) {
        this.peopleNumber = peopleNumber;
    }
    public String getSeatNumber() {
        return seatNumber;
    }
    public void setSeatNumber(String seatNumber) {
        this.seatNumber = seatNumber;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public Integer getState() {
        return state;
    }
    public void setState(Integer state) {
        this.state = state;
    }
    public Date getInsertTime() {
@@ -761,36 +675,12 @@
        this.orderSource = orderSource;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public Integer getInvoiceId() {
        return invoiceId;
    }
    public void setInvoiceId(Integer invoiceId) {
        this.invoiceId = invoiceId;
    }
    public Integer getIsReassign() {
        return isReassign;
    }
    public void setIsReassign(Integer isReassign) {
        this.isReassign = isReassign;
    }
    public Integer getReassignNotice() {
        return reassignNotice;
    }
    public void setReassignNotice(Integer reassignNotice) {
        this.reassignNotice = reassignNotice;
    }
    public String getTrackId() {
@@ -801,20 +691,20 @@
        this.trackId = trackId;
    }
    public Integer getState() {
        return state;
    }
    public void setState(Integer state) {
        this.state = state;
    }
    public Integer getIsDelete() {
        return isDelete;
    }
    public void setIsDelete(Integer isDelete) {
        this.isDelete = isDelete;
    }
    public Integer getOldState() {
        return oldState;
    }
    public void setOldState(Integer oldState) {
        this.oldState = oldState;
    }
    public String getTelX() {
@@ -833,12 +723,28 @@
        this.bindId = bindId;
    }
    public String getPayOrderId() {
        return payOrderId;
    public Integer getIsReassign() {
        return isReassign;
    }
    public void setPayOrderId(String payOrderId) {
        this.payOrderId = payOrderId;
    public void setIsReassign(Integer isReassign) {
        this.isReassign = isReassign;
    }
    public Integer getPeopleNumber() {
        return peopleNumber;
    }
    public void setPeopleNumber(Integer peopleNumber) {
        this.peopleNumber = peopleNumber;
    }
    public String getSeatNumber() {
        return seatNumber;
    }
    public void setSeatNumber(String seatNumber) {
        this.seatNumber = seatNumber;
    }
    @Override
@@ -851,33 +757,32 @@
        return "TOrderCrossCity{" +
                "id=" + id +
                ", userId=" + userId +
                ", serverCarModelId=" + serverCarModelId +
                ", driverId=" + driverId +
                ", lineId=" + lineId +
                ", lineShiftDriverId=" + lineShiftDriverId +
                ", carId=" + carId +
                ", orderNum=" + orderNum +
                ", serverCarModelId=" + serverCarModelId +
                ", orderNum='" + orderNum + '\'' +
                ", placementLon=" + placementLon +
                ", placementLat=" + placementLat +
                ", placementAddress=" + placementAddress +
                ", placementAddress='" + placementAddress + '\'' +
                ", startLon=" + startLon +
                ", startLat=" + startLat +
                ", endLon=" + endLon +
                ", startAddress=" + startAddress +
                ", startAddress='" + startAddress + '\'' +
                ", endLat=" + endLat +
                ", endAddress=" + endAddress +
                ", endAddress='" + endAddress + '\'' +
                ", boardingLon=" + boardingLon +
                ", boardingLat=" + boardingLat +
                ", boardingAddress=" + boardingAddress +
                ", boardingAddress='" + boardingAddress + '\'' +
                ", boardingTime=" + boardingTime +
                ", getoffLon=" + getoffLon +
                ", getoffLat=" + getoffLat +
                ", getoffAddress=" + getoffAddress +
                ", getoffAddress='" + getoffAddress + '\'' +
                ", getoffTime=" + getoffTime +
                ", mileage=" + mileage +
                ", payManner=" + payManner +
                ", payType=" + payType +
                ", holidayFee=" + holidayFee +
                ", orderMoney=" + orderMoney +
                ", redPacketMoney=" + redPacketMoney +
                ", couponMoney=" + couponMoney +
@@ -886,18 +791,11 @@
                ", discount=" + discount +
                ", discountMoney=" + discountMoney +
                ", activityId=" + activityId +
                ", taxiCardId=" + taxiCardId +
                ", userTaxiCardId=" + userTaxiCardId +
                ", discountAmount=" + discountAmount +
                ", companyId=" + companyId +
                ", payMoney=" + payMoney +
                ", thankYouFee=" + thankYouFee +
                ", passengers=" + passengers +
                ", passengersPhone=" + passengersPhone +
                ", peopleNumber=" + peopleNumber +
                ", seatNumber=" + seatNumber +
                ", passengers='" + passengers + '\'' +
                ", passengersPhone='" + passengersPhone + '\'' +
                ", sort=" + sort +
                ", state=" + state +
                ", insertTime=" + insertTime +
                ", travelTime=" + travelTime +
                ", snatchOrderTime=" + snatchOrderTime +
@@ -907,16 +805,14 @@
                ", endServiceTime=" + endServiceTime +
                ", travelMode=" + travelMode +
                ", orderSource=" + orderSource +
                ", remark=" + remark +
                ", invoiceId=" + invoiceId +
                ", trackId='" + trackId + '\'' +
                ", state=" + state +
                ", isReassign=" + isReassign +
                ", reassignNotice=" + reassignNotice +
                ", trackId=" + trackId +
                ", isDelete=" + isDelete +
                ", oldState=" + oldState +
                ", telX=" + telX +
                ", bindId=" + bindId +
                ", payOrderId=" + payOrderId +
                "}";
                ", telX='" + telX + '\'' +
                ", bindId='" + bindId + '\'' +
                '}';
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderEvaluate.java
@@ -31,7 +31,7 @@
     */
    private Integer driverId;
    /**
     * 1=快车,2=出租车,3=跨城出行,4=同城小件物流,5=跨城小件物流,6=包车
     * 1=专车,2=出租车,3=跨城出行,4=同城小件物流,5=跨城小件物流,6=包车
     */
    private Integer orderType;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
@@ -51,21 +51,9 @@
     */
    private Integer cargoType;
    /**
     * 是否加急(1=否,2=是)
     */
    private Integer urgent;
    /**
     * 货物数量
     */
    private Integer cargoNumber;
    /**
     * 用户上传的图片,多个英文分号分隔
     */
    private String userImg;
    /**
     * 司机上传的图片,多个英文分号分隔
     */
    private String driverImg;
    /**
     * 备注
     */
@@ -171,10 +159,6 @@
     */
    private BigDecimal tipMoney;
    /**
     * 节假费
     */
    private BigDecimal holidayFee;
    /**
     * 红包抵扣金额
     */
    private BigDecimal redPacketMoney;
@@ -203,18 +187,6 @@
     */
    private Integer activityId;
    /**
     * 打车卡id
     */
    private Integer taxiCardId;
    /**
     * 打车卡记录id
     */
    private Integer userTaxiCardId;
    /**
     * 优惠金额
     */
    private Double discountAmount;
    /**
     * 公司id
     */
    private Integer companyId;
@@ -223,11 +195,7 @@
     */
    private BigDecimal payMoney;
    /**
     * 感谢费
     */
    private BigDecimal thankYouFee;
    /**
     * 状态(1=待接单,2=待出发,3=待到达预约地点,4=待取货,5=送货中,6=已送达,7=待支付,8=需补差价,9=已取货,10=已取消,11=改派中,12=已支付差价)
     * 状态(1=待接单,2=待出发,3=待到达预约地点,4=待取货,5=服务中,6=完成服务,7=待支付,9=已完成,10=已取消)
     */
    private Integer state;
    /**
@@ -286,27 +254,14 @@
     * 移动小号绑定关系id
     */
    private String bindId;
    /**
     * 取件码
     */
    private String pickUpCode;
    /**
     * 是否是改派单(1=否,2=是)
     */
    private Integer isReassign;
    /**
     * 改派通知(0=没有改派,1=改派中,2=已改派)
     */
    private Integer reassignNotice;
    /**
     * 需要送达时间(用户端指定)
     */
    private Date arriveTimeExpect;
    /**
     * 超时扣款
     */
    private BigDecimal timeOutMoney;
    public Integer getOldState() {
        return oldState;
    }
    public void setOldState(Integer oldState) {
        this.oldState = oldState;
    }
    public Integer getId() {
        return id;
@@ -364,36 +319,12 @@
        this.cargoType = cargoType;
    }
    public Integer getUrgent() {
        return urgent;
    }
    public void setUrgent(Integer urgent) {
        this.urgent = urgent;
    }
    public Integer getCargoNumber() {
        return cargoNumber;
    }
    public void setCargoNumber(Integer cargoNumber) {
        this.cargoNumber = cargoNumber;
    }
    public String getUserImg() {
        return userImg;
    }
    public void setUserImg(String userImg) {
        this.userImg = userImg;
    }
    public String getDriverImg() {
        return driverImg;
    }
    public void setDriverImg(String driverImg) {
        this.driverImg = driverImg;
    }
    public String getRemark() {
@@ -604,14 +535,6 @@
        this.tipMoney = tipMoney;
    }
    public BigDecimal getHolidayFee() {
        return holidayFee;
    }
    public void setHolidayFee(BigDecimal holidayFee) {
        this.holidayFee = holidayFee;
    }
    public BigDecimal getRedPacketMoney() {
        return redPacketMoney;
    }
@@ -668,30 +591,6 @@
        this.activityId = activityId;
    }
    public Integer getTaxiCardId() {
        return taxiCardId;
    }
    public void setTaxiCardId(Integer taxiCardId) {
        this.taxiCardId = taxiCardId;
    }
    public Integer getUserTaxiCardId() {
        return userTaxiCardId;
    }
    public void setUserTaxiCardId(Integer userTaxiCardId) {
        this.userTaxiCardId = userTaxiCardId;
    }
    public Double getDiscountAmount() {
        return discountAmount;
    }
    public void setDiscountAmount(Double discountAmount) {
        this.discountAmount = discountAmount;
    }
    public Integer getCompanyId() {
        return companyId;
    }
@@ -706,14 +605,6 @@
    public void setPayMoney(BigDecimal payMoney) {
        this.payMoney = payMoney;
    }
    public BigDecimal getThankYouFee() {
        return thankYouFee;
    }
    public void setThankYouFee(BigDecimal thankYouFee) {
        this.thankYouFee = thankYouFee;
    }
    public Integer getState() {
@@ -812,14 +703,6 @@
        this.isDelete = isDelete;
    }
    public Integer getOldState() {
        return oldState;
    }
    public void setOldState(Integer oldState) {
        this.oldState = oldState;
    }
    public String getTelX() {
        return telX;
    }
@@ -836,46 +719,6 @@
        this.bindId = bindId;
    }
    public String getPickUpCode() {
        return pickUpCode;
    }
    public void setPickUpCode(String pickUpCode) {
        this.pickUpCode = pickUpCode;
    }
    public Integer getIsReassign() {
        return isReassign;
    }
    public void setIsReassign(Integer isReassign) {
        this.isReassign = isReassign;
    }
    public Integer getReassignNotice() {
        return reassignNotice;
    }
    public void setReassignNotice(Integer reassignNotice) {
        this.reassignNotice = reassignNotice;
    }
    public Date getArriveTimeExpect() {
        return arriveTimeExpect;
    }
    public void setArriveTimeExpect(Date arriveTimeExpect) {
        this.arriveTimeExpect = arriveTimeExpect;
    }
    public BigDecimal getTimeOutMoney() {
        return timeOutMoney;
    }
    public void setTimeOutMoney(BigDecimal timeOutMoney) {
        this.timeOutMoney = timeOutMoney;
    }
    @Override
    protected Serializable pkVal() {
        return this.id;
@@ -884,78 +727,63 @@
    @Override
    public String toString() {
        return "TOrderLogistics{" +
                "id=" + id +
                ", type=" + type +
                ", userId=" + userId +
                ", driverId=" + driverId +
                ", carId=" + carId +
                ", orderNum=" + orderNum +
                ", cargoType=" + cargoType +
                ", urgent=" + urgent +
                ", cargoNumber=" + cargoNumber +
                ", userImg=" + userImg +
                ", driverImg=" + driverImg +
                ", remark=" + remark +
                ", placementLon=" + placementLon +
                ", placementLat=" + placementLat +
                ", placementAddress=" + placementAddress +
                ", startLon=" + startLon +
                ", startLat=" + startLat +
                ", startAddress=" + startAddress +
                ", endLon=" + endLon +
                ", endLat=" + endLat +
                ", endAddress=" + endAddress +
                ", recipient=" + recipient +
                ", recipientPhone=" + recipientPhone +
                ", boardingLon=" + boardingLon +
                ", boardingLat=" + boardingLat +
                ", boardingAddress=" + boardingAddress +
                ", boardingTime=" + boardingTime +
                ", getoffLon=" + getoffLon +
                ", getoffLat=" + getoffLat +
                ", getoffAddress=" + getoffAddress +
                ", getoffTime=" + getoffTime +
                ", mileage=" + mileage +
                ", payManner=" + payManner +
                ", payType=" + payType +
                ", orderMoney=" + orderMoney +
                ", travelMoney=" + travelMoney +
                ", tipMoney=" + tipMoney +
                ", holidayFee=" + holidayFee +
                ", redPacketMoney=" + redPacketMoney +
                ", couponMoney=" + couponMoney +
                ", redPacketId=" + redPacketId +
                ", couponId=" + couponId +
                ", discount=" + discount +
                ", discountMoney=" + discountMoney +
                ", activityId=" + activityId +
                ", taxiCardId=" + taxiCardId +
                ", userTaxiCardId=" + userTaxiCardId +
                ", discountAmount=" + discountAmount +
                ", companyId=" + companyId +
                ", payMoney=" + payMoney +
                ", thankYouFee=" + thankYouFee +
                ", state=" + state +
                ", insertTime=" + insertTime +
                ", travelTime=" + travelTime +
                ", snatchOrderTime=" + snatchOrderTime +
                ", setOutTime=" + setOutTime +
                ", arriveTime=" + arriveTime +
                ", startServiceTime=" + startServiceTime +
                ", endServiceTime=" + endServiceTime +
                ", orderSource=" + orderSource +
                ", invoiceId=" + invoiceId +
                ", trackId=" + trackId +
                ", isDelete=" + isDelete +
                ", oldState=" + oldState +
                ", telX=" + telX +
                ", bindId=" + bindId +
                ", pickUpCode=" + pickUpCode +
                ", isReassign=" + isReassign +
                ", reassignNotice=" + reassignNotice +
                ", arriveTimeExpect=" + arriveTimeExpect +
                ", timeOutMoney=" + timeOutMoney +
                "}";
        "id=" + id +
        ", type=" + type +
        ", userId=" + userId +
        ", driverId=" + driverId +
        ", carId=" + carId +
        ", orderNum=" + orderNum +
        ", cargoType=" + cargoType +
        ", cargoNumber=" + cargoNumber +
        ", remark=" + remark +
        ", placementLon=" + placementLon +
        ", placementLat=" + placementLat +
        ", placementAddress=" + placementAddress +
        ", startLon=" + startLon +
        ", startLat=" + startLat +
        ", startAddress=" + startAddress +
        ", endLon=" + endLon +
        ", endLat=" + endLat +
        ", endAddress=" + endAddress +
        ", recipient=" + recipient +
        ", recipientPhone=" + recipientPhone +
        ", boardingLon=" + boardingLon +
        ", boardingLat=" + boardingLat +
        ", boardingAddress=" + boardingAddress +
        ", boardingTime=" + boardingTime +
        ", getoffLon=" + getoffLon +
        ", getoffLat=" + getoffLat +
        ", getoffAddress=" + getoffAddress +
        ", getoffTime=" + getoffTime +
        ", mileage=" + mileage +
        ", payManner=" + payManner +
        ", payType=" + payType +
        ", orderMoney=" + orderMoney +
        ", travelMoney=" + travelMoney +
        ", tipMoney=" + tipMoney +
        ", redPacketMoney=" + redPacketMoney +
        ", couponMoney=" + couponMoney +
        ", redPacketId=" + redPacketId +
        ", couponId=" + couponId +
        ", discount=" + discount +
        ", discountMoney=" + discountMoney +
        ", activityId=" + activityId +
        ", companyId=" + companyId +
        ", payMoney=" + payMoney +
        ", state=" + state +
        ", insertTime=" + insertTime +
        ", travelTime=" + travelTime +
        ", snatchOrderTime=" + snatchOrderTime +
        ", setOutTime=" + setOutTime +
        ", arriveTime=" + arriveTime +
        ", startServiceTime=" + startServiceTime +
        ", endServiceTime=" + endServiceTime +
        ", orderSource=" + orderSource +
        ", invoiceId=" + invoiceId +
        ", trackId=" + trackId +
        ", isDelete=" + isDelete +
        ", telX=" + telX +
        ", bindId=" + bindId +
        "}";
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java
@@ -23,7 +23,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 订单类型(1=快车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     */
    private Integer orderType;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -10,7 +10,7 @@
/**
 * <p>
 * 订单-快车
 * 订单-专车
 * </p>
 *
 * @author 吕雪
@@ -31,21 +31,9 @@
     */
    private Integer type;
    /**
     * 跨城订单id(摆渡车用)
     */
    private Integer crossCityOrderId;
    /**
     * 摆渡方位(1=跨城起点,2=跨城终点)
     */
    private Integer place;
    /**
     * 用户id
     */
    private Integer userId;
    /**
     * 服务车型
     */
    private Integer serverCarModelId;
    /**
     * 接单司机ID
     */
@@ -143,41 +131,17 @@
     */
    private BigDecimal orderMoney;
    /**
     * 起步里程
     */
    private Double startMileage;
    /**
     * 起步价
     */
    private BigDecimal startMoney;
    /**
     * 里程公里
     */
    private Double mileageKilometers;
    /**
     * 里程费
     */
    private BigDecimal mileageMoney;
    /**
     * 时长分钟
     */
    private Double duration;
    /**
     * 时长费
     */
    private BigDecimal durationMoney;
    /**
     * 等待分钟
     */
    private Double wait;
    /**
     * 等待费
     */
    private BigDecimal waitMoney;
    /**
     * 远途公里
     */
    private Double longDistance;
    /**
     * 远途费
     */
@@ -190,10 +154,6 @@
     * 过路费
     */
    private BigDecimal roadTollMoney;
    /**
     * 节假日费
     */
    private BigDecimal holidayFee;
    /**
     * 红包抵扣金额
     */
@@ -223,18 +183,6 @@
     */
    private Integer activityId;
    /**
     * 打车卡id
     */
    private Integer taxiCardId;
    /**
     * 打车卡记录id
     */
    private Integer userTaxiCardId;
    /**
     * 优惠金额
     */
    private Double discountAmount;
    /**
     * 公司id
     */
    private Integer companyId;
@@ -242,14 +190,6 @@
     * 支付金额
     */
    private BigDecimal payMoney;
    /**
     * 感谢费
     */
    private BigDecimal thankYouFee;
    /**
     * 备注
     */
    private String remark;
    /**
     * 是否是代下单(0:否,1:是)
     */
@@ -334,6 +274,10 @@
     * 移动小号绑定关系id
     */
    private String bindId;
    /**
     * 专车车型ID  关联t_server_carmodel表
     */
    private Integer serverCarModelId;
    public Integer getId() {
@@ -352,36 +296,12 @@
        this.type = type;
    }
    public Integer getCrossCityOrderId() {
        return crossCityOrderId;
    }
    public void setCrossCityOrderId(Integer crossCityOrderId) {
        this.crossCityOrderId = crossCityOrderId;
    }
    public Integer getPlace() {
        return place;
    }
    public void setPlace(Integer place) {
        this.place = place;
    }
    public Integer getUserId() {
        return userId;
    }
    public void setUserId(Integer userId) {
        this.userId = userId;
    }
    public Integer getServerCarModelId() {
        return serverCarModelId;
    }
    public void setServerCarModelId(Integer serverCarModelId) {
        this.serverCarModelId = serverCarModelId;
    }
    public Integer getDriverId() {
@@ -576,28 +496,12 @@
        this.orderMoney = orderMoney;
    }
    public Double getStartMileage() {
        return startMileage;
    }
    public void setStartMileage(Double startMileage) {
        this.startMileage = startMileage;
    }
    public BigDecimal getStartMoney() {
        return startMoney;
    }
    public void setStartMoney(BigDecimal startMoney) {
        this.startMoney = startMoney;
    }
    public Double getMileageKilometers() {
        return mileageKilometers;
    }
    public void setMileageKilometers(Double mileageKilometers) {
        this.mileageKilometers = mileageKilometers;
    }
    public BigDecimal getMileageMoney() {
@@ -608,44 +512,12 @@
        this.mileageMoney = mileageMoney;
    }
    public Double getDuration() {
        return duration;
    }
    public void setDuration(Double duration) {
        this.duration = duration;
    }
    public BigDecimal getDurationMoney() {
        return durationMoney;
    }
    public void setDurationMoney(BigDecimal durationMoney) {
        this.durationMoney = durationMoney;
    }
    public Double getWait() {
        return wait;
    }
    public void setWait(Double wait) {
        this.wait = wait;
    }
    public BigDecimal getWaitMoney() {
        return waitMoney;
    }
    public void setWaitMoney(BigDecimal waitMoney) {
        this.waitMoney = waitMoney;
    }
    public Double getLongDistance() {
        return longDistance;
    }
    public void setLongDistance(Double longDistance) {
        this.longDistance = longDistance;
    }
    public BigDecimal getLongDistanceMoney() {
@@ -670,14 +542,6 @@
    public void setRoadTollMoney(BigDecimal roadTollMoney) {
        this.roadTollMoney = roadTollMoney;
    }
    public BigDecimal getHolidayFee() {
        return holidayFee;
    }
    public void setHolidayFee(BigDecimal holidayFee) {
        this.holidayFee = holidayFee;
    }
    public BigDecimal getRedPacketMoney() {
@@ -736,30 +600,6 @@
        this.activityId = activityId;
    }
    public Integer getTaxiCardId() {
        return taxiCardId;
    }
    public void setTaxiCardId(Integer taxiCardId) {
        this.taxiCardId = taxiCardId;
    }
    public Integer getUserTaxiCardId() {
        return userTaxiCardId;
    }
    public void setUserTaxiCardId(Integer userTaxiCardId) {
        this.userTaxiCardId = userTaxiCardId;
    }
    public Double getDiscountAmount() {
        return discountAmount;
    }
    public void setDiscountAmount(Double discountAmount) {
        this.discountAmount = discountAmount;
    }
    public Integer getCompanyId() {
        return companyId;
    }
@@ -774,22 +614,6 @@
    public void setPayMoney(BigDecimal payMoney) {
        this.payMoney = payMoney;
    }
    public BigDecimal getThankYouFee() {
        return thankYouFee;
    }
    public void setThankYouFee(BigDecimal thankYouFee) {
        this.thankYouFee = thankYouFee;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public Integer getSubstitute() {
@@ -960,6 +784,14 @@
        this.bindId = bindId;
    }
    public Integer getServerCarModelId() {
        return serverCarModelId;
    }
    public void setServerCarModelId(Integer serverCarModelId) {
        this.serverCarModelId = serverCarModelId;
    }
    @Override
    protected Serializable pkVal() {
        return this.id;
@@ -968,84 +800,70 @@
    @Override
    public String toString() {
        return "TOrderPrivateCar{" +
                "id=" + id +
                ", type=" + type +
                ", crossCityOrderId=" + crossCityOrderId +
                ", place=" + place +
                ", userId=" + userId +
                ", serverCarModelId=" + serverCarModelId +
                ", driverId=" + driverId +
                ", carId=" + carId +
                ", orderNum=" + orderNum +
                ", placementLon=" + placementLon +
                ", placementLat=" + placementLat +
                ", placementAddress=" + placementAddress +
                ", startLon=" + startLon +
                ", startLat=" + startLat +
                ", endLon=" + endLon +
                ", startAddress=" + startAddress +
                ", endLat=" + endLat +
                ", endAddress=" + endAddress +
                ", boardingLon=" + boardingLon +
                ", boardingLat=" + boardingLat +
                ", boardingAddress=" + boardingAddress +
                ", boardingTime=" + boardingTime +
                ", getoffLon=" + getoffLon +
                ", getoffLat=" + getoffLat +
                ", getoffAddress=" + getoffAddress +
                ", getoffTime=" + getoffTime +
                ", mileage=" + mileage +
                ", payManner=" + payManner +
                ", payType=" + payType +
                ", orderMoney=" + orderMoney +
                ", startMileage=" + startMileage +
                ", startMoney=" + startMoney +
                ", mileageKilometers=" + mileageKilometers +
                ", mileageMoney=" + mileageMoney +
                ", duration=" + duration +
                ", durationMoney=" + durationMoney +
                ", wait=" + wait +
                ", waitMoney=" + waitMoney +
                ", longDistance=" + longDistance +
                ", longDistanceMoney=" + longDistanceMoney +
                ", parkMoney=" + parkMoney +
                ", roadTollMoney=" + roadTollMoney +
                ", holidayFee=" + holidayFee +
                ", redPacketMoney=" + redPacketMoney +
                ", couponMoney=" + couponMoney +
                ", redPacketId=" + redPacketId +
                ", couponId=" + couponId +
                ", discount=" + discount +
                ", discountMoney=" + discountMoney +
                ", activityId=" + activityId +
                ", taxiCardId=" + taxiCardId +
                ", userTaxiCardId=" + userTaxiCardId +
                ", discountAmount=" + discountAmount +
                ", companyId=" + companyId +
                ", payMoney=" + payMoney +
                ", thankYouFee=" + thankYouFee +
                ", remark=" + remark +
                ", substitute=" + substitute +
                ", passengers=" + passengers +
                ", passengersPhone=" + passengersPhone +
                ", state=" + state +
                ", insertTime=" + insertTime +
                ", travelTime=" + travelTime +
                ", snatchOrderTime=" + snatchOrderTime +
                ", setOutTime=" + setOutTime +
                ", arriveTime=" + arriveTime +
                ", startServiceTime=" + startServiceTime +
                ", endServiceTime=" + endServiceTime +
                ", orderType=" + orderType +
                ", orderSource=" + orderSource +
                ", invoiceId=" + invoiceId +
                ", isReassign=" + isReassign +
                ", reassignNotice=" + reassignNotice +
                ", trackId=" + trackId +
                ", isDelete=" + isDelete +
                ", oldState=" + oldState +
                ", telX=" + telX +
                ", bindId=" + bindId +
                "}";
        "id=" + id +
        ", type=" + type +
        ", userId=" + userId +
        ", driverId=" + driverId +
        ", carId=" + carId +
        ", orderNum=" + orderNum +
        ", placementLon=" + placementLon +
        ", placementLat=" + placementLat +
        ", placementAddress=" + placementAddress +
        ", startLon=" + startLon +
        ", startLat=" + startLat +
        ", endLon=" + endLon +
        ", startAddress=" + startAddress +
        ", endLat=" + endLat +
        ", endAddress=" + endAddress +
        ", boardingLon=" + boardingLon +
        ", boardingLat=" + boardingLat +
        ", boardingAddress=" + boardingAddress +
        ", boardingTime=" + boardingTime +
        ", getoffLon=" + getoffLon +
        ", getoffLat=" + getoffLat +
        ", getoffAddress=" + getoffAddress +
        ", getoffTime=" + getoffTime +
        ", mileage=" + mileage +
        ", payManner=" + payManner +
        ", payType=" + payType +
        ", orderMoney=" + orderMoney +
        ", startMoney=" + startMoney +
        ", mileageMoney=" + mileageMoney +
        ", durationMoney=" + durationMoney +
        ", longDistanceMoney=" + longDistanceMoney +
        ", parkMoney=" + parkMoney +
        ", roadTollMoney=" + roadTollMoney +
        ", redPacketMoney=" + redPacketMoney +
        ", couponMoney=" + couponMoney +
        ", redPacketId=" + redPacketId +
        ", couponId=" + couponId +
        ", discount=" + discount +
        ", discountMoney=" + discountMoney +
        ", activityId=" + activityId +
        ", companyId=" + companyId +
        ", payMoney=" + payMoney +
        ", substitute=" + substitute +
        ", passengers=" + passengers +
        ", passengersPhone=" + passengersPhone +
        ", state=" + state +
        ", insertTime=" + insertTime +
        ", travelTime=" + travelTime +
        ", snatchOrderTime=" + snatchOrderTime +
        ", setOutTime=" + setOutTime +
        ", arriveTime=" + arriveTime +
        ", startServiceTime=" + startServiceTime +
        ", endServiceTime=" + endServiceTime +
        ", orderType=" + orderType +
        ", orderSource=" + orderSource +
        ", invoiceId=" + invoiceId +
        ", isReassign=" + isReassign +
        ", reassignNotice=" + reassignNotice +
        ", trackId=" + trackId +
        ", isDelete=" + isDelete +
        ", oldState=" + oldState +
        ", telX=" + telX +
        ", bindId=" + bindId +
        ", serverCarModelId=" + serverCarModelId +
        "}";
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
@@ -27,18 +27,6 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 订单类型(1=普通订单,2=摆渡订单)
     */
    private Integer type;
    /**
     * 跨城订单id(摆渡专用)
     */
    private Integer crossCityOrderId;
    /**
     * 摆渡方位(1=跨城起点,2=跨城终点)
     */
    private Integer place;
    /**
     * 用户id
     */
    private Integer userId;
@@ -155,10 +143,6 @@
     */
    private BigDecimal tipMoney;
    /**
     * 节假费
     */
    private BigDecimal holidayFee;
    /**
     * 红包抵扣金额
     */
    private BigDecimal redPacketMoney;
@@ -175,30 +159,6 @@
     */
    private Integer couponId;
    /**
     * 折扣
     */
    private Double discount;
    /**
     * 折扣优惠金额
     */
    private Double discountMoney;
    /**
     * 折扣活动id
     */
    private Integer activityId;
    /**
     * 打车卡id
     */
    private Integer taxiCardId;
    /**
     * 打车卡记录id
     */
    private Integer userTaxiCardId;
    /**
     * 优惠金额
     */
    private Double discountAmount;
    /**
     * 公司id
     */
    private Integer companyId;
@@ -206,10 +166,6 @@
     * 支付金额
     */
    private BigDecimal payMoney;
    /**
     * 感谢费
     */
    private BigDecimal thankYouFee;
    /**
     * 是否是代下单(0:否,1:是)
     */
@@ -223,13 +179,13 @@
     */
    private String passengersPhone;
    /**
     * 备注
     */
    private String remark;
    /**
     * 状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中,12=取消待支付)
     * 状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中)
     */
    private Integer state;
    /**
     * 状态(改派前订单状态)
     */
    private Integer oldState;
    /**
     * 下单时间
     */
@@ -275,30 +231,25 @@
     */
    private Integer isReassign;
    /**
     * 改派通知(0=没有改派,1=改派中,2=已改派)
     */
    private Integer reassignNotice;
    /**
     * 高德猎鹰上的轨迹id
     */
    private String trackId;
    /**
     * 是否删除  1=否 2=是
     */
    private Integer isDelete;
    /**
     * 状态(改派前订单状态)
     */
    private Integer oldState;
    /**
     * 移动小号
     */
    private String telX;
    /**
     * 移动小号绑定关系id
     */
    private String bindId;
    public Integer getOldState() {
        return oldState;
    }
    public void setOldState(Integer oldState) {
        this.oldState = oldState;
    }
    public Integer getIsDelete() {
        return isDelete;
    }
    public void setIsDelete(Integer isDelete) {
        this.isDelete = isDelete;
    }
    public Integer getId() {
        return id;
@@ -306,30 +257,6 @@
    public void setId(Integer id) {
        this.id = id;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Integer getCrossCityOrderId() {
        return crossCityOrderId;
    }
    public void setCrossCityOrderId(Integer crossCityOrderId) {
        this.crossCityOrderId = crossCityOrderId;
    }
    public Integer getPlace() {
        return place;
    }
    public void setPlace(Integer place) {
        this.place = place;
    }
    public Integer getUserId() {
@@ -564,14 +491,6 @@
        this.tipMoney = tipMoney;
    }
    public BigDecimal getHolidayFee() {
        return holidayFee;
    }
    public void setHolidayFee(BigDecimal holidayFee) {
        this.holidayFee = holidayFee;
    }
    public BigDecimal getRedPacketMoney() {
        return redPacketMoney;
    }
@@ -604,54 +523,6 @@
        this.couponId = couponId;
    }
    public Double getDiscount() {
        return discount;
    }
    public void setDiscount(Double discount) {
        this.discount = discount;
    }
    public Double getDiscountMoney() {
        return discountMoney;
    }
    public void setDiscountMoney(Double discountMoney) {
        this.discountMoney = discountMoney;
    }
    public Integer getActivityId() {
        return activityId;
    }
    public void setActivityId(Integer activityId) {
        this.activityId = activityId;
    }
    public Integer getTaxiCardId() {
        return taxiCardId;
    }
    public void setTaxiCardId(Integer taxiCardId) {
        this.taxiCardId = taxiCardId;
    }
    public Integer getUserTaxiCardId() {
        return userTaxiCardId;
    }
    public void setUserTaxiCardId(Integer userTaxiCardId) {
        this.userTaxiCardId = userTaxiCardId;
    }
    public Double getDiscountAmount() {
        return discountAmount;
    }
    public void setDiscountAmount(Double discountAmount) {
        this.discountAmount = discountAmount;
    }
    public Integer getCompanyId() {
        return companyId;
    }
@@ -666,14 +537,6 @@
    public void setPayMoney(BigDecimal payMoney) {
        this.payMoney = payMoney;
    }
    public BigDecimal getThankYouFee() {
        return thankYouFee;
    }
    public void setThankYouFee(BigDecimal thankYouFee) {
        this.thankYouFee = thankYouFee;
    }
    public Integer getSubstitute() {
@@ -698,14 +561,6 @@
    public void setPassengersPhone(String passengersPhone) {
        this.passengersPhone = passengersPhone;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public Integer getState() {
@@ -804,54 +659,6 @@
        this.isReassign = isReassign;
    }
    public Integer getReassignNotice() {
        return reassignNotice;
    }
    public void setReassignNotice(Integer reassignNotice) {
        this.reassignNotice = reassignNotice;
    }
    public String getTrackId() {
        return trackId;
    }
    public void setTrackId(String trackId) {
        this.trackId = trackId;
    }
    public Integer getIsDelete() {
        return isDelete;
    }
    public void setIsDelete(Integer isDelete) {
        this.isDelete = isDelete;
    }
    public Integer getOldState() {
        return oldState;
    }
    public void setOldState(Integer oldState) {
        this.oldState = oldState;
    }
    public String getTelX() {
        return telX;
    }
    public void setTelX(String telX) {
        this.telX = telX;
    }
    public String getBindId() {
        return bindId;
    }
    public void setBindId(String bindId) {
        this.bindId = bindId;
    }
    @Override
    protected Serializable pkVal() {
        return this.id;
@@ -860,75 +667,57 @@
    @Override
    public String toString() {
        return "TOrderTaxi{" +
                "id=" + id +
                ", type=" + type +
                ", crossCityOrderId=" + crossCityOrderId +
                ", place=" + place +
                ", userId=" + userId +
                ", driverId=" + driverId +
                ", carId=" + carId +
                ", orderNum=" + orderNum +
                ", placementLon=" + placementLon +
                ", placementLat=" + placementLat +
                ", placementAddress=" + placementAddress +
                ", startLon=" + startLon +
                ", startLat=" + startLat +
                ", endLon=" + endLon +
                ", startAddress=" + startAddress +
                ", endLat=" + endLat +
                ", endAddress=" + endAddress +
                ", boardingLon=" + boardingLon +
                ", boardingLat=" + boardingLat +
                ", boardingAddress=" + boardingAddress +
                ", boardingTime=" + boardingTime +
                ", getoffLon=" + getoffLon +
                ", getoffLat=" + getoffLat +
                ", getoffAddress=" + getoffAddress +
                ", getoffTime=" + getoffTime +
                ", mileage=" + mileage +
                ", payManner=" + payManner +
                ", payType=" + payType +
                ", orderMoney=" + orderMoney +
                ", travelMoney=" + travelMoney +
                ", parkMoney=" + parkMoney +
                ", roadTollMoney=" + roadTollMoney +
                ", tipMoney=" + tipMoney +
                ", holidayFee=" + holidayFee +
                ", redPacketMoney=" + redPacketMoney +
                ", couponMoney=" + couponMoney +
                ", redPacketId=" + redPacketId +
                ", couponId=" + couponId +
                ", discount=" + discount +
                ", discountMoney=" + discountMoney +
                ", activityId=" + activityId +
                ", taxiCardId=" + taxiCardId +
                ", userTaxiCardId=" + userTaxiCardId +
                ", discountAmount=" + discountAmount +
                ", companyId=" + companyId +
                ", payMoney=" + payMoney +
                ", thankYouFee=" + thankYouFee +
                ", substitute=" + substitute +
                ", passengers=" + passengers +
                ", passengersPhone=" + passengersPhone +
                ", remark=" + remark +
                ", state=" + state +
                ", insertTime=" + insertTime +
                ", travelTime=" + travelTime +
                ", snatchOrderTime=" + snatchOrderTime +
                ", setOutTime=" + setOutTime +
                ", arriveTime=" + arriveTime +
                ", startServiceTime=" + startServiceTime +
                ", endServiceTime=" + endServiceTime +
                ", orderType=" + orderType +
                ", orderSource=" + orderSource +
                ", invoiceId=" + invoiceId +
                ", isReassign=" + isReassign +
                ", reassignNotice=" + reassignNotice +
                ", trackId=" + trackId +
                ", isDelete=" + isDelete +
                ", oldState=" + oldState +
                ", telX=" + telX +
                ", bindId=" + bindId +
                "}";
        "id=" + id +
        ", userId=" + userId +
        ", driverId=" + driverId +
        ", carId=" + carId +
        ", orderNum=" + orderNum +
        ", placementLon=" + placementLon +
        ", placementLat=" + placementLat +
        ", placementAddress=" + placementAddress +
        ", startLon=" + startLon +
        ", startLat=" + startLat +
        ", endLon=" + endLon +
        ", startAddress=" + startAddress +
        ", endLat=" + endLat +
        ", endAddress=" + endAddress +
        ", boardingLon=" + boardingLon +
        ", boardingLat=" + boardingLat +
        ", boardingAddress=" + boardingAddress +
        ", boardingTime=" + boardingTime +
        ", getoffLon=" + getoffLon +
        ", getoffLat=" + getoffLat +
        ", getoffAddress=" + getoffAddress +
        ", getoffTime=" + getoffTime +
        ", mileage=" + mileage +
        ", payManner=" + payManner +
        ", payType=" + payType +
        ", orderMoney=" + orderMoney +
        ", travelMoney=" + travelMoney +
        ", parkMoney=" + parkMoney +
        ", roadTollMoney=" + roadTollMoney +
        ", tipMoney=" + tipMoney +
        ", redPacketMoney=" + redPacketMoney +
        ", couponMoney=" + couponMoney +
        ", redPacketId=" + redPacketId +
        ", couponId=" + couponId +
        ", companyId=" + companyId +
        ", payMoney=" + payMoney +
        ", substitute=" + substitute +
        ", passengers=" + passengers +
        ", passengersPhone=" + passengersPhone +
        ", state=" + state +
        ", insertTime=" + insertTime +
        ", travelTime=" + travelTime +
        ", snatchOrderTime=" + snatchOrderTime +
        ", setOutTime=" + setOutTime +
        ", arriveTime=" + arriveTime +
        ", startServiceTime=" + startServiceTime +
        ", endServiceTime=" + endServiceTime +
        ", orderType=" + orderType +
        ", orderSource=" + orderSource +
        ", invoiceId=" + invoiceId +
        ", isReassign=" + isReassign +
        "}";
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java
@@ -55,7 +55,7 @@
     */
    private Integer userType;
    /**
     * 订单类型(1=快车,2=出租车,3=城际,4=小件物流,5=余额充值)
     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流,5=余额充值)
     */
    private Integer orderType;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java
@@ -24,7 +24,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 订单类型(1=快车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     */
    private Integer orderType;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
@@ -26,7 +26,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 业务类型(1=快车,2=城际,3=包车)
     * 业务类型(1=专车,2=城际,3=包车)
     */
    private Integer type;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java
@@ -66,18 +66,6 @@
     */
    private Integer insertUserId;
    /**
     * 1景区 2机场
     */
    private Integer type;
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Integer getId() {
        return id;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
@@ -42,7 +42,7 @@
     */
    private Integer type;
    /**
     * 1=快车,2=出租车,3=跨城出行
     * 1=专车,2=出租车,3=跨城出行
     */
    private Integer orderType;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java
@@ -45,7 +45,7 @@
     */
    private Integer type;
    /**
     * 1=快车,2=出租车
     * 1=专车,2=出租车
     */
    private Integer pushType;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
@@ -34,7 +34,7 @@
     */
    private BigDecimal money;
    /**
     * 快车改派 1=否 2=是
     * 专车改派 1=否 2=是
     */
    private Integer isSpecialCar;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysWithdrawalPoundage.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
@@ -26,7 +26,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 业务类型(1=快车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     * 业务类型(1=专车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
     */
    private Integer type;
    /**
@@ -42,79 +42,14 @@
     */
    private String content;
    /**
     * 运价类型说明(拼车)
     * 运价类型说明
     */
    @TableField("fareTypeNote1")
    private String fareTypeNote1;
    /**
     * 运价类型说明(独享)
     */
    @TableField("fareTypeNote2")
    private String fareTypeNote2;
    /**
     * 运价类型说明(一口价)
     */
    @TableField("fareTypeNote3")
    private String fareTypeNote3;
    @TableField("fareTypeNote")
    private String fareTypeNote;
    /**
     * 状态(1=正常,2=冻结,3=删除)
     */
    private Integer state;
    /**
     * 一人拼成
     */
    @TableField("contentPutOne")
    private String contentPutOne;
    /**
     * 一人未拼成
     */
    @TableField("contentNotOne")
    private String contentNotOne;
    /**
     * 2人拼成
     */
    @TableField("contentPutTwo")
    private String contentPutTwo;
    /**
     * 2人未拼成
     */
    @TableField("contentNotTwo")
    private String contentNotTwo;
    /**
     * 3人拼成
     */
    @TableField("contentPutThree")
    private String contentPutThree;
    /**
     * 3人未拼成
     */
    @TableField("contentNotThree")
    private String contentNotThree;
    /**
     * 独享
     */
    @TableField("contentExclusive")
    private String contentExclusive;
    /**
     * 一口价
     */
    @TableField("contentPrice")
    private String contentPrice;
    /**
     * 是否开启拼车(1=是,2=否)
     */
    @TableField("isOpen")
    private Integer isOpen;
    /**
     * 是否开启独享(1=是,2=否)
     */
    @TableField("isOpenExclusive")
    private Integer isOpenExclusive;
    /**
     * 是否开启一口价(1=是,2=否)
     */
    @TableField("isOpenPrice")
    private Integer isOpenPrice;
    public Integer getState() {
        return state;
@@ -164,118 +99,13 @@
        this.content = content;
    }
    public String getFareTypeNote1() {
        return fareTypeNote1;
    public String getFareTypeNote() {
        return fareTypeNote;
    }
    public void setFareTypeNote1(String fareTypeNote1) {
        this.fareTypeNote1 = fareTypeNote1;
    public void setFareTypeNote(String fareTypeNote) {
        this.fareTypeNote = fareTypeNote;
    }
    public String getFareTypeNote2() {
        return fareTypeNote2;
    }
    public void setFareTypeNote2(String fareTypeNote2) {
        this.fareTypeNote2 = fareTypeNote2;
    }
    public String getFareTypeNote3() {
        return fareTypeNote3;
    }
    public void setFareTypeNote3(String fareTypeNote3) {
        this.fareTypeNote3 = fareTypeNote3;
    }
    public String getContentPutOne() {
        return contentPutOne;
    }
    public void setContentPutOne(String contentPutOne) {
        this.contentPutOne = contentPutOne;
    }
    public String getContentNotOne() {
        return contentNotOne;
    }
    public void setContentNotOne(String contentNotOne) {
        this.contentNotOne = contentNotOne;
    }
    public String getContentPutTwo() {
        return contentPutTwo;
    }
    public void setContentPutTwo(String contentPutTwo) {
        this.contentPutTwo = contentPutTwo;
    }
    public String getContentNotTwo() {
        return contentNotTwo;
    }
    public void setContentNotTwo(String contentNotTwo) {
        this.contentNotTwo = contentNotTwo;
    }
    public String getContentPutThree() {
        return contentPutThree;
    }
    public void setContentPutThree(String contentPutThree) {
        this.contentPutThree = contentPutThree;
    }
    public String getContentNotThree() {
        return contentNotThree;
    }
    public void setContentNotThree(String contentNotThree) {
        this.contentNotThree = contentNotThree;
    }
    public String getContentExclusive() {
        return contentExclusive;
    }
    public void setContentExclusive(String contentExclusive) {
        this.contentExclusive = contentExclusive;
    }
    public String getContentPrice() {
        return contentPrice;
    }
    public void setContentPrice(String contentPrice) {
        this.contentPrice = contentPrice;
    }
    public Integer getIsOpen() {
        return isOpen;
    }
    public void setIsOpen(Integer isOpen) {
        this.isOpen = isOpen;
    }
    public Integer getIsOpenExclusive() {
        return isOpenExclusive;
    }
    public void setIsOpenExclusive(Integer isOpenExclusive) {
        this.isOpenExclusive = isOpenExclusive;
    }
    public Integer getIsOpenPrice() {
        return isOpenPrice;
    }
    public void setIsOpenPrice(Integer isOpenPrice) {
        this.isOpenPrice = isOpenPrice;
    }
    @Override
    protected Serializable pkVal() {
@@ -290,21 +120,8 @@
                ", companyId=" + companyId +
                ", serverCarModelId=" + serverCarModelId +
                ", content='" + content + '\'' +
                ", fareTypeNote1='" + fareTypeNote1 + '\'' +
                ", fareTypeNote2='" + fareTypeNote2 + '\'' +
                ", fareTypeNote3='" + fareTypeNote3 + '\'' +
                ", fareTypeNote='" + fareTypeNote + '\'' +
                ", state=" + state +
                ", contentPutOne='" + contentPutOne + '\'' +
                ", contentNotOne='" + contentNotOne + '\'' +
                ", contentPutTwo='" + contentPutTwo + '\'' +
                ", contentNotTwo='" + contentNotTwo + '\'' +
                ", contentPutThree='" + contentPutThree + '\'' +
                ", contentNotThree='" + contentNotThree + '\'' +
                ", contentExclusive='" + contentExclusive + '\'' +
                ", contentPrice='" + contentPrice + '\'' +
                ", isOpen=" + isOpen +
                ", isOpenExclusive=" + isOpenExclusive +
                ", isOpenPrice=" + isOpenPrice +
                '}';
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TTaxiCard.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TTaxiCardPayment.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TTimeoutAppeal.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUserRedPacketRecord.java
@@ -48,7 +48,7 @@
     */
    private Integer orderId;
    /**
     * 订单类型(1=快车,2=出租车,3=城际,4=小件物流)
     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流)
     */
    private Integer orderType;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TransactionDetails.java
@@ -54,7 +54,7 @@
    @TableField("userType")
    private Integer userType;
    /**
     * 订单类型(1=快车,2=出租车,3=城际,4=小件物流)
     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流)
     */
    @TableField("orderType")
    private Integer orderType;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java
@@ -39,6 +39,10 @@
     * 密码
     */
    private String password;
    /**
     * 密码修改时间
     */
    private Date passWordUpdate;
    /**
     * md5密码盐
     */
@@ -136,6 +140,14 @@
        return password;
    }
    public Date getPassWordUpdate() {
        return passWordUpdate;
    }
    public void setPassWordUpdate(Date passWordUpdate) {
        this.passWordUpdate = passWordUpdate;
    }
    public void setPassword(String password) {
        this.password = password;
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityBalance.java
@@ -43,11 +43,11 @@
     */
    private Integer generalCouponId;
    /**
     * 快车优惠券数量
     * 专车优惠券数量
     */
    private Integer specialNum;
    /**
     * 快车优惠券id
     * 专车优惠券id
     */
    private Integer specialCouponId;
    /**
@@ -87,7 +87,7 @@
     */
    private Double generalCouponMoney;
    /**
     * 快车券金额
     * 专车券金额
     */
    private Double specialCouponMoney;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount1.java
@@ -27,7 +27,7 @@
     */
    private Integer userActivityId;
    /**
     * 快车打折(8.5)
     * 专车打折(8.5)
     */
    private Double special;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserCouponRecord.java
@@ -52,7 +52,7 @@
     */
    private Date endTime;
    /**
     * 优惠券使用类型(0=通用,1=快车,2=出租车,3=城际,4=小件物流)
     * 优惠券使用类型(0=通用,1=专车,2=出租车,3=城际,4=小件物流)
     */
    private Integer couponUseType;
    /**
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserMerchantCoupon.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
@@ -53,7 +53,7 @@
    @TableField("orderId")
    private Integer orderId;
    /**
     * 订单类型(1=快车,2=出租车,3=城际,4=小件物流)
     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流)
     */
    @TableField("orderType")
    private Integer orderType;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/response/MerchantActivityVo.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/response/UserRequest.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarRentalService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IComplaintDeductmoneyService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityHistoryService.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
import com.baomidou.mybatisplus.service.IService;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import java.util.List;
import java.util.Map;
@@ -26,36 +25,4 @@
     */
    List<Map<String,Object>> getList(Page<Map<String, Object>> page,Integer activityId,Integer type);
    /**
     * 导出数据查询
     * @param activityId
     * @param type
     * @return
     */
    List<Map<String,Object>> getListt(Integer activityId,Integer type);
    /**
     * 获取司机活动收益明细
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @param offset
     * @param limit
     * @return
     * @throws Exception
     */
    Map<String, Object> rewardDetailsList(String driverName, String driverPhone, String createTime, Integer offset, Integer limit) throws Exception;
    /**
     * 导出司机活动收益明细
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @return
     * @throws Exception
     */
    HSSFWorkbook exportRewardDetails(String driverName, String driverPhone, String createTime) throws Exception;
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java
@@ -2,9 +2,6 @@
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.Income;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import java.util.Map;
public interface IIncomeService extends IService<Income> {
@@ -19,44 +16,4 @@
     * @throws Exception
     */
    void saveData(Integer userType, Integer objectId, Integer type, Integer incomeId, Integer orderType, Double money) throws Exception;
    /**
     * 获取平台收入明细汇总
     * @param insertTime
     * @param offset
     * @param limit
     * @return
     * @throws Exception
     */
    Map<String, Object> summaryOfIncomeDetailsList(String insertTime, Integer offset, Integer limit) throws Exception;
    /**
     * 导出平台收入明细汇总
     * @param insertTime
     * @return
     * @throws Exception
     */
    HSSFWorkbook  exportSummaryOfIncomeDetails(String insertTime) throws Exception;
    /**
     * 获取支出明细汇总
     * @param insertTime
     * @param offset
     * @param limit
     * @return
     * @throws Exception
     */
    Map<String, Object> summaryOfSpendingDetailsList(String insertTime, Integer offset, Integer limit) throws Exception;
    /**
     * 导出支出明细汇总
     * @param insertTime
     * @return
     * @throws Exception
     */
    HSSFWorkbook exportSummaryOfSpendingDetails(String insertTime) throws Exception;
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMerchantActivityService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMerchantActivitySlaveService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMerchantCouponService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMessNumService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPaymentRecordService.java
@@ -4,7 +4,6 @@
import com.stylefeng.guns.modular.system.model.PaymentRecord;
import java.util.List;
import java.util.Map;
public interface IPaymentRecordService extends IService<PaymentRecord> {
@@ -33,11 +32,4 @@
     */
    List<PaymentRecord> query(Integer category, Integer userId, Integer type, Integer orderId, Integer orderType,
               Integer payType, Integer state) throws Exception;
    /**
     * 导出
     * @return
     */
    List<Map<String,Object>> exportRecord(String userName, String phone, String code, String startTime, String endTime);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRecruitService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISellingCarService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IShowModularService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISpellOrderRuleService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAdditionalFeeService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITBalanceModifyRecordService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyService.java
@@ -89,25 +89,4 @@
     * @throws Exception
     */
    HSSFWorkbook downloadOperationalData(Integer type, String start, String end, Integer companyId) throws Exception;
    List<Map<String,Object>> getCompanyIncomeList(@Param("page") Page<Map<String, Object>> page,
                                                  @Param("beginTime") String beginTime,
                                                  @Param("endTime") String endTime,
                                                  @Param("userId") String userId);
    List<Map<String,Object>> getCompanyIncomeListEx(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("userId") String userId);
    /**
     * 统计
     * @param beginTime
     * @param endTime
     * @param userId
     * @return
     */
    Double getSumCompanyIncomeMoney(@Param("beginTime") String beginTime,
                                    @Param("endTime") String endTime,
                                    @Param("userId") String userId);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITComplaintService.java
@@ -30,6 +30,5 @@
                                              @Param("userName") String userName,
                                              @Param("userPhone") String userPhone,
                                              @Param("driverPhone") String driverPhone,
                                              @Param("isHandle") Integer isHandle,
                                              @Param("driverId") Integer driverId);
                                              @Param("isHandle") Integer isHandle);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
@@ -4,7 +4,6 @@
import com.stylefeng.guns.modular.system.model.TDriver;
import com.baomidou.mybatisplus.service.IService;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import java.util.List;
import java.util.Map;
@@ -91,51 +90,5 @@
     */
    List<Map<String,Object>> getDriverListNoPage(@Param("roleType") Integer roleType,
                                                 @Param("nowUserId") Integer nowUserId);
    /**
     * 获取司机订单收益明细
     * @param page
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @return
     * @throws Exception
     */
    List<Map<String, Object>> orderRevenueDetailsList(Page<Map<String, Object>> page, String driverName, String driverPhone, String createTime) ;
    /**
     * 导出司机订单收益明细
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @return
     * @throws Exception
     */
    HSSFWorkbook exportOrderRevenueDetails(String driverName, String driverPhone, String createTime) throws Exception;
    /**
     * 获取平台其他支出明细
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @param offset
     * @param limit
     * @return
     */
    Map<String, Object> otherSpendingDetailList(String driverName, String driverPhone, String createTime, Integer offset, Integer limit);
    /**
     * 导出平台其他支出明细
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @return
     * @throws Exception
     */
    HSSFWorkbook exportOtherSpendingDetailList(String driverName, String driverPhone, String createTime) throws Exception;
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java
@@ -28,8 +28,7 @@
                                         @Param("name") String name,
                                         @Param("insertUser") String insertUser,
                                         @Param("modelStr") String modelStr,
                                         @Param("state") Integer state,
                                         @Param("type") Integer type);
                                         @Param("state") Integer state);
    /**
     * 根据线路ID查询线路价格
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITMerchantActivityService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITMerchantService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOfflineTravelPaymentService.java
New file
@@ -0,0 +1,25 @@
package com.stylefeng.guns.modular.system.service;
import com.stylefeng.guns.modular.system.model.TOfflineTravelPayment;
import com.baomidou.mybatisplus.service.IService;
import java.util.List;
/**
 * <p>
 *  服务类
 * </p>
 *
 * @author stylefeng
 * @since 2023-04-14
 */
public interface ITOfflineTravelPaymentService extends IService<TOfflineTravelPayment> {
    /**
     * 获取列表
     * @param driverName
     * @param payTime
     * @return
     */
    List<TOfflineTravelPayment> getPageList(String driverName, String payTime);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderAdditionalFeeService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCallService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderLogisticsService.java
@@ -38,34 +38,10 @@
                                                   @Param("state") Integer state);
    /**
     * 根据快车订单ID获取小件物流订单详情
     * 根据专车订单ID获取小件物流订单详情
     * @param orderId
     * @return
     */
    Map<String,Object> getLogisticsOrderDetailById(@Param("orderId") Integer orderId);
    Map<String,Object> getTimeOutOrderSumMoney(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("phone") String phone,
            @Param("name") String name,
            @Param("id") String id,
            @Param("companyId") Integer companyId,
            @Param("orderType") Integer orderType);
    List<Map<String,Object>> getTimeOutOrderList(@Param("page") Page<Map<String, Object>> page,
                                                 @Param("beginTime") String beginTime,
                                                 @Param("endTime") String endTime,
                                                 @Param("phone") String phone,
                                                 @Param("name") String name,
                                                 @Param("id") String id,
                                                 @Param("companyId") Integer companyId,
                                                 @Param("orderType") Integer orderType);
    List<Map<String,Object>> getTimeOutOrderListEx(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("phone") String phone,
            @Param("name") String name,
            @Param("id") String id,
            @Param("companyId") Integer companyId,
            @Param("orderType") Integer orderType);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
@@ -10,7 +10,7 @@
/**
 * <p>
 * 订单-快车 服务类
 * 订单-专车 服务类
 * </p>
 *
 * @author 吕雪
@@ -19,7 +19,7 @@
public interface ITOrderPrivateCarService extends IService<TOrderPrivateCar> {
    /**
     * 根据条件查询快车订单列表
     * 根据条件查询专车订单列表
     * @return
     */
    List<Map<String,Object>> getPrivateCarOrderList(@Param("page") Page<Map<String, Object>> page,
@@ -35,16 +35,12 @@
                                                    @Param("passengersPhone") String passengersPhone,
                                                    @Param("serverCarModelId") Integer serverCarModelId,
                                                    @Param("driver") String driver,
                                                    @Param("state") Integer state,
                                                    @Param("rideType") Integer rideType);
                                                    @Param("state") Integer state);
    /**
     * 根据快车订单ID获取快车订单详情
     * 根据专车订单ID获取专车订单详情
     * @param orderId
     * @return
     */
    Map<String,Object> getPrivateCarOrderDetailById(@Param("orderId") Integer orderId);
    List<Map<String,Object>> getSurcharge(Object id,Integer orderType);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java
@@ -78,61 +78,4 @@
     */
    Double getAllIncomeMoney(@Param("companyId") Integer companyId,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
    List<Map<String,Object>> getOrderList(@Param("page") Page<Map<String, Object>> page,
                                          @Param("beginTime") String beginTime,
                                          @Param("endTime") String endTime,
                                          @Param("userId") String userId,
                                          @Param("type") Integer type,
                                          @Param("payType") String payType,
                                          @Param("companyId") Integer companyId);
    List<Map<String,Object>> getOrderListEx(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("userId") String userId,
            @Param("type") Integer type,
            @Param("payType") String payType,
            @Param("companyId") Integer companyId);
    List<Map<String,Object>> getIncomeOrderList(@Param("page") Page<Map<String, Object>> page,
                                                @Param("beginTime") String beginTime,
                                                @Param("endTime") String endTime,
                                                @Param("phone") String phone,
                                                @Param("name") String name,
                                                @Param("state") Integer state,
                                                @Param("type") Integer type,
                                                @Param("companyId") Integer companyId,
                                                @Param("income") Integer income);
    List<Map<String,Object>> getIncomeOrderListEx(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("phone") String phone,
            @Param("name") String name,
            @Param("state") Integer state,
            @Param("type") Integer type,
            @Param("companyId") Integer companyId,
            @Param("income") Integer income);
    Map<String,Object> getIncomeOrderSumMoney(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("phone") String phone,
            @Param("name") String name,
            @Param("state") Integer state,
            @Param("type") Integer type,
            @Param("companyId") Integer companyId,
            @Param("income") Integer income);
    List<Map<String, Object>> queryOtherIncomeDetail(@Param("page") Page<Map<String, Object>> page,
                                                     @Param("beginTime") String beginTime,
                                                     @Param("endTime") String endTime,
                                                     @Param("orderNo") String orderNo,
                                                     @Param("name") String name,
                                                     @Param("phone") String phone);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubWithdrawalService.java
@@ -4,7 +4,6 @@
import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
import com.baomidou.mybatisplus.service.IService;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import java.util.List;
import java.util.Map;
@@ -28,83 +27,4 @@
                                               @Param("endTime") String endTime,
                                               @Param("name") String name,
                                               @Param("withdrawalType") Integer withdrawalType);
    /**
     * 提现列表-报表
     * @param page
     * @param beginTime
     * @param endTime
     * @param userId
     * @return
     */
    List<Map<String,Object>> getReportWithdrawalList(@Param("page") Page<Map<String, Object>> page,
                                                     @Param("beginTime") String beginTime,
                                                     @Param("endTime") String endTime,
                                                     @Param("userId") String userId);
    List<Map<String,Object>> getReportWithdrawalListEx(
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("userId") String userId);
    /**
     * 统计
     * @param beginTime
     * @param endTime
     * @param userId
     * @return
     */
    Map<String,Object> getSumMoney(@Param("beginTime") String beginTime,
                                   @Param("endTime") String endTime,
                                   @Param("userId") String userId);
    /**
     * 获取司机提现明细
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @param offset
     * @param limit
     * @return
     * @throws Exception
     */
    Map<String, Object> orderWithdrawalDetailsList(String driverName, String driverPhone, String createTime, Integer offset, Integer limit) throws Exception;
    /**
     * 导出司机提现明细
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @return
     * @throws Exception
     */
    HSSFWorkbook exportOrderWithdrawalDetails(String driverName, String driverPhone, String createTime) throws Exception;
    /**
     * 司机奖励提现明细
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @param offset
     * @param limit
     * @return
     * @throws Exception
     */
    Map<String, Object> rewardWithdrawalDetailsList(String driverName, String driverPhone, String createTime, Integer offset, Integer limit) throws Exception;
    /**
     * 导出司机奖励提现明细
     * @param driverName
     * @param driverPhone
     * @param createTime
     * @return
     * @throws Exception
     */
    HSSFWorkbook exportRewardWithdrawalDetails(String driverName, String driverPhone, String createTime) throws Exception;
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java
@@ -20,7 +20,7 @@
public interface ITReassignService extends IService<TReassign> {
    /**
     * 根据条件查询快车改派订单列表
     * 根据条件查询专车改派订单列表
     */
    List<Map<String,Object>> getPrivateCarReassignOrderList(@Param("page") Page<Map<String, Object>> page,
                                                            @Param("roleType") Integer roleType,
@@ -36,18 +36,17 @@
                                                            @Param("state") Integer state);
    /**
     * 根据条件查询可被选择的快车司机列表
     * 根据条件查询可被选择的专车司机列表
     * @return
     */
    List<Map<String,Object>> getCanSelectPrivateCarDriverList(@Param("page") Page<Map<String, Object>> page,
                                                              @Param("companyId") Integer companyId,
                                                              @Param("name") String name,
                                                              @Param("phone") String phone,
                                                              @Param("driverId") Integer driverId);
                                                              @Param("phone") String phone);
    /**
     * 根据条件查询可被选择的快车司机列表
     * 根据条件查询可被选择的专车司机列表
     * @return
     */
    List<Map<String,Object>> getCanSelectSmallDriverList(@Param("page") Page<Map<String, Object>> page,
@@ -55,17 +54,6 @@
                                                         @Param("type") Integer type,
                                                              @Param("name") String name,
                                                              @Param("phone") String phone);
    /**
     * 根据条件查询可被选择的快车司机列表
     * @return
     */
    List<Map<String,Object>> getCanSelectTaxiCarDriverList(@Param("page") Page<Map<String, Object>> page,
                                                              @Param("companyId") Integer companyId,
                                                              @Param("name") String name,
                                                              @Param("phone") String phone,
                                                              @Param("driverId") Integer driverId);
    /**
@@ -117,161 +105,4 @@
                                                       @Param("orderState") Integer orderState,
                                                       @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getTaxiReassignOrderList(@Param("page") Page<Map<String, Object>> page,
                                                       @Param("roleType") Integer roleType,
                                                       @Param("nowUserId") Integer nowUserId,
                                                       @Param("beginTime") String beginTime,
                                                       @Param("endTime") String endTime,
                                                       @Param("originalDriverName") String originalDriverName,
                                                       @Param("originalDriverPhone") String originalDriverPhone,
                                                       @Param("orderNum") String orderNum,
                                                       @Param("nowDriverName") String nowDriverName,
                                                       @Param("nowDriverPhone") String nowDriverPhone,
                                                       @Param("orderState") Integer orderState,
                                                       @Param("state") Integer state);
    /**
     * 根据条件查询快车改派订单列表
     */
    List<Map<String,Object>> getPrivateCarReassignOrderListEx(
            @Param("roleType") Integer roleType,
            @Param("nowUserId") Integer nowUserId,
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("originalDriverName") String originalDriverName,
            @Param("originalDriverPhone") String originalDriverPhone,
            @Param("orderNum") String orderNum,
            @Param("nowDriverName") String nowDriverName,
            @Param("nowDriverPhone") String nowDriverPhone,
            @Param("orderState") Integer orderState,
            @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getCrossReassignOrderListEx(
            @Param("roleType") Integer roleType,
            @Param("nowUserId") Integer nowUserId,
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("originalDriverName") String originalDriverName,
            @Param("originalDriverPhone") String originalDriverPhone,
            @Param("orderNum") String orderNum,
            @Param("nowDriverName") String nowDriverName,
            @Param("nowDriverPhone") String nowDriverPhone,
            @Param("orderState") Integer orderState,
            @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getSmallPieceLogisticsListEx(
            @Param("roleType") Integer roleType,
            @Param("nowUserId") Integer nowUserId,
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("originalDriverName") String originalDriverName,
            @Param("originalDriverPhone") String originalDriverPhone,
            @Param("orderNum") String orderNum,
            @Param("nowDriverName") String nowDriverName,
            @Param("nowDriverPhone") String nowDriverPhone,
            @Param("orderState") Integer orderState,
            @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getTaxiReassignOrderListEx(
            @Param("roleType") Integer roleType,
            @Param("nowUserId") Integer nowUserId,
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("originalDriverName") String originalDriverName,
            @Param("originalDriverPhone") String originalDriverPhone,
            @Param("orderNum") String orderNum,
            @Param("nowDriverName") String nowDriverName,
            @Param("nowDriverPhone") String nowDriverPhone,
            @Param("orderState") Integer orderState,
            @Param("state") Integer state);
    /**
     * 根据条件查询快车改派订单列表
     */
    List<Map<String,Object>> getPrivateCarReassignOrderListMoney(
            @Param("roleType") Integer roleType,
            @Param("nowUserId") Integer nowUserId,
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("originalDriverName") String originalDriverName,
            @Param("originalDriverPhone") String originalDriverPhone,
            @Param("orderNum") String orderNum,
            @Param("nowDriverName") String nowDriverName,
            @Param("nowDriverPhone") String nowDriverPhone,
            @Param("orderState") Integer orderState,
            @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getCrossReassignOrderListMoney(
            @Param("roleType") Integer roleType,
            @Param("nowUserId") Integer nowUserId,
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("originalDriverName") String originalDriverName,
            @Param("originalDriverPhone") String originalDriverPhone,
            @Param("orderNum") String orderNum,
            @Param("nowDriverName") String nowDriverName,
            @Param("nowDriverPhone") String nowDriverPhone,
            @Param("orderState") Integer orderState,
            @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getSmallPieceLogisticsListMoney(
            @Param("roleType") Integer roleType,
            @Param("nowUserId") Integer nowUserId,
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("originalDriverName") String originalDriverName,
            @Param("originalDriverPhone") String originalDriverPhone,
            @Param("orderNum") String orderNum,
            @Param("nowDriverName") String nowDriverName,
            @Param("nowDriverPhone") String nowDriverPhone,
            @Param("orderState") Integer orderState,
            @Param("state") Integer state);
    /**
     * 根据条件查询跨城改派订单列表
     */
    List<Map<String,Object>> getTaxiReassignOrderListMoney(
            @Param("roleType") Integer roleType,
            @Param("nowUserId") Integer nowUserId,
            @Param("beginTime") String beginTime,
            @Param("endTime") String endTime,
            @Param("originalDriverName") String originalDriverName,
            @Param("originalDriverPhone") String originalDriverPhone,
            @Param("orderNum") String orderNum,
            @Param("nowDriverName") String nowDriverName,
            @Param("nowDriverPhone") String nowDriverPhone,
            @Param("orderState") Integer orderState,
            @Param("state") Integer state);
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java
@@ -28,8 +28,7 @@
                                         @Param("name") String name,
                                         @Param("insertUser") String insertUser,
                                         @Param("city") String city,
                                         @Param("state") Integer state,
                                         @Param("type") Integer type);
                                         @Param("state") Integer state);
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysTimeoutMoneyService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysWithdrawalPoundageService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java
@@ -19,7 +19,7 @@
public interface ITSystemPriceService extends IService<TSystemPrice> {
    /**
     * 查询快车价格设置
     * 查询专车价格设置
     */
    List<Map<String,Object>> getSpecialPriceList(@Param("page") Page<Map<String, Object>> page,
                                                 @Param("companyId") Integer companyId,
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITTaxiCardPaymentService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITTaxiCardService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITTimeoutAppealService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITransactionDetailsService.java
@@ -14,7 +14,7 @@
     * @param state     状态(1=添加,2=减少)
     * @param type      类型(1=金额,2=积分)
     * @param userType  用户类型(1=用户,2=司机)
     * @param orderType 订单类型(1=快车,2=出租车,3=城际,4=小件物流,5=余额充值,6=余额提现)
     * @param orderType 订单类型(1=专车,2=出租车,3=城际,4=小件物流,5=余额充值,6=余额提现)
     * @param orderId
     * @throws Exception
     */
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
@@ -26,30 +26,12 @@
                                     Integer couponActivityId,
                                     Integer activityType,Integer state);
    ///   用于导出
    List<Map<String,Object>> getListt(String beginTime,
                                     String endTime,
                                     String userName,
                                     String userPhone,
                                     Integer couponActivityId,
                                     Integer activityType,Integer state);
    List<Map<String,Object>> getRedList(Page<Map<String, Object>> page,
                                     String beginTime,
                                     String endTime,
                                     String userName,
                                     String userPhone,
                                     Integer couponActivityId,Integer state);
    ///   用于导出
    List<Map<String,Object>> getRedListt(String beginTime,
                                        String endTime,
                                        String userName,
                                        String userPhone,
                                        Integer couponActivityId,Integer state);
    /**
     * 统计优惠券
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserMerchantCouponService.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarRentalServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintDeductmoneyServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java
@@ -1,17 +1,12 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
import com.stylefeng.guns.modular.system.dao.DriverActivityHistoryMapper;
import com.stylefeng.guns.modular.system.service.IDriverActivityHistoryService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,57 +23,5 @@
    @Override
    public List<Map<String, Object>> getList(Page<Map<String, Object>> page, Integer activityId, Integer type) {
        return this.baseMapper.getList(page,activityId,type);
    }
    @Override
    public List<Map<String, Object>> getListt(Integer activityId, Integer type) {
        return this.baseMapper.getListt(activityId, type);
    }
    @Override
    public Map<String, Object> rewardDetailsList(String driverName, String driverPhone, String createTime, Integer offset, Integer limit) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            String[] split = createTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        List<Map<String, Object>> list = this.baseMapper.rewardDetailsList(ShiroKit.getUser().getObjectId(), driverName, driverPhone, startTime, endTime, offset, limit);
        int count = this.baseMapper.rewardDetailsListCount(ShiroKit.getUser().getObjectId(), driverName, driverPhone, startTime, endTime);
        Double aDouble = this.baseMapper.rewardDetailsListSum(ShiroKit.getUser().getObjectId(), driverName, driverPhone, startTime, endTime);
        Map<String, Object> map1 = new HashMap<>();
        map1.put("insertTime", "合计");
        map1.put("money", aDouble);
        list.add(map1);
        Map<String, Object> map = new HashMap<>();
        map.put("rows", list);
        map.put("total", count);
        return map;
    }
    @Override
    public HSSFWorkbook exportRewardDetails(String driverName, String driverPhone, String createTime) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            String[] split = createTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        List<Map<String, Object>> list = this.baseMapper.rewardDetailsList(ShiroKit.getUser().getObjectId(), driverName, driverPhone, startTime, endTime, null, null);
        String[] title = new String[]{"时间", "司机名称", "活动名称", "活动总收益"};
        String[][] values = new String[list.size()][5];
        for (int i = 0; i < list.size(); i++) {
            Map<String, Object> map = list.get(i);
            values[i][0] = null != map.get("insertTime") ? map.get("insertTime").toString() : "";
            values[i][1] = null != map.get("name") ? map.get("name").toString() : "";
            values[i][2] = null != map.get("activityName") ? map.get("activityName").toString() : "";
            values[i][3] = null != map.get("money") ? map.get("money").toString() : "";
        }
        return ExcelUtil.getHSSFWorkbook("奖励明细", title, values, null);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -70,7 +70,7 @@
            driverActivity.setStartTime(startTimes);
            driverActivity.setEndTime(endTimes);
            driverActivity.insertOrUpdate();
            //添加在线活动-快车
            //添加在线活动-专车
            DriverActivityOnline driverActivityOnline = new DriverActivityOnline();
            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
            driverActivityOnline.setDriverActivityId(driverActivity.getId());
@@ -153,7 +153,7 @@
            driverActivity.setEndTime(endTimes);
            driverActivity.insertOrUpdate();
            //添加在线活动-快车
            //添加在线活动-专车
            DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",1));
            if(driverActivityOnline==null){
                driverActivityOnline = new DriverActivityOnline();
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
@@ -1,47 +1,16 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.IncomeMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.service.IIncomeService;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.Date;
@Service
public class IncomeServiceImpl extends ServiceImpl<IncomeMapper, Income> implements IIncomeService {
    @Autowired
    private ITOrderPrivateCarService orderPrivateCarService;
    @Autowired
    private ITOrderTaxiService orderTaxiService;
    @Autowired
    private ITOrderCrossCityService orderCrossCityService;
    @Autowired
    private ITOrderLogisticsService orderLogisticsService;
    @Autowired
    private ITOrderCallService orderCallService;
    @Autowired
    private ITUserService userService;
    @Autowired
    private ITOrderCharteredCarService orderCharteredCarService;
    @Autowired
    private ITDriverService driverService;
    /**
@@ -64,428 +33,5 @@
        income.setMoney(money);
        income.setInsertTime(new Date());
        this.insert(income);
    }
    @Override
    public Map<String, Object> summaryOfIncomeDetailsList(String insertTime, Integer offset, Integer limit) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(insertTime)){
            String[] split = insertTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        Map<String, Object> maps = new HashMap<>();
        List<Map<String, Object>> list = this.baseMapper.summaryOfIncomeDetailsList(ShiroKit.getUser().getObjectId(), startTime, endTime, offset, limit);
        List<Map<String, Object>> datas = new ArrayList<>();
        for (Map<String, Object> map : list) {
            String insertTime1 = map.get("insertTime").toString();
            List<Map<String, Object>> list2 = this.baseMapper.summaryOfIncomeDetailsListGroupSum(1, ShiroKit.getUser().getObjectId(), insertTime1);
            List<Map<String, Object>> list1 = new ArrayList<>();
            for (Map<String, Object> income : list2) {
                Double money = Double.valueOf(income.get("money").toString());
                Double overtimeDeduction = Double.valueOf(income.get("overtimeDeduction").toString());
                Double complaint = Double.valueOf(income.get("complaint").toString());
                Double payMoney = Double.valueOf(income.get("payMoney").toString());
                Map<String, Object> row = new HashMap<>();
                row.put("orderType", "");//订单类型
                row.put("type", "");//收益类型
                row.put("userName", null == income.get("nickName") ? "" : income.get("nickName").toString());//用户姓名
                row.put("userPhone", null == income.get("phone") ? "" : income.get("phone").toString());//用户电话
                row.put("orderPayMoney", payMoney);//订单支付金额
                row.put("orderRevenue", money);//订单收益
                row.put("taxiCardRevenue", 0);//打车卡收益
                row.put("overtimeDeduction", overtimeDeduction);//超时扣款收益
                row.put("complaintDeductionProceeds", complaint);//投诉扣款收益
                row.put("other", 0);//其他
                if(null != income.get("orderType")){
                    Integer orderType = Integer.valueOf(income.get("orderType").toString());
                    if(orderType != null){
                        switch (orderType){
                            case 1:
                                row.put("orderType", "快车");
                                break;
                            case 2:
                                row.put("orderType", "出租车");
                                break;
                            case 3:
                                row.put("orderType", "跨城出行");
                                break;
                            case 4:
                                row.put("orderType", "同城小件物流");
                                break;
                            case 5:
                                row.put("orderType", "跨城小件物流");
                                break;
                            case 6:
                                row.put("orderType", "包车");
                                break;
                            case 7:
                                row.put("orderType", "95128");
                                break;
                        }
                    }
                }
                Integer type = Integer.valueOf(income.get("type").toString());
                switch (type){
                    case 1:
                        row.put("type", "活动收入");
                        break;
                    case 2:
                        row.put("type", "跑单收入");
                        break;
                    case 3:
                        row.put("type", "取消订单收入");
                        break;
                    case 4:
                        row.put("type", "改派订单收入");
                        break;
                    case 5:
                        row.put("type", "购买出行卡");
                        break;
                    case 6:
                        row.put("type", "感谢费");
                        break;
                    case 7:
                        row.put("type", "超时扣款");
                        break;
                    case 8:
                        row.put("type", "投诉扣款");
                        break;
                    case 9:
                        row.put("type", "小件物流超时退款");
                        break;
                }
                list1.add(row);
            }
            Double sumData = this.baseMapper.getSumData(1, ShiroKit.getUser().getObjectId(), insertTime1, Arrays.asList(5));
            Map<String, Object> row = new HashMap<>();
            row.put("orderType", "");//订单类型
            row.put("type", "购买出行卡");//收益类型
            row.put("userName", "");//用户姓名
            row.put("userPhone", "");//用户电话
            row.put("orderPayMoney", 0);//订单支付金额
            row.put("orderRevenue", 0);//订单收益
            row.put("taxiCardRevenue", null == sumData ? 0 : sumData);//打车卡收益
            row.put("overtimeDeduction", 0);//超时扣款收益
            row.put("complaintDeductionProceeds", 0);//投诉扣款收益
            row.put("other", 0);//其他
            list1.add(row);
            sumData = this.baseMapper.getSumData(1, ShiroKit.getUser().getObjectId(), insertTime1, Arrays.asList(1, 3, 4, 6, 9));
            row = new HashMap<>();
            row.put("orderType", "");//订单类型
            row.put("type", "其他");//收益类型
            row.put("userName", "");//用户姓名
            row.put("userPhone", "");//用户电话
            row.put("orderPayMoney", 0);//订单支付金额
            row.put("orderRevenue", 0);//订单收益
            row.put("taxiCardRevenue", 0);//打车卡收益
            row.put("overtimeDeduction", 0);//超时扣款收益
            row.put("complaintDeductionProceeds", 0);//投诉扣款收益
            row.put("other", sumData);//其他
            list1.add(row);
            if(list1.size() > 0){
                Map<String, Object> data = new HashMap<>();
                data.put("insertTime", insertTime1);
                data.put("list", list1);
                datas.add(data);
            }
        }
        int count = this.baseMapper.summaryOfIncomeDetailsListCount(ShiroKit.getUser().getObjectId(), startTime, endTime);
        Map<String, Object> map = this.baseMapper.summaryOfIncomeDetailsListSum(ShiroKit.getUser().getObjectId(), startTime, endTime);
        Map<String, Object> data = new HashMap<>();
        data.put("insertTime", "合计");
        List<Map<String, Object>> list1 = new ArrayList<>();
        list1.add(map);
        data.put("list", list1);
        datas.add(data);
        maps.put("rows", datas);
        maps.put("total", count);
        return maps;
    }
    @Override
    public HSSFWorkbook exportSummaryOfIncomeDetails(String insertTime) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(insertTime)){
            String[] split = insertTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        List<Map<String, Object>> list = this.baseMapper.summaryOfIncomeDetailsList(ShiroKit.getUser().getObjectId(), startTime, endTime, null, null);
        List<Map<String, Object>> datas = new ArrayList<>();
        Integer num = 0;
        for (Map<String, Object> map : list) {
            String insertTime1 = map.get("insertTime").toString();
            List<Map<String, Object>> list2 = this.baseMapper.summaryOfIncomeDetailsListGroupSum(1, ShiroKit.getUser().getObjectId(), insertTime1);
            List<Map<String, Object>> list1 = new ArrayList<>();
            for (Map<String, Object> income : list2) {
                Double money = Double.valueOf(income.get("money").toString());
                Double overtimeDeduction = Double.valueOf(income.get("overtimeDeduction").toString());
                Double complaint = Double.valueOf(income.get("complaint").toString());
                Double payMoney = Double.valueOf(income.get("payMoney").toString());
                Map<String, Object> row = new HashMap<>();
                row.put("orderType", "");//订单类型
                row.put("type", "");//收益类型
                row.put("userName", null == income.get("nickName") ? "" : income.get("nickName").toString());//用户姓名
                row.put("userPhone", null == income.get("phone") ? "" : income.get("phone").toString());//用户电话
                row.put("orderPayMoney", payMoney);//订单支付金额
                row.put("orderRevenue", money);//订单收益
                row.put("taxiCardRevenue", 0);//打车卡收益
                row.put("overtimeDeduction", overtimeDeduction);//超时扣款收益
                row.put("complaintDeductionProceeds", complaint);//投诉扣款收益
                row.put("other", 0);//其他
                if(null != income.get("orderType")){
                    Integer orderType = Integer.valueOf(income.get("orderType").toString());
                    if(orderType != null){
                        switch (orderType){
                            case 1:
                                row.put("orderType", "快车");
                                break;
                            case 2:
                                row.put("orderType", "出租车");
                                break;
                            case 3:
                                row.put("orderType", "跨城出行");
                                break;
                            case 4:
                                row.put("orderType", "同城小件物流");
                                break;
                            case 5:
                                row.put("orderType", "跨城小件物流");
                                break;
                            case 6:
                                row.put("orderType", "包车");
                                break;
                            case 7:
                                row.put("orderType", "95128");
                                break;
                        }
                    }
                }
                Integer type = Integer.valueOf(income.get("type").toString());
                switch (type){
                    case 1:
                        row.put("type", "活动收入");
                        break;
                    case 2:
                        row.put("type", "跑单收入");
                        break;
                    case 3:
                        row.put("type", "取消订单收入");
                        break;
                    case 4:
                        row.put("type", "改派订单收入");
                        break;
                    case 5:
                        row.put("type", "购买出行卡");
                        break;
                    case 6:
                        row.put("type", "感谢费");
                        break;
                    case 7:
                        row.put("type", "超时扣款");
                        break;
                    case 8:
                        row.put("type", "投诉扣款");
                        break;
                    case 9:
                        row.put("type", "小件物流超时退款");
                        break;
                }
                list1.add(row);
            }
            Double sumData = this.baseMapper.getSumData(1, ShiroKit.getUser().getObjectId(), insertTime1, Arrays.asList(5));
            Map<String, Object> row = new HashMap<>();
            row.put("orderType", "");//订单类型
            row.put("type", "购买出行卡");//收益类型
            row.put("userName", "");//用户姓名
            row.put("userPhone", "");//用户电话
            row.put("orderPayMoney", 0);//订单支付金额
            row.put("orderRevenue", 0);//订单收益
            row.put("taxiCardRevenue", sumData);//打车卡收益
            row.put("overtimeDeduction", 0);//超时扣款收益
            row.put("complaintDeductionProceeds", 0);//投诉扣款收益
            row.put("other", 0);//其他
            list1.add(row);
            sumData = this.baseMapper.getSumData(1, ShiroKit.getUser().getObjectId(), insertTime1, Arrays.asList(1, 3, 4, 6, 9));
            row = new HashMap<>();
            row.put("orderType", "");//订单类型
            row.put("type", "其他");//收益类型
            row.put("userName", "");//用户姓名
            row.put("userPhone", "");//用户电话
            row.put("orderPayMoney", 0);//订单支付金额
            row.put("orderRevenue", 0);//订单收益
            row.put("taxiCardRevenue", 0);//打车卡收益
            row.put("overtimeDeduction", 0);//超时扣款收益
            row.put("complaintDeductionProceeds", 0);//投诉扣款收益
            row.put("other", sumData);//其他
            list1.add(row);
            if(list1.size() > 0){
                Map<String, Object> data = new HashMap<>();
                data.put("insertTime", insertTime1);
                data.put("list", list1);
                datas.add(data);
            }
            num += list1.size();
        }
        String[] title = new String[]{"时间", "订单", "收益类型", "用户名称", "用户手机号", "订单支付金额", "平台订单收益", "打车卡收益", "超时扣款收益", "司机投诉扣款平台收益", "其他收入", "收入合计"};
        String[][] values = new String[num][12];
        int n = 0;
        for (int i = 0; i < datas.size(); i++) {
            Map<String, Object> map = datas.get(i);
            Object insertTime1 = map.get("insertTime");
            List<Map<String, Object>> list1 = (List<Map<String, Object>>)map.get("list");
            for (int j = 0; j < list1.size(); j++) {
                Map<String, Object> map1 = list1.get(j);
                values[n][0] = insertTime1.toString();
                values[n][1] = null != map1.get("orderType") ? map1.get("orderType").toString() : "";
                values[n][2] = null != map1.get("type") ? map1.get("type").toString() : "";
                values[n][3] = null != map1.get("userName") ? map1.get("userName").toString() : "";
                values[n][4] = null != map1.get("userPhone") ? map1.get("userPhone").toString() : "";
                values[n][5] = null != map1.get("orderPayMoney") ? map1.get("orderPayMoney").toString() : "";
                values[n][6] = null != map1.get("orderRevenue") ? map1.get("orderRevenue").toString() : "";
                values[n][7] = null != map1.get("taxiCardRevenue") ? map1.get("taxiCardRevenue").toString() : "";
                values[n][8] = null != map1.get("overtimeDeduction") ? map1.get("overtimeDeduction").toString() : "";
                values[n][9] = null != map1.get("complaintDeductionProceeds") ? map1.get("complaintDeductionProceeds").toString() : "";
                values[n][10] = null != map1.get("other") ? map1.get("other").toString() : "";
                BigDecimal all = new BigDecimal(ToolUtil.isNotEmpty(map1.get("orderRevenue")) ? map1.get("orderRevenue").toString() : "0")
                        .add(new BigDecimal(ToolUtil.isNotEmpty(map1.get("taxiCardRevenue")) ? map1.get("taxiCardRevenue").toString() : "0"))
                        .add(new BigDecimal(ToolUtil.isNotEmpty(map1.get("overtimeDeduction")) ? map1.get("overtimeDeduction").toString() : "0"))
                        .add(new BigDecimal(ToolUtil.isNotEmpty(map1.get("complaintDeductionProceeds")) ? map1.get("complaintDeductionProceeds").toString() : "0"))
                        .add(new BigDecimal(ToolUtil.isNotEmpty(map1.get("other")) ? map1.get("other").toString() : "0"));
                values[n][11] = all.toPlainString();
                n++;
            }
        }
        return ExcelUtil.getHSSFWorkbookTime("收入明细汇总", title, values, null,insertTime);
    }
    @Override
    public Map<String, Object> summaryOfSpendingDetailsList(String insertTime, Integer offset, Integer limit) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(insertTime)){
            String[] split = insertTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        Map<String, Object> maps = new HashMap<>();
        List<Map<String, Object>> list = this.baseMapper.summaryOfSpendingDetailsList(ShiroKit.getUser().getObjectId(), startTime, endTime, offset, limit);
        List<Map<String, Object>> datas = new ArrayList<>();
        for (Map<String, Object> map : list) {
            String insertTime1 = map.get("insertTime").toString();
            List<Map<String, Object>> list1 = this.baseMapper.summaryOfSpendingDetailsList1(insertTime1);
            Map<String, Object> data = new HashMap<>();
            data.put("insertTime", insertTime1);
            data.put("list", list1);
            datas.add(data);
        }
        int count = this.baseMapper.summaryOfSpendingDetailsListCount(ShiroKit.getUser().getObjectId(), startTime, endTime);
        Map<String, Object> map = this.baseMapper.summaryOfSpendingDetailsListSum(ShiroKit.getUser().getObjectId(), startTime, endTime);
        Map<String, Object> data = new HashMap<>();
        data.put("insertTime", "合计");
        List<Map<String, Object>> list1 = new ArrayList<>();
        list1.add(map);
        data.put("list", list1);
        datas.add(data);
        maps.put("rows", datas);
        maps.put("total", count);
        return maps;
    }
    @Override
    public HSSFWorkbook exportSummaryOfSpendingDetails(String insertTime) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(insertTime)){
            String[] split = insertTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        int num = 0;
        List<Map<String, Object>> list = this.baseMapper.summaryOfSpendingDetailsList(ShiroKit.getUser().getObjectId(), startTime, endTime, null, null);
        List<Map<String, Object>> datas = new ArrayList<>();
        for (Map<String, Object> map : list) {
            String insertTime1 = map.get("insertTime").toString();
            List<Map<String, Object>> list1 = this.baseMapper.summaryOfSpendingDetailsList1(insertTime1);
            Map<String, Object> data = new HashMap<>();
            data.put("insertTime", insertTime1);
            data.put("list", list1);
            datas.add(data);
            num += list1.size();
        }
        String[] title = new String[]{"时间", "订单类型", "收益类型", "司机名称", "司机手机号", "应支付金额", "平台奖励", "其他支出", "支出合计"};
        String[][] values = new String[num][12];
        int n = 0;
        for (int i = 0; i < datas.size(); i++) {
            Map<String, Object> map = datas.get(i);
            Object insertTime1 = map.get("insertTime");
            List<Map<String, Object>> list1 = (List<Map<String, Object>>)map.get("list");
            for (int j = 0; j < list1.size(); j++) {
                Map<String, Object> map1 = list1.get(j);
                values[n][0] = insertTime1.toString();
                values[n][1] = "";
                if(null != map1.get("orderType")){
                    switch (Integer.valueOf(map1.get("orderType").toString())){
                        case 1:
                            values[n][1] = "快车";
                            break;
                        case 2:
                            values[n][1] = "出租车";
                            break;
                        case 3:
                            values[n][1] = "跨城跨城出行小件物流";
                            break;
                        case 4:
                            values[n][1] = "同城小件物流";
                            break;
                        case 5:
                            values[n][1] = "跨城小件物流";
                            break;
                        case 6:
                            values[n][1] = "包车";
                            break;
                        case 7:
                            values[n][1] = "95128";
                            break;
                    }
                }
                values[n][2] = null != map1.get("type") ? map1.get("type").toString() : "";
                values[n][3] = null != map1.get("name") ? map1.get("name").toString() : "";
                values[n][4] = null != map1.get("phone") ? map1.get("phone").toString() : "";
                values[n][6] = null != map1.get("orderRevenue") ? map1.get("orderRevenue").toString() : "";
                values[n][7] = null != map1.get("activityAward") ? map1.get("activityAward").toString() : "";
                values[n][10] = null != map1.get("other") ? map1.get("other").toString() : "";
                values[n][11] = null != map1.get("all") ? map1.get("all").toString() : "";
                n++;
            }
        }
        return ExcelUtil.getHSSFWorkbookTime("支出明细汇总", title, values, null,insertTime);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MerchantActivityServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MerchantActivitySlaveServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MerchantCouponServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MessNumServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PaymentRecordServiceImpl.java
@@ -9,7 +9,6 @@
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service
@@ -61,10 +60,5 @@
    public List<PaymentRecord> query(Integer category, Integer userId, Integer type, Integer orderId, Integer orderType,
                      Integer payType, Integer state) throws Exception {
        return paymentRecordMapper.query(category, userId, type, orderId, orderType, payType, state);
    }
    @Override
    public List<Map<String, Object>> exportRecord(String userName, String phone, String code, String startTime, String endTime) {
        return this.baseMapper.exportRecord(userName, phone, code, startTime, endTime);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RecruitServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SellingCarServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ShowModularServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SpellOrderRuleServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdditionalFeeServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBalanceModifyRecordServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
@@ -10,7 +10,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.poi.hssf.usermodel.*;
//import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.stereotype.Service;
@@ -119,7 +119,7 @@
        List<List<String>> lists = new ArrayList<>();
        List<String> list1 = new ArrayList<>();
        list1.add("类别:");
        list1.add(type == 1 ? "快车" : type == 2 ? "出租车" : type == 3 ? "城际" : "小件物流");
        list1.add(type == 1 ? "专车" : type == 2 ? "出租车" : type == 3 ? "城际" : "小件物流");
        list1.add("");
        list1.add("");
        list1.add("起止时间:");
@@ -191,12 +191,12 @@
            HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据(标题)
            HSSFCellStyle style = hssfWorkbook.createCellStyle();
            HSSFFont font = hssfWorkbook.createFont();
//            font.setBold(true);
            font.setBold(true);
            style.setFont(font);
//            style.setAlignment(HorizontalAlignment.CENTER);
            style.setAlignment(HorizontalAlignment.CENTER);
            for (int l = 0; l < lists.get(i).size(); l++) {
                HSSFCell hssfCell = hssfRow.createCell(l);
//                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellValue(lists.get(i).get(l));
                hssfCell.setCellStyle(style);
                if(l > 0) {
@@ -227,26 +227,11 @@
                data = lists1.get(i).get(l);
                for (int j = 0; j < data.size(); j++) {
                    HSSFCell hssfCell = row.createCell(j);
//                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellValue(data.get(j));
                }
            }
        }
        return hssfWorkbook;
    }
    @Override
    public List<Map<String, Object>> getCompanyIncomeList(Page<Map<String, Object>> page, String beginTime, String endTime, String userId) {
        return this.baseMapper.getCompanyIncomeList(page,beginTime,endTime,userId);
    }
    @Override
    public List<Map<String, Object>> getCompanyIncomeListEx(String beginTime, String endTime, String userId) {
        return this.baseMapper.getCompanyIncomeListEx(beginTime,endTime,userId);
    }
    @Override
    public Double getSumCompanyIncomeMoney(String beginTime, String endTime, String userId) {
        return this.baseMapper.getSumCompanyIncomeMoney(beginTime,endTime,userId);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java
@@ -22,7 +22,7 @@
public class TComplaintServiceImpl extends ServiceImpl<TComplaintMapper, TComplaint> implements ITComplaintService {
    @Override
    public List<Map<String, Object>> getComplaintList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String userName, String userPhone, String driverPhone, Integer isHandle,Integer driverId) {
        return this.baseMapper.getComplaintList(page, roleType, nowUserId, beginTime, endTime, userName, userPhone, driverPhone, isHandle,driverId);
    public List<Map<String, Object>> getComplaintList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String userName, String userPhone, String driverPhone, Integer isHandle) {
        return this.baseMapper.getComplaintList(page, roleType, nowUserId, beginTime, endTime, userName, userPhone, driverPhone, isHandle);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -1,18 +1,13 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.dao.TDriverMapper;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import com.stylefeng.guns.modular.system.util.AESUtil;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -29,7 +24,18 @@
    @Override
    public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName, String phone, String account, Integer addType, Integer authState) {
        return this.baseMapper.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState);
        List<Map<String, Object>> authDriverList = this.baseMapper.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState);
//        for (Map<String, Object> map : authDriverList) {
//            Object account1 = map.get("account");
//            Object phone1 = map.get("phone");
//            if(null != account1){
//                map.put("account", AESUtil.decrypt(account1.toString()));
//            }
//            if(null != phone1){
//                map.put("phone", AESUtil.decrypt(phone1.toString()));
//            }
//        }
        return authDriverList;
    }
    @Override
@@ -39,7 +45,18 @@
    @Override
    public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState) {
        return this.baseMapper.getDriverList(page,roleType,nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
        List<Map<String, Object>> driverList = this.baseMapper.getDriverList(page, roleType, nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
//        for (Map<String, Object> map : driverList) {
//            Object account1 = map.get("account");
//            Object phone1 = map.get("phone");
//            if(null != account1){
//                map.put("account", AESUtil.decrypt(account1.toString()));
//            }
//            if(null != phone1){
//                map.put("phone", AESUtil.decrypt(phone1.toString()));
//            }
//        }
        return driverList;
    }
    @Override
@@ -67,133 +84,4 @@
        return this.baseMapper.getDriverListNoPage(roleType, nowUserId);
    }
    @Override
    public List<Map<String, Object>> orderRevenueDetailsList(Page<Map<String, Object>> page, String driverName, String driverPhone, String createTime) {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            startTime = createTime.split(" - ")[0];
            endTime = createTime.split(" - ")[1];
        }
        List<Map<String, Object>> list = this.baseMapper.orderRevenueDetailsList(page, driverName, driverPhone, startTime, endTime, ShiroKit.getUser().getObjectId());
        Double aDouble = this.baseMapper.orderRevenueDetailsListSum(driverName, driverPhone, startTime, endTime, ShiroKit.getUser().getObjectId());
        Map<String, Object> map = new HashMap<>();
        map.put("insertTime", "合计");
        map.put("money", aDouble);
        list.add(map);
        return list;
    }
    @Override
    public HSSFWorkbook exportOrderRevenueDetails(String driverName, String driverPhone, String createTime) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            startTime = createTime.split(" - ")[0];
            endTime = createTime.split(" - ")[1];
        }
        List<Map<String, Object>> list = this.baseMapper.exportOrderRevenueDetails(driverName, driverPhone, startTime, endTime, ShiroKit.getUser().getObjectId());
        String[] title = new String[]{"时间", "司机名称", "订单号", "订单类型", "订单收益"};
        String[][] values = new String[list.size()][5];
        for (int i = 0; i < list.size(); i++) {
            Map<String, Object> map = list.get(i);
            values[i][0] = null != map.get("insertTime") ? map.get("insertTime").toString() : "";
            values[i][1] = null != map.get("name") ? map.get("name").toString() : "";
            values[i][2] = null != map.get("orderNum") ? map.get("orderNum").toString() : "";
            if(null != map.get("orderType")){
                switch (Integer.valueOf(map.get("orderType").toString())){
                    case 1:
                        values[i][3] = "快车";
                        break;
                    case 2:
                        values[i][3] = "出租车";
                        break;
                    case 3:
                        values[i][3] = "跨城出行";
                        break;
                    case 4:
                        values[i][3] = "同城小件物流";
                        break;
                    case 5:
                        values[i][3] = "跨城小件物流";
                        break;
                    case 6:
                        values[i][3] = "包车出行";
                        break;
                    case 7:
                        values[i][3] = "95128";
                        break;
                }
            }
            values[i][4] = null != map.get("money") ? map.get("money").toString() : "";
        }
        return ExcelUtil.getHSSFWorkbook("司机订单收益明细", title, values, null);
    }
    @Override
    public Map<String, Object> otherSpendingDetailList(String driverName, String driverPhone, String createTime, Integer offset, Integer limit) {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            startTime = createTime.split(" - ")[0];
            endTime = createTime.split(" - ")[1];
        }
        List<Map<String, Object>> list = this.baseMapper.otherSpendingDetailList(driverName, driverPhone, startTime, endTime, offset, limit);
        Integer integer = this.baseMapper.otherSpendingDetailListCount(driverName, driverPhone, startTime, endTime);
        Map<String, Object> maps = this.baseMapper.otherSpendingDetailListSum(driverName, driverPhone, startTime, endTime);
        list.add(maps);
        Map<String, Object> map = new HashMap<>();
        map.put("rows", list);
        map.put("total", integer);
        return map;
    }
    @Override
    public HSSFWorkbook exportOtherSpendingDetailList(String driverName, String driverPhone, String createTime) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            startTime = createTime.split(" - ")[0];
            endTime = createTime.split(" - ")[1];
        }
        List<Map<String, Object>> list = this.baseMapper.otherSpendingDetailList(driverName, driverPhone, startTime, endTime, null, null);
        String[] title = new String[]{"时间", "司机名称", "手机号", "订单类型", "感谢费", "附加费"};
        String[][] values = new String[list.size()][5];
        for (int i = 0; i < list.size(); i++) {
            Map<String, Object> map = list.get(i);
            values[i][0] = null != map.get("travelTime") ? map.get("travelTime").toString() : "";
            values[i][1] = null != map.get("name") ? map.get("name").toString() : "";
            values[i][2] = null != map.get("phone") ? map.get("phone").toString() : "";
            if(null != map.get("type")){
                switch (Integer.valueOf(map.get("type").toString())){
                    case 1:
                        values[i][3] = "快车";
                        break;
                    case 2:
                        values[i][3] = "出租车";
                        break;
                    case 3:
                        values[i][3] = "跨城出行";
                        break;
                    case 4:
                        values[i][3] = "同城小件物流";
                        break;
                    case 5:
                        values[i][3] = "跨城小件物流";
                        break;
                    case 6:
                        values[i][3] = "包车出行";
                        break;
                    case 7:
                        values[i][3] = "95128";
                        break;
                }
            }
            values[i][4] = null != map.get("thankYouFee") ? map.get("thankYouFee").toString() : "";
            values[i][5] = null != map.get("amount") ? map.get("amount").toString() : "";
        }
        return ExcelUtil.getHSSFWorkbook("平台其他支出明细", title, values, null);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java
@@ -22,8 +22,8 @@
public class TLineServiceImpl extends ServiceImpl<TLineMapper, TLine> implements ITLineService {
    @Override
    public List<Map<String, Object>> getLineList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String insertUser, String modelStr, Integer state,Integer type) {
        return this.baseMapper.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state,type);
    public List<Map<String, Object>> getLineList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String insertUser, String modelStr, Integer state) {
        return this.baseMapper.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state);
    }
    @Override
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TMerchantActivityServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TMerchantServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOfflineTravelPaymentServiceImpl.java
New file
@@ -0,0 +1,40 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.model.TOfflineTravelPayment;
import com.stylefeng.guns.modular.system.dao.TOfflineTravelPaymentMapper;
import com.stylefeng.guns.modular.system.service.ITOfflineTravelPaymentService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.List;
/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author stylefeng
 * @since 2023-04-14
 */
@Service
public class TOfflineTravelPaymentServiceImpl extends ServiceImpl<TOfflineTravelPaymentMapper, TOfflineTravelPayment> implements ITOfflineTravelPaymentService {
    @Autowired
    private  TOfflineTravelPaymentMapper tOfflineTravelPaymentMapper;
    @Override
    public List<TOfflineTravelPayment> getPageList(String driverName, String payTime) {
        Date startTimes = null;
        Date endTimes = null;
        if (StringUtils.hasLength(payTime)){
            String[] timeArray = payTime.split(" - ");
            startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
            endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
        }
        return tOfflineTravelPaymentMapper.getPageList(startTimes,endTimes,driverName);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderAdditionalFeeServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCallServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java
@@ -30,19 +30,4 @@
    public Map<String, Object> getLogisticsOrderDetailById(Integer orderId) {
        return this.baseMapper.getLogisticsOrderDetailById(orderId);
    }
    @Override
    public Map<String, Object> getTimeOutOrderSumMoney(String beginTime, String endTime, String phone, String name, String id, Integer companyId, Integer orderType) {
        return this.baseMapper.getTimeOutOrderSumMoney(beginTime,endTime,phone,name,id,companyId, orderType);
    }
    @Override
    public List<Map<String, Object>> getTimeOutOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, String phone, String name, String id, Integer companyId, Integer orderType) {
        return this.baseMapper.getTimeOutOrderList(page,beginTime,endTime,phone,name,id,companyId, orderType);
    }
    @Override
    public List<Map<String, Object>> getTimeOutOrderListEx(String beginTime, String endTime, String phone, String name, String id, Integer companyId, Integer orderType) {
        return this.baseMapper.getTimeOutOrderListEx(beginTime,endTime,phone,name,id,companyId, orderType);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
@@ -12,7 +12,7 @@
/**
 * <p>
 * 订单-快车 服务实现类
 * 订单-专车 服务实现类
 * </p>
 *
 * @author 吕雪
@@ -22,18 +22,12 @@
public class TOrderPrivateCarServiceImpl extends ServiceImpl<TOrderPrivateCarMapper, TOrderPrivateCar> implements ITOrderPrivateCarService {
    @Override
    public List<Map<String, Object>> getPrivateCarOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName,
                                                            String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType) {
        return this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType);
    public List<Map<String, Object>> getPrivateCarOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state) {
        return this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state);
    }
    @Override
    public Map<String, Object> getPrivateCarOrderDetailById(Integer orderId) {
        return this.baseMapper.getPrivateCarOrderDetailById(orderId);
    }
    @Override
    public List<Map<String, Object>> getSurcharge(Object id, Integer orderType) {
        return this.baseMapper.getSurcharge(id,orderType);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java
@@ -53,34 +53,4 @@
        return this.baseMapper.getAllIncomeMoney(companyId, beginTime, endTime);
    }
    @Override
    public List<Map<String, Object>> getOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, String userId, Integer type, String payType,Integer companyId) {
        return this.baseMapper.getOrderList(page,beginTime,endTime,userId,type,payType,companyId);
    }
    @Override
    public List<Map<String, Object>> getOrderListEx(String beginTime, String endTime, String userId, Integer type, String payType,Integer companyId) {
        return this.baseMapper.getOrderListEx(beginTime,endTime,userId,type,payType,companyId);
    }
    @Override
    public List<Map<String, Object>> getIncomeOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, String phone, String name, Integer state, Integer type,Integer companyId, Integer income) {
        return this.baseMapper.getIncomeOrderList(page,beginTime,endTime,phone,name,state,type,companyId, income);
    }
    @Override
    public List<Map<String, Object>> getIncomeOrderListEx(String beginTime, String endTime, String phone, String name, Integer state, Integer type,Integer companyId, Integer income) {
        return this.baseMapper.getIncomeOrderListEx(beginTime,endTime,phone,name,state,type,companyId, income);
    }
    @Override
    public Map<String, Object> getIncomeOrderSumMoney(String beginTime, String endTime, String phone, String name, Integer state, Integer type,Integer companyId, Integer income) {
        return this.baseMapper.getIncomeOrderSumMoney(beginTime,endTime,phone,name,state,type,companyId, income);
    }
    @Override
    public List<Map<String, Object>> queryOtherIncomeDetail(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNo, String name, String phone) {
        return this.baseMapper.queryOtherIncomeDetail(page, beginTime, endTime, orderNo, name, phone);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java
@@ -1,18 +1,12 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
import com.stylefeng.guns.modular.system.dao.TPubWithdrawalMapper;
import com.stylefeng.guns.modular.system.service.ITPubWithdrawalService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,136 +25,4 @@
    public List<Map<String, Object>> getWithdrawalList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, Integer withdrawalType) {
        return this.baseMapper.getWithdrawalList(page, beginTime, endTime, name, withdrawalType);
    }
    @Override
    public List<Map<String, Object>> getReportWithdrawalList(Page<Map<String, Object>> page, String beginTime, String endTime, String userId) {
        return this.baseMapper.getReportWithdrawalList(page, beginTime, endTime, userId);
    }
    @Override
    public List<Map<String, Object>> getReportWithdrawalListEx(String beginTime, String endTime, String userId) {
        return this.baseMapper.getReportWithdrawalListEx(beginTime, endTime, userId);
    }
    @Override
    public Map<String, Object> getSumMoney(String beginTime, String endTime, String userId) {
        return this.baseMapper.getSumMoney(beginTime, endTime, userId);
    }
    @Override
    public Map<String, Object> orderWithdrawalDetailsList(String driverName, String driverPhone, String createTime, Integer offset, Integer limit) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            String[] split = createTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        Map<String, Object> map = new HashMap<>();
        List<Map<String, Object>> list = this.baseMapper.orderWithdrawalDetailsList(ShiroKit.getUser().getObjectId(), 2, driverName, driverPhone, startTime, endTime, offset, limit);
        int count = this.baseMapper.orderWithdrawalDetailsListCount(ShiroKit.getUser().getObjectId(), 2, driverName, driverPhone, startTime, endTime);
        List<Map<String, Object>> list1 = this.baseMapper.orderWithdrawalDetailsList(ShiroKit.getUser().getObjectId(), 2, driverName, driverPhone, startTime, endTime, null, null);
        BigDecimal money = new BigDecimal("0");//提现金额
        BigDecimal poundage = new BigDecimal("0");//手续费
        BigDecimal balance = new BigDecimal("0");//未提现金额
        for (Map<String, Object> map1 : list1) {
            money = money.add(new BigDecimal(null != map1.get("money") ? map1.get("money").toString() : "0"));
            poundage = poundage.add(new BigDecimal(null != map1.get("poundage") ? map1.get("poundage").toString() : "0"));
            balance = balance.add(new BigDecimal(null != map1.get("balance") ? map1.get("balance").toString() : "0"));
        }
        Map<String, Object> map1 = new HashMap<>();
        map1.put("insertTime", "合计");
        map1.put("money", money.doubleValue());
        map1.put("poundage", poundage.doubleValue());
        map1.put("balance", balance.doubleValue());
        list.add(map1);
        map.put("rows", list);
        map.put("total", count);
        return map;
    }
    @Override
    public HSSFWorkbook exportOrderWithdrawalDetails(String driverName, String driverPhone, String createTime) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            String[] split = createTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        List<Map<String, Object>> list = this.baseMapper.orderWithdrawalDetailsList(ShiroKit.getUser().getObjectId(), 2, driverName, driverPhone, startTime, endTime, null, null);
        String[] title = new String[]{"时间", "司机名称", "订单提现金额", "提现手续费", "未提现金额"};
        String[][] values = new String[list.size()][5];
        for (int i = 0; i < list.size(); i++) {
            Map<String, Object> map = list.get(i);
            values[i][0] = null != map.get("insertTime") ? map.get("insertTime").toString() : "";
            values[i][1] = null != map.get("name") ? map.get("name").toString() : "";
            values[i][2] = null != map.get("money") ? map.get("money").toString() : "";
            values[i][3] = null != map.get("poundage") ? map.get("poundage").toString() : "";
            values[i][4] = null != map.get("balance") ? map.get("balance").toString() : "";
        }
        return ExcelUtil.getHSSFWorkbook("订单提现明细", title, values, null);
    }
    @Override
    public Map<String, Object> rewardWithdrawalDetailsList(String driverName, String driverPhone, String createTime, Integer offset, Integer limit) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            String[] split = createTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        Map<String, Object> map = new HashMap<>();
        List<Map<String, Object>> list = this.baseMapper.orderWithdrawalDetailsList(ShiroKit.getUser().getObjectId(), 1, driverName, driverPhone, startTime, endTime, offset, limit);
        int count = this.baseMapper.orderWithdrawalDetailsListCount(ShiroKit.getUser().getObjectId(), 1, driverName, driverPhone, startTime, endTime);
        List<Map<String, Object>> list1 = this.baseMapper.orderWithdrawalDetailsList(ShiroKit.getUser().getObjectId(), 1, driverName, driverPhone, startTime, endTime, null, null);
        BigDecimal money = new BigDecimal("0");//提现金额
        BigDecimal poundage = new BigDecimal("0");//手续费
        BigDecimal balance = new BigDecimal("0");//未提现金额
        for (Map<String, Object> map1 : list1) {
            money = money.add(new BigDecimal(null != map1.get("money") ? map1.get("money").toString() : "0"));
            poundage = poundage.add(new BigDecimal(null != map1.get("poundage") ? map1.get("poundage").toString() : "0"));
            balance = balance.add(new BigDecimal(null != map1.get("balance") ? map1.get("balance").toString() : "0"));
        }
        Map<String, Object> map1 = new HashMap<>();
        map1.put("insertTime", "合计");
        map1.put("money", money.doubleValue());
        map1.put("poundage", poundage.doubleValue());
        map1.put("balance", balance.doubleValue());
        list.add(map1);
        map.put("rows", list);
        map.put("total", count);
        return map;
    }
    @Override
    public HSSFWorkbook exportRewardWithdrawalDetails(String driverName, String driverPhone, String createTime) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
            String[] split = createTime.split(" - ");
            startTime = split[0];
            endTime = split[1];
        }
        List<Map<String, Object>> list = this.baseMapper.orderWithdrawalDetailsList(ShiroKit.getUser().getObjectId(), 1, driverName, driverPhone, startTime, endTime, null, null);
        String[] title = new String[]{"时间", "司机名称", "提现手续费", "订单提现金额", "未提现金额"};
        String[][] values = new String[list.size()][5];
        for (int i = 0; i < list.size(); i++) {
            Map<String, Object> map = list.get(i);
            values[i][0] = null != map.get("insertTime") ? map.get("insertTime").toString() : "";
            values[i][1] = null != map.get("name") ? map.get("name").toString() : "";
            values[i][2] = null != map.get("poundage") ? map.get("poundage").toString() : "";
            values[i][3] = null != map.get("money") ? map.get("money").toString() : "";
            values[i][4] = null != map.get("balance") ? map.get("balance").toString() : "";
        }
        return ExcelUtil.getHSSFWorkbook("奖励提现明细", title, values, null);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TReassignServiceImpl.java
@@ -28,8 +28,8 @@
    }
    @Override
    public List<Map<String, Object>> getCanSelectPrivateCarDriverList(Page<Map<String, Object>> page, Integer companyId, String name, String phone, Integer driverId) {
        return this.baseMapper.getCanSelectPrivateCarDriverList(page, companyId, name, phone, driverId);
    public List<Map<String, Object>> getCanSelectPrivateCarDriverList(Page<Map<String, Object>> page, Integer companyId, String name, String phone) {
        return this.baseMapper.getCanSelectPrivateCarDriverList(page, companyId, name, phone);
    }
    @Override
@@ -37,10 +37,6 @@
        return this.baseMapper.getCanSelectSmallDriverList(page, companyId, type, name, phone);
    }
    @Override
    public List<Map<String, Object>> getCanSelectTaxiCarDriverList(Page<Map<String, Object>> page, Integer companyId, String name, String phone, Integer driverId) {
        return this.baseMapper.getCanSelectTaxiCarDriverList(page, companyId, name, phone, driverId);
    }
    @Override
    public List<Map<String, Object>> getCrossReassignOrderList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
@@ -55,58 +51,5 @@
    @Override
    public List<Map<String, Object>> getSmallPieceLogisticsList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getSmallPieceLogisticsList(page, roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
    @Override
    public List<Map<String, Object>> getTaxiReassignOrderList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getTaxiReassignOrderList(page, roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
    @Override
    public List<Map<String, Object>> getPrivateCarReassignOrderListEx(Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getPrivateCarReassignOrderListEx( roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
    @Override
    public List<Map<String, Object>> getCrossReassignOrderListEx(Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getCrossReassignOrderListEx( roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
    @Override
    public List<Map<String, Object>> getSmallPieceLogisticsListEx(Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getSmallPieceLogisticsListEx( roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
    @Override
    public List<Map<String, Object>> getTaxiReassignOrderListEx(Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getTaxiReassignOrderListEx( roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
    @Override
    public List<Map<String, Object>> getPrivateCarReassignOrderListMoney(Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getPrivateCarReassignOrderListMoney( roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
    @Override
    public List<Map<String, Object>> getCrossReassignOrderListMoney(Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getCrossReassignOrderListMoney( roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
    @Override
    public List<Map<String, Object>> getSmallPieceLogisticsListMoney(Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getSmallPieceLogisticsListMoney( roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
    @Override
    public List<Map<String, Object>> getTaxiReassignOrderListMoney(Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getTaxiReassignOrderListMoney( roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java
@@ -26,8 +26,8 @@
    private TSiteMapper siteMapper;
    @Override
    public List<Map<String, Object>> getSiteList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String insertUser, String city, Integer state,Integer type) {
        return this.baseMapper.getSiteList(page, beginTime, endTime, name, insertUser, city, state,type);
    public List<Map<String, Object>> getSiteList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String insertUser, String city, Integer state) {
        return this.baseMapper.getSiteList(page, beginTime, endTime, name, insertUser, city, state);
    }
    @Override
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysTimeoutMoneyServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysWithdrawalPoundageServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TTaxiCardPaymentServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TTaxiCardServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TTimeoutAppealServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TransactionDetailsServiceImpl.java
@@ -25,7 +25,7 @@
     * @param state     状态(1=添加,2=减少)
     * @param type      类型(1=金额,2=积分)
     * @param userType  用户类型(1=用户,2=司机)
     * @param orderType 订单类型(1=快车,2=出租车,3=城际,4=小件物流)
     * @param orderType 订单类型(1=专车,2=出租车,3=城际,4=小件物流)
     * @param orderId
     * @throws Exception
     */
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
@@ -7,7 +7,7 @@
import com.stylefeng.guns.modular.system.service.IUserActivityDiscount1Service;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.apache.poi.hssf.usermodel.*;
//import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.beans.factory.annotation.Autowired;
@@ -118,12 +118,12 @@
            HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据(标题)
            HSSFCellStyle style = hssfWorkbook.createCellStyle();
            HSSFFont font = hssfWorkbook.createFont();
//            font.setBold(true);
            font.setBold(true);
            style.setFont(font);
//            style.setAlignment(HorizontalAlignment.CENTER);
            style.setAlignment(HorizontalAlignment.CENTER);
            for (int l = 0; l < lists.get(i).size(); l++) {
                HSSFCell hssfCell = hssfRow.createCell(l);
//                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellValue(lists.get(i).get(l));
                hssfCell.setCellStyle(style);
                if(l > 0) {
@@ -147,7 +147,7 @@
                data = lists1.get(i).get(l);
                for (int j = 0; j < data.size(); j++) {
                    HSSFCell hssfCell = row.createCell(j);
//                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellValue(data.get(j));
                }
            }
@@ -235,12 +235,12 @@
            HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据(标题)
            HSSFCellStyle style = hssfWorkbook.createCellStyle();
            HSSFFont font = hssfWorkbook.createFont();
//            font.setBold(true);
            font.setBold(true);
            style.setFont(font);
//            style.setAlignment(HorizontalAlignment.CENTER);
            style.setAlignment(HorizontalAlignment.CENTER);
            for (int l = 0; l < lists.get(i).size(); l++) {
                HSSFCell hssfCell = hssfRow.createCell(l);
//                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellValue(lists.get(i).get(l));
                hssfCell.setCellStyle(style);
                if(l > 0) {
@@ -258,7 +258,7 @@
                data = lists1.get(i).get(l);
                for (int j = 0; j < data.size(); j++) {
                    HSSFCell hssfCell = row.createCell(j);
//                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellValue(data.get(j));
                }
            }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
@@ -8,7 +8,7 @@
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.apache.poi.hssf.usermodel.*;
//import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,22 +41,10 @@
    public List<Map<String, Object>> getList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String userPhone, Integer couponActivityId, Integer activityType,Integer state) {
        return this.baseMapper.getList(page,beginTime,endTime,userName,userPhone,couponActivityId,activityType,state);
    }
    @Override
    public List<Map<String, Object>> getListt(String beginTime, String endTime, String userName, String userPhone, Integer couponActivityId, Integer activityType,Integer state) {
        return this.baseMapper.getListt(beginTime,endTime,userName,userPhone,couponActivityId,activityType,state);
    }
    @Override
    public List<Map<String, Object>> getRedList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String userPhone, Integer couponActivityId,Integer state) {
        return this.baseMapper.getRedList(page,beginTime,endTime,userName,userPhone,couponActivityId,state);
    }
    @Override
    public List<Map<String, Object>> getRedListt(String beginTime, String endTime, String userName, String userPhone, Integer couponActivityId,Integer state) {
        return this.baseMapper.getRedListt(beginTime,endTime,userName,userPhone,couponActivityId,state);
    }
    @Override
    public Map<String, Object> getCouponStatic(String beginTime, String endTime, Integer activityId, Integer activityType) {
        return this.baseMapper.getCouponStatic(beginTime,endTime,activityId,activityType);
@@ -192,12 +180,12 @@
            HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据(标题)
            HSSFCellStyle style = hssfWorkbook.createCellStyle();
            HSSFFont font = hssfWorkbook.createFont();
//            font.setBold(true);
            font.setBold(true);
            style.setFont(font);
//            style.setAlignment(HorizontalAlignment.CENTER);
            style.setAlignment(HorizontalAlignment.CENTER);
            for (int l = 0; l < lists.get(i).size(); l++) {
                HSSFCell hssfCell = hssfRow.createCell(l);
//                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellValue(lists.get(i).get(l));
                hssfCell.setCellStyle(style);
                if(l > 0) {
@@ -232,7 +220,7 @@
                data = lists1.get(i).get(l);
                for (int j = 0; j < data.size(); j++) {
                    HSSFCell hssfCell = row.createCell(j);
//                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellValue(data.get(j));
                }
            }
@@ -324,12 +312,12 @@
            HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据(标题)
            HSSFCellStyle style = hssfWorkbook.createCellStyle();
            HSSFFont font = hssfWorkbook.createFont();
//            font.setBold(true);
            font.setBold(true);
            style.setFont(font);
//            style.setAlignment(HorizontalAlignment.CENTER);
            style.setAlignment(HorizontalAlignment.CENTER);
            for (int l = 0; l < lists.get(i).size(); l++) {
                HSSFCell hssfCell = hssfRow.createCell(l);
//                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellValue(lists.get(i).get(l));
                hssfCell.setCellStyle(style);
                if(l > 0) {
@@ -352,7 +340,7 @@
                data = lists1.get(i).get(l);
                for (int j = 0; j < data.size(); j++) {
                    HSSFCell hssfCell = row.createCell(j);
//                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellValue(data.get(j));
                }
            }
@@ -397,9 +385,9 @@
        list.add("通用券领取总数");
        list.add("通用券使用总数");
        list.add("通用券使用总金额");
        list.add("快车券领取总数");
        list.add("快车券使用总数");
        list.add("快车券使用总金额");
        list.add("专车券领取总数");
        list.add("专车券使用总数");
        list.add("专车券使用总金额");
        list.add("出租车券领取总数");
        list.add("出租车券使用总数");
        list.add("出租车券使用总金额");
@@ -440,12 +428,12 @@
            HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据(标题)
            HSSFCellStyle style = hssfWorkbook.createCellStyle();
            HSSFFont font = hssfWorkbook.createFont();
//            font.setBold(true);
            font.setBold(true);
            style.setFont(font);
//            style.setAlignment(HorizontalAlignment.CENTER);
            style.setAlignment(HorizontalAlignment.CENTER);
            for (int l = 0; l < lists.get(i).size(); l++) {
                HSSFCell hssfCell = hssfRow.createCell(l);
//                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellValue(lists.get(i).get(l));
                hssfCell.setCellStyle(style);
                if(l > 0) {
@@ -469,7 +457,7 @@
                data = lists1.get(i).get(l);
                for (int j = 0; j < data.size(); j++) {
                    HSSFCell hssfCell = row.createCell(j);
//                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellValue(data.get(j));
                }
            }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserMerchantCouponServiceImpl.java
File was deleted
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java
@@ -7,7 +7,7 @@
import com.stylefeng.guns.modular.system.service.ITCompanyService;
import com.stylefeng.guns.modular.system.service.IUserRedPacketRecordService;
import org.apache.poi.hssf.usermodel.*;
//import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.beans.factory.annotation.Autowired;
@@ -129,12 +129,12 @@
            HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据(标题)
            HSSFCellStyle style = hssfWorkbook.createCellStyle();
            HSSFFont font = hssfWorkbook.createFont();
//            font.setBold(true);
            font.setBold(true);
            style.setFont(font);
//            style.setAlignment(HorizontalAlignment.CENTER);
            style.setAlignment(HorizontalAlignment.CENTER);
            for (int l = 0; l < lists.get(i).size(); l++) {
                HSSFCell hssfCell = hssfRow.createCell(l);
//                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellValue(lists.get(i).get(l));
                hssfCell.setCellStyle(style);
                if(l > 0) {
@@ -161,7 +161,7 @@
                data = lists1.get(i).get(l);
                for (int j = 0; j < data.size(); j++) {
                    HSSFCell hssfCell = row.createCell(j);
//                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellValue(data.get(j));
                }
            }
@@ -256,12 +256,12 @@
            HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据(标题)
            HSSFCellStyle style = hssfWorkbook.createCellStyle();
            HSSFFont font = hssfWorkbook.createFont();
//            font.setBold(true);
            font.setBold(true);
            style.setFont(font);
//            style.setAlignment(HorizontalAlignment.CENTER);
            style.setAlignment(HorizontalAlignment.CENTER);
            for (int l = 0; l < lists.get(i).size(); l++) {
                HSSFCell hssfCell = hssfRow.createCell(l);
//                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellType(CellType.STRING);//设置表格类型
                hssfCell.setCellValue(lists.get(i).get(l));
                hssfCell.setCellStyle(style);
                if(l > 0) {
@@ -284,7 +284,7 @@
                data = lists1.get(i).get(l);
                for (int j = 0; j < data.size(); j++) {
                    HSSFCell hssfCell = row.createCell(j);
//                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellType(CellType.STRING);//设置表格类型
                    hssfCell.setCellValue(data.get(j));
                }
            }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
New file
@@ -0,0 +1,99 @@
package com.stylefeng.guns.modular.system.util;
import com.stylefeng.guns.core.util.ToolUtil;
import org.springframework.util.Base64Utils;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.spec.InvalidKeySpecException;
import java.util.Base64;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
 * 定义AES加密解密工具类
 */
public class AESUtil {
    private static final String KEY_ALGORITHM = "AES";//加密方式
    private static final String DEFAULT_CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding";//默认的加密算法
    private static final String KEY = "xqT86jictTPpHMem";//密码
    private static final String IV_PARAMETER = "xqT86jicxqT86jic";//偏移量
    private static final String CHARSET = "UTF-8";//编码
    /**
     * 加密操作
     * @param content  待加密内容
     * @return
     * @throws Exception
     */
    public static String encrypt(String content) {
        try {
            if(ToolUtil.isEmpty(content)){
                return content;
            }
            Cipher cipher = Cipher.getInstance(DEFAULT_CIPHER_ALGORITHM);
            byte[] raw = KEY.getBytes(CHARSET);
            SecretKeySpec skeySpec = new SecretKeySpec(raw, KEY_ALGORITHM);
            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes());
            cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv);
            byte[] encrypted = cipher.doFinal(content.getBytes(CHARSET));
            return Base64Utils.encodeToString(encrypted);
        }catch (Exception e){
            e.printStackTrace();
        }
        return content;
    }
    /**
     *解密操作
     * @param content 待解密内容
     * @return
     * @throws Exception
     */
    public static String decrypt(String content) {
        try {
            if(ToolUtil.isEmpty(content)){
                return content;
            }
            byte[] raw = KEY.getBytes(CHARSET);
            SecretKeySpec skeySpec = new SecretKeySpec(raw, KEY_ALGORITHM);
            Cipher cipher = Cipher.getInstance(DEFAULT_CIPHER_ALGORITHM);
            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes());
            cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
            byte[] encrypted1 = Base64Utils.decodeFromString(content);
            byte[] original = cipher.doFinal(encrypted1);
            String originalString = new String(original, CHARSET);
            return originalString;
        } catch (Exception ex) {
            ex.printStackTrace();
        }
        return content;
    }
    public static void main(String[] ages){
        String encrypt = AESUtil.encrypt("19167181339");
        System.err.println(encrypt);
        String travel = AESUtil.decrypt(encrypt);
        System.err.println(travel);
        String decrypt = DESUtil.decrypt("xqT86jictTPpHMem", "uFT7jx9P7+t8n1IVQsxn7A==");
        System.err.println(decrypt);
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DESUtil.java
New file
@@ -0,0 +1,195 @@
package com.stylefeng.guns.modular.system.util;
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
import javax.crypto.CipherOutputStream;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESKeySpec;
import javax.crypto.spec.IvParameterSpec;
import java.io.*;
import java.security.Key;
import java.security.Security;
import java.util.Base64;
public class DESUtil {
    /**
     * 偏移变量,固定占8位字节
     */
    private final static String IV_PARAMETER = "12345678";
    /**
     * 密钥算法
     */
    private static final String ALGORITHM = "DES";
    /**
     * 加密/解密算法-工作模式-填充模式
     */
    private static final String CIPHER_ALGORITHM = "DES/ECB/PKCS7Padding";
    /**
     * 默认编码
     */
    private static final String CHARSET = "utf-8";
    //设置java支持PKCS7Padding
    static {
        Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
    }
    public static void main(String[] args) {
        String s = "123456";
        // 加密
        String s2 = encrypt("xqT86jictTPpHMem", s);
        System.out.println(s2);
        //解密
        String s3 = decrypt("xqT86jictTPpHMem", s2);
        System.out.println(s3);
    }
    /**
     * 生成key
     *
     * @param password
     * @return
     * @throws Exception
     */
    private static Key generateKey(String password) throws Exception {
        DESKeySpec dks = new DESKeySpec(password.getBytes(CHARSET));
        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(ALGORITHM);
        return keyFactory.generateSecret(dks);
    }
    /**
     * DES加密字符串
     *
     * @param password 加密密码,长度不能够小于8位
     * @param data 待加密字符串
     * @return 加密后内容
     */
    public static String encrypt(String password, String data) {
        if (password== null || password.length() < 8) {
            throw new RuntimeException("加密失败,key不能小于8位");
        }
        if (data == null)
            return null;
        try {
            Key secretKey = generateKey(password);
            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
//            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes(CHARSET));
            cipher.init(Cipher.ENCRYPT_MODE, secretKey);
            byte[] bytes = cipher.doFinal(data.getBytes(CHARSET));
            //JDK1.8及以上可直接使用Base64,JDK1.7及以下可以使用BASE64Encoder
            //Android平台可以使用android.util.Base64
            return new String(Base64.getEncoder().encode(bytes));
        } catch (Exception e) {
            e.printStackTrace();
            return data;
        }
    }
    /**
     * DES解密字符串
     *
     * @param password 解密密码,长度不能够小于8位
     * @param data 待解密字符串
     * @return 解密后内容
     */
    public static String decrypt(String password, String data) {
        if (password== null || password.length() < 8) {
            throw new RuntimeException("加密失败,key不能小于8位");
        }
        if (data == null)
            return null;
        try {
            Key secretKey = generateKey(password);
            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
//            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes(CHARSET));
            cipher.init(Cipher.DECRYPT_MODE, secretKey);
            return new String(cipher.doFinal(Base64.getDecoder().decode(data.getBytes(CHARSET))), CHARSET);
        } catch (Exception e) {
            e.printStackTrace();
            return data;
        }
    }
    /**
     * DES加密文件
     *
     * @param srcFile  待加密的文件
     * @param destFile 加密后存放的文件路径
     * @return 加密后的文件路径
     */
    public static String encryptFile(String password, String srcFile, String destFile) {
        if (password== null || password.length() < 8) {
            throw new RuntimeException("加密失败,key不能小于8位");
        }
        try {
//            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes(CHARSET));
            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
            cipher.init(Cipher.ENCRYPT_MODE, generateKey(password));
            InputStream is = new FileInputStream(srcFile);
            OutputStream out = new FileOutputStream(destFile);
            CipherInputStream cis = new CipherInputStream(is, cipher);
            byte[] buffer = new byte[1024];
            int r;
            while ((r = cis.read(buffer)) > 0) {
                out.write(buffer, 0, r);
            }
            cis.close();
            is.close();
            out.close();
            return destFile;
        } catch (Exception ex) {
            ex.printStackTrace();
        }
        return null;
    }
    /**
     * DES解密文件
     *
     * @param srcFile  已加密的文件
     * @param destFile 解密后存放的文件路径
     * @return 解密后的文件路径
     */
    public static String decryptFile(String password, String srcFile, String destFile) {
        if (password== null || password.length() < 8) {
            throw new RuntimeException("加密失败,key不能小于8位");
        }
        try {
            File file = new File(destFile);
            if (!file.exists()) {
                file.getParentFile().mkdirs();
                file.createNewFile();
            }
//            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes(CHARSET));
            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
            cipher.init(Cipher.DECRYPT_MODE, generateKey(password));
            InputStream is = new FileInputStream(srcFile);
            OutputStream out = new FileOutputStream(destFile);
            CipherOutputStream cos = new CipherOutputStream(out, cipher);
            byte[] buffer = new byte[1024];
            int r;
            while ((r = is.read(buffer)) >= 0) {
                cos.write(buffer, 0, r);
            }
            cos.close();
            is.close();
            out.close();
            return destFile;
        } catch (Exception ex) {
            ex.printStackTrace();
        }
        return null;
    }
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java
@@ -34,7 +34,7 @@
    @Autowired
    private IGDInterfaceService gdInterfaceService;
    private String key = "ba2915f8d8c1428df72e964a5f94f167";
    private String key = "e17d799b2506d05faf7f88320a266803";
    private JSONArray jsonArray = new JSONArray();
@@ -61,6 +61,8 @@
        calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + 35);
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        String format = simpleDateFormat.format(calendar.getTime());
        //开始调用高德接口创建围栏
        String[] s = points.split("_");
        List<String> resoult = new ArrayList<>();
@@ -89,17 +91,14 @@
            String url = "https://restapi.amap.com/v4/geofence/meta?key=" + key;
            String js = restTemplate.postForObject(url, formEntity, String.class);
            JSONObject jsonObject = JSON.parseObject(js);
            if(0 == jsonObject.getInteger("errcode")){
                JSONObject data = jsonObject.getJSONObject("data");
                String status = data.getString("status");
                gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "创建电子围栏");
                if(status.equals("0")){//创建成功
                    resoult.add(data.getString("gid"));
                }
            }else{
                System.err.println(jsonObject.getString("errmsg"));
            }
            JSONObject data = jsonObject.getJSONObject("data");
            String status = data.getString("status");
            gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "创建电子围栏");
            if(status.equals("0")){//创建成功
                resoult.add(data.getString("gid"));
            }
        }
        return resoult;
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java
@@ -20,7 +20,7 @@
@Component
public class GDMapGeocodingUtil {
    private String key = "c573ee644cd0c1bd9da2657dd648dc11";
    private String key = "e17d799b2506d05faf7f88320a266803";
    @Autowired
    private RestTemplate restTemplate;
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GaoDeMapUtil.java
@@ -35,7 +35,7 @@
        try {
            // 拼接请求高德的url
            String url = "http://restapi.amap.com/v3/geocode/geo?address=" + address + "&output=JSON&key=" + "ba2915f8d8c1428df72e964a5f94f167";
            String url = "http://restapi.amap.com/v3/geocode/geo?address=" + address + "&output=JSON&key=" + "e17d799b2506d05faf7f88320a266803";
            // 请求高德接口
            String result = sendHttpGet(url);
            JSONObject resultJOSN = JSONObject.parseObject(result);
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ICBCPayUtil.java
@@ -96,7 +96,7 @@
        bizContent.setMer_prtcl_no(mer_prtcl_no);
        bizContent.setOrig_date_time(format);
        bizContent.setDecive_info(deciveInfo);
        bizContent.setBody("嘉易行-" + body);
        bizContent.setBody("天马出租-" + body);
        bizContent.setFee_type("001");
        InetAddress ip4 = Inet4Address.getLocalHost();
        bizContent.setSpbill_create_ip(ip4.getHostAddress());
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JpushUtil.java
@@ -39,12 +39,12 @@
    /**
     * AppKey
     */
    private static String masterSecret = "8553897a9a886fb0cf467e97";
    private static String masterSecret = "e4f6f435faefad29db6ba9b2";
    /**
     * Master Secret
     */
    private static String appKey = "c673a73acba4d06849913fd2";
    private static String appKey = "93204c35ded9ba377a14af19";
    private static String pushUrl = "https://api.jpush.cn/v3/push";   
    private static boolean apns_production = true;    
    private static int time_to_live = 86400;  
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OrderUtil.java
@@ -2,7 +2,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.UUID;
/**
 * 订单处理工具类
@@ -17,23 +16,7 @@
    
    /* 日期 */
    private static String date;
    /**
     * 定义生成原生的UUID随机码
     * @return
     */
    public static String getNativeUUID(){
        return UUID.randomUUID().toString();
    }
    /**
     * 生成32位随机码
     * @return
     */
    public static String getRandomCode(){
        return OrderUtil.getNativeUUID().replaceAll("-", "");
    }
    /**
     * 生成不重复的订单号 【纯数字】
     * @return
@@ -67,39 +50,7 @@
    public static synchronized String getOrderNoForSuffix(String suffix) {
        return getOrderNo() + suffix;
    }
    /**
     * 获取给定长度的随机码
     * @param num
     * @return
     * @throws Exception
     */
    public static String getRandomCode(Integer num) {
        String str = null;
        if(0 < num){
            if(num % 32 > 0){
                Integer s = num / 32;
                Integer l = num % 32;
                StringBuffer sb = new StringBuffer();
                for(int i = 0; i < s; i++){
                    sb.append(OrderUtil.getRandomCode());
                }
                sb.append(OrderUtil.getRandomCode().substring(0, l));
                str = sb.toString();
            }else if(num % 32 == 0){
                Integer s = num / 32;
                StringBuffer sb = new StringBuffer();
                for(int i = 0; i < s; i++){
                    sb.append(OrderUtil.getRandomCode());
                }
                str = sb.toString();
            }else{
                str = OrderUtil.getRandomCode().substring(0, num);
            }
        }
        return str;
    }
    public static void main(String[] args) {
        System.out.println(getOrderNo());
    }
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
@@ -11,11 +11,11 @@
public class OssUploadUtil {
    //OSS图片访问域名
    public static String oss_domain = "https://jiayixing-bucket.oss-cn-beijing.aliyuncs.com/";
    public static String accessKeyId = "LTAI5tE2Z7nA1rbtzZYMSPqR";
    public static String accessKeySecret = "HOGUqx1t4UWh8KepXJf69dlKj4tTBs";
    public static String bucketName="jiayixing-bucket";
    public static String endpoint = "oss-cn-beijing.aliyuncs.com";
    public static String oss_domain = "https://newok.oss-cn-shenzhen.aliyuncs.com/";
    public static String accessKeyId = "LTAI4G9Zez9H4B36vakPXGy4";
    public static String accessKeySecret = "BOVPUeZndKVbrPOq6Ef5j6oiydB3XZ";
    public static String bucketName="newok";
    public static String endpoint = "oss-cn-shenzhen.aliyuncs.com";
    
    public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
    
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
@@ -211,7 +211,7 @@
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("Address", 450204);//运价适用地行政区划代码
        jsonObject.put("FareType", id);//运价类型编码(由网约车平台公司统一编码,应确保唯一性)
        jsonObject.put("FareTypeNote", tSystemPrice.getFareTypeNote1());//运价类型说明
        jsonObject.put("FareTypeNote", tSystemPrice.getFareTypeNote());//运价类型说明
        jsonObject.put("FareValidOn", new Date());//运价有效期起YYYYMMDDhhmmss
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(new Date());
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -1,22 +1,16 @@
package com.stylefeng.guns.modular.system.util;
public class PushURL {
//    public static String zull_user_url = "http://39.96.82.2:80";
//    public static String order_push_url =  zull_user_url + "/driver/base/order/pushOrderState";
//    public static String driver_auth_url =  zull_user_url + "/driver/base/driver/sendsms";
//    public static String withdraw_auth_url =  zull_user_url + "/driver/base/withdrawal/withdrawalAudit";
//    public static String cancel_order_url =  zull_user_url + "/user/base/order/sendOrderState";
//    public static String freeze_user_url =  zull_user_url + "/user/base/user/freeze";
//    public static String ministry_of_transport_data = "http://120.77.11.218:8868/ministryOfTransport";
//    public static String ministry_of_transport_ftp = "http://120.77.11.218:8868/ftp";
    public static String zull_user_url = "http://127.0.0.1:5000";
    public static String zull_user_url = "https://okyueche.com:443";
//    public static String zull_user_url = "http://127.0.0.1:80";
    public static String order_push_url =  zull_user_url + "/driver/base/order/pushOrderState";
    public static String driver_auth_url =  zull_user_url + "/driver/base/driver/sendsms";
    public static String withdraw_auth_url =  zull_user_url + "/driver/base/withdrawal/withdrawalAudit";
    public static String reassign_rollback_amount =  zull_user_url + "/driver/base/order/reassignRollbackAmount";
    public static String cancel_order_rollback_amount =  zull_user_url + "/user/base/order/cancelOrderRollbackAmount";
    public static String cancel_order_url =  zull_user_url + "/user/base/order/sendOrderState";
    public static String freeze_user_url =  zull_user_url + "/user/base/user/freeze";
    public static String send_sms_code =  zull_user_url + "/user/base/queryCaptcha";
    public static String ministry_of_transport_data = "http://120.77.11.218:8868/ministryOfTransport";
    public static String ministry_of_transport_ftp = "http://120.77.11.218:8868/ftp";
}
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
@@ -117,7 +117,7 @@
        if(ToolUtil.isNotEmpty(key)){
            Map<String,String> map = new HashMap<>();
            map.put("key", key);
            String s = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/redis/remove", map);
            String s = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/redis/getValue", map);
            JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
            if(jsonObject.getIntValue("code") != 200){
                System.err.println("调用redis出错了");
ManagementTravel/guns-admin/src/main/resources/application.yml
@@ -58,16 +58,16 @@
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://8.130.76.108:10011/tianma?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    url: jdbc:mysql://8.130.76.108:10011/tm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: kuanzhaiyx
    db-name: kuanzhaiyx #用来搜集数据库的所有表
    db-name: tm #用来搜集数据库的所有表
    filters: wall,mergeStat
#多数据源情况的配置
guns:
  muti-datasource:
    open: false
    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    url: jdbc:mysql://8.130.76.108:10011/tm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    #    password: Root2020!
    password: 123456
@@ -78,7 +78,7 @@
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://8.130.76.108:10011/tianma?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    url: jdbc:mysql://8.130.76.108:10011/tm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: kuanzhaiyx
    db-name: 123456 #用来搜集数据库的所有表
@@ -87,7 +87,7 @@
guns:
  muti-datasource:
    open: false
    url: jdbc:mysql://8.130.76.108:10011/tianma?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    url: jdbc:mysql://8.130.76.108:10011/tm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    #    password: Root2020!
    password: 123456
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
@@ -6,7 +6,7 @@
    <meta name="renderer" content="webkit"/><!-- 让360浏览器默认选择webkit内核 -->
    <!--地图-->
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=d868ee8a0084a4a1b4271d8030e32fba"></script>
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
    <!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IRKL4FLGKZUFr6T3gFk3t9X6kKarKu1K"></script>-->
    <!-- 全局css -->
@@ -57,6 +57,7 @@
    <script src="${ctxPath}/static/js/common/Feng.js"></script>
    <script src="${ctxPath}/static/js/plugins/sweetalert/sweetalert.min.js"></script>
    <script src="${ctxPath}/static/layui/layui.js"></script>
    <script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
    <!--富文本编辑器 js-->
   <!-- <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/plugins/umeditor/umeditor.config.js"></script>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
@@ -7,6 +7,7 @@
                        <input type="text" placeholder="天马出租后台管理系统 …" class="form-control" name="top-search" id="top-search" value="天马出租后台管理系统" disabled>
                    </div>
                </form>
                <h3 style="float: right;line-height: 50px;color: red;">${passwordHint}</h3>
            </div>
            <ul class="nav navbar-top-links navbar-right">
                <li class="dropdown hidden-xs">
@@ -52,7 +53,7 @@
        <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="${ctxPath}/blackboard?type=${type}" frameborder="0" data-id="${ctxPath}/blackboard" seamless></iframe>
    </div>
    <div class="footer">
        <div class="pull-right">&copy; 2019-2021 <a href="#" onclick="return false" target="_blank">天马出租</a>
        <div class="pull-right">&copy; 2019-2021 <a href="#" onclick="return false" target="_blank">OK出行</a>
        </div>
    </div>
</div>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag
@@ -11,5 +11,5 @@
                type="button">${name}
        </button>
    </div>
    <input type="text" class="form-control layer-date" autocomplete="off" id="${id}"/>
    <input type="text" class="form-control layer-date" id="${id}"/>
</div>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -48,7 +48,7 @@
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail1">0</h1>
                            <small>专车/快车订单数</small>
                            <small>专车订单数</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail2">0</h1>
@@ -56,15 +56,15 @@
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail3">0</h1>
                            <small>机场专线订单</small>
                            <small>跨城出行订单</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail4">0</h1>
                            <small>景区直通车订单</small>
                            <small>同城小件物流订单</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail5">0</h1>
                            <small>公务出行订单</small>
                            <small>跨城小件物流订单</small>
                        </div>
                    </div>
                </div>
@@ -118,7 +118,7 @@
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail11">0</h1>
                            <small>快车/专车订单数</small>
                            <small>专车订单数</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail21">0</h1>
@@ -126,15 +126,15 @@
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail31">0</h1>
                            <small>机场专线订单数</small>
                            <small>跨城出行订单数</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail41">0</h1>
                            <small>景区直通车订单数</small>
                            <small>同城小件物流订单数</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail51">0</h1>
                            <small>公务出行订单数</small>
                            <small>跨城小件物流订单数</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="paiceSum1">0</h1>
@@ -168,7 +168,7 @@
                            <h1 class="no-margins">
                                <span class="dynamicsparkline" id="orderDetail12">Loading..</span>
                            </h1>
                            <small>专车/快车订单趋势图</small>
                            <small>专车订单趋势图</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins">
@@ -180,19 +180,19 @@
                            <h1 class="no-margins">
                                <span class="dynamicsparkline" id="orderDetail32">Loading..</span>
                            </h1>
                            <small>机场专线订单趋势图</small>
                            <small>跨城出行订单趋势图</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins">
                                <span class="dynamicsparkline" id="orderDetail42">Loading..</span>
                            </h1>
                            <small>景区直通车订单趋势图</small>
                            <small>同城小件物流订单趋势图</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins">
                                <span class="dynamicsparkline" id="orderDetail52">Loading..</span>
                            </h1>
                            <small>公务出行订单趋势图</small>
                            <small>跨城小件物流订单趋势图</small>
                        </div>
                    </div>
                </div>
@@ -256,8 +256,8 @@
        </div>
    </div>
</div>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=d868ee8a0084a4a1b4271d8030e32fba"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=d868ee8a0084a4a1b4271d8030e32fba&plugin=AMap.MouseTool"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool"></script>
<script type="text/javascript" src='https://a.amap.com/jsapi_demos/static/citys.js'></script>
<script src="${ctxPath}/static/home.js"></script>
<script src="${ctxPath}/static/js/jquery.sparkline 2.1.2.js"></script>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
@@ -55,7 +55,7 @@
<div style="display: flex;align-items: center;justify-content: center;height: 100%">
<img src="${ctxPath}/static/img/login.png" style="width: 300px;height: 400px;z-index: 1000; border-radius: 20px;">
<img src="${ctxPath}/static/img/index4.png" style="width: 300px;height: 400px;z-index: 1000">
<div  style="position: relative;left: -20px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;">
    <div style="max-height: 100%">
        <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/>&nbsp;天马出租管理后台</h3>
@@ -64,11 +64,15 @@
        <form class="m-t" role="form" action="${ctxPath}/login" method="post">
            <div class="item">
                <img src="${ctxPath}/static/img/account.png" />
                <input class="itemInput" type="text" name="username"  placeholder="请输入您的账号" required="" value="">
                <input class="itemInput" type="text" name="username" id="username"  placeholder="请输入您的账号" required="" value="">
            </div>
            <div  class="item">
                <img src="${ctxPath}/static/img/password.png" />
                <input class="itemInput" type="password" name="password"  placeholder="请输入您的密码" required="" value="">
                <input class="itemInput" type="password" name="password" id="password"  placeholder="请输入您的密码" required="" value="">
            </div>
            <div  class="item">
                <input class="itemInput" name="sms_code" id="sms_code"  placeholder="请输入验证码" required="" value="" style="padding-left: 0px; text-align: center;">
                <button id="btn" type="button" onclick="sendSMSCode(this)" style="width: 150px; font-size: 14px;">获取验证码</button>
            </div>
            @if(kaptcha.getKaptchaOnOff() == true){
            <div class="form-group" style="float: left;">
@@ -87,18 +91,66 @@
                    </label>-->
                </div>
            </div>
            <button type="submit" class="btn full-width m-b" style="background-color: #d56b29;color: black;">登 录</button>
            <button onclick="login()" class="btn full-width m-b" style="background-color: #d56b29;color: black;">登 录</button>
            <button type="submit" id="submit" style="display: none;"></button>
            </p>
        </form>
    </div>
</div></div>
</body>
<script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
<script src="${ctxPath}/static/js/common/ajax-object.js"></script>
<script src="${ctxPath}/static/js/common/Feng.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    $(function () {
        $("#kaptcha").on('click', function () {
            $("#kaptcha").attr('src', '${ctxPath}/kaptcha?' + Math.floor(Math.random() * 100)).fadeIn();
        });
    });
    var key = CryptoJS.enc.Utf8.parse("xqT86jictTPpHMem");
    var iv = CryptoJS.enc.Utf8.parse("xqT86jicxqT86jic");
    //aes加密
    function encryptAES(context) {
        if(null == context || '' == context){
            return context;
        }
        var encrypted = '';
        if (typeof(context) == 'string') {
        }else if(typeof(context) == 'object'){
            context = JSON.stringify(context);
        }
        var srcs = CryptoJS.enc.Utf8.parse(context);
        encrypted = CryptoJS.AES.encrypt(srcs, key, {
            iv: iv,
            mode: CryptoJS.mode.CBC,
            padding: CryptoJS.pad.Pkcs7
        });
        return encrypted.toString();
    }
    // aes解密
    function decryptAES(context) {
        if(null == context || '' == context){
            return context;
        }
        var decrypt = CryptoJS.AES.decrypt(context, key, {
            iv: iv,
            mode: CryptoJS.mode.CBC,
            padding: CryptoJS.pad.Pkcs7
        });
        var decryptedStr = decrypt.toString(CryptoJS.enc.Utf8);
        return decryptedStr.toString();
    }
    function login(){
        let password = $('#password').val();
        password = encryptAES(password);
        $('#password').val(password);
        $('#submit').submit();
    }
    window.addEventListener(
        "mousewheel",
@@ -187,6 +239,50 @@
        }
    }
    fontSize(768, 1920);
    function sendSMSCode(obj) {
        let username = $('#username').val();
        if(null == username || '' == username){
            alert("请先输入您的账号");
            return
        }
        $.ajax({
            url: Feng.ctxPath + '/base/sendSMSCode',
            type: 'POST',
            data:{
                username: username
            },
            success: function (res) {
                if(res.status == 200){
                    invokeSettime(obj);
                }else{
                    alert(res.msg);
                }
            }
        });
    }
    function invokeSettime(obj){
        var countdown=60;
        settime(obj);
        function settime(obj) {
            if (countdown == 0) {
                $(obj).attr("disabled",false);
                $(obj).text("获取验证码");
                countdown = 60;
                return;
            } else {
                $(obj).attr("disabled",true);
                $(obj).text("(" + countdown + ")s重新发送");
                countdown--;
            }
            setTimeout(function() {
                    settime(obj) }
                ,1000)
        }
    }
</script>
</body>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airLine/airLine.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airLine/airLine_add.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airLine/airLine_addCompany.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airLine/airLine_edit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airSite/airSite.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airSite/airSite_add.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/airSite/airSite_edit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/auditCarRental.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/auditCarRental_info.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/carRental.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/carRental_add.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/carRental_edit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/carRental/carRental_info.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
@@ -31,7 +31,7 @@
                            司机APP每天累计在线奖励
                            <br/>
                            <br/>
                            快车累计在线&nbsp;<input type="text"   id="num4" class="form-control newWidth" />&nbsp;小时奖励
                            专车累计在线&nbsp;<input type="text"   id="num4" class="form-control newWidth" />&nbsp;小时奖励
                            &nbsp;<input type="text"   id="num5" class="form-control newWidth" />&nbsp;元
                            <br/>
                            <br/>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
@@ -41,7 +41,7 @@
                            司机APP每天累计在线奖励
                            <br/>
                            <br/>
                            快车累计在线&nbsp;<input type="text" @if(isNotEmpty(online1)){
                            专车累计在线&nbsp;<input type="text" @if(isNotEmpty(online1)){
                                               value="${online1.online}"
                                               @}else{
                                               value=""
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
@@ -42,7 +42,7 @@
                            司机APP每天累计在线奖励
                            <br/>
                            <br/>
                            快车累计在线&nbsp;<input type="text" @if(isNotEmpty(online1)){
                            专车累计在线&nbsp;<input type="text" @if(isNotEmpty(online1)){
                                               value="${online1.online}"
                                               @}else{
                                               value=""
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
@@ -124,7 +124,7 @@
    <div class="col-sm-3">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h3>快车累计在线</h3>
                <h3>专车累计在线</h3>
            </div>
            <div class="ibox-content">
                <h1 class="no-margins text-navy">领取人数:<span id="number3"></span></h1>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html
@@ -12,7 +12,7 @@
                    <div class="col-sm-12">
                        <div class="hidden-xs" id="DriverActivityHistoryTableToolbar" role="group">
                            <#button btnCss="info" name="导出" id="cancel" icon="fa-eraser" clickFun="DriverActivityHistory.export()" space="true"/>
                        </div>
                        <#table id="DriverActivityHistoryTable"/>
                    </div>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/complaintDeductmoney.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/order.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/otherOtherIncomeDetail.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/summaryOfIncomeDetails.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/summaryOfSpendingDetails.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/taxiCardPayment.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/timeOut.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/ActivityExamine.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivityExamine.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_add.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_edit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantCoupon.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/receivingRecord.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/merchantActivityGive.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/merchantActivityGive_add.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/merchantActivityGive_edit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/merchantCoupon.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/receivingRecord.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivityGive/userInfo.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantCoupon/merchandiseCoupon.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantCoupon/merchantCoupon.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantCoupon/merchantCoupon_add.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantCoupon/merchantCoupon_edit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/paymentRecord/balanceModify.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/paymentRecord/paymentRecord.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/recruit/recruit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/recruit/recruit_add.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/recruit/recruit_edit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/balanceModify.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/companyIncome.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/complaintDeductmoney.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
@@ -2,6 +2,9 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>优惠券管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
@@ -2,6 +2,9 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>优惠券管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
@@ -9,7 +12,7 @@
                            <div class="col-sm-3">
                                <#SelectCon id="type" name="类别" >
                                    <option value="2">出租车</option>
                                    <option value="1">快车</option>
                                    <option value="1">专车</option>
                                    <option value="3">跨城</option>
                                    <option value="4">小件物流</option>
                                </#SelectCon>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/order.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/tCompany.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/tDriver.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/tPubWithdrawal.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/tUser.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/taxiCardPayment.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/auditSellingCar.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/auditSellingCar_info.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/sellingCar.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/sellingCar_add.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/sellingCar_edit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sellingCar/sellingCar_info.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/detail.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/hasCollectOrderDetail.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/noCollectOrderDetail.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/orderRevenueDetails.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/orderWithdrawalDetail.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/orderWithdrawalDetails.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/otherSpendingDetail.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/rewardDetails.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/rewardEarningDetail.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/rewardWithdrawalDetail.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/rewardWithdrawalDetails.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
@@ -16,7 +16,7 @@
                                <#SelectCon id="couponUseType" name="优惠券类型" >
                                    <option value="">全部</option>
                                    <option value="0">通用券</option>
                                    <option value="1">快车券</option>
                                    <option value="1">专车券</option>
                                    <option value="2">出租车券</option>
                                    <option value="3">跨城出行券</option>
                                </#SelectCon>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html
@@ -10,7 +10,7 @@
                    <#input id="name" name="活动标题" underline="true" value="${item.name}"/>
                    <#button name="选择优惠券" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectCouponOpt()" style="margin-left: 12%;"/>
                    <#input id="couponType" name="优惠券类型" readonly="true" value="${item.couponType==1?'抵扣':'满减'}"/>
                    <#input id="couponUseType" name="服务类型" underline="true" readonly="true"  value="${item.couponUseType==0?'通用券':item.couponUseType==1?'快车券':item.couponUseType==2?'出租券':'跨城出行券'}"/>
                    <#input id="couponUseType" name="服务类型" underline="true" readonly="true"  value="${item.couponUseType==0?'通用券':item.couponUseType==1?'专车券':item.couponUseType==2?'出租券':'跨城出行券'}"/>
                    <#input id="money" name="金额" underline="true" readonly="true"  value="${item.money}"/>
                    <#input id="effective" name="有效天数" underline="true"  value="${item.effective}"/>
                    <#input id="number" name="张数" underline="true"  value="${item.number}"/>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html
@@ -6,11 +6,6 @@
                <h5>优惠券管理</h5>
            </div>
            <div class="ibox-content">
                <input type="hidden" id="jumpType" value="${jumpType}" />
                @if(num != 0){
                <input type="hidden" id="num" value="${num}" />
                @}
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
@@ -21,7 +16,7 @@
                                <#SelectCon id="couponUseType" name="优惠券类型" >
                                    <option value="">全部</option>
                                    <option value="0">通用券</option>
                                    <option value="1">快车券</option>
                                    <option value="1">专车券</option>
                                    <option value="2">出租车券</option>
                                    <option value="3">跨城出行券</option>
                                </#SelectCon>
@@ -50,9 +45,6 @@
                            @}
                        </div>
                        <#table id="SysCouponRecordTable"/>
                        <div class="row">
                            <#button name="确定" icon="fa-check" clickFun="SysCouponRecord.sureCheck()" space="true"/>
                        </div>
                    </div>
                </div>
            </div>
@@ -60,7 +52,6 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/sysCouponRecord/sysCouponRecord.js"></script>
<script src="${ctxPath}/static/modular/system/tTaxiCard/tTaxiCard_info.js"></script>
<script>
    laydate.render({
        elem: '#createTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html
@@ -18,7 +18,7 @@
                        </div>
                    </div>
                    <#select id="couponUseType" name="服务类型" underline="true">
                        <option value="1">快车券</option>
                        <option value="1">专车券</option>
                        <option value="2">出租车券</option>
                        <option value="3">跨城出行券</option>
                        <option value="0">通用券</option>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html
@@ -13,7 +13,7 @@
                </div>
                <div class="col-sm-6">
                            <#input id="couponUseType" name="优惠券使用类型(0=通用,1=快车,2=出租车,3=城际,4=小件物流)" value="${item.couponUseType}" underline="true"/>
                            <#input id="couponUseType" name="优惠券使用类型(0=通用,1=专车,2=出租车,3=城际,4=小件物流)" value="${item.couponUseType}" underline="true"/>
                            <#input id="couponType" name="优惠券类型(1=抵扣,2=满减)" value="${item.couponType}" underline="true"/>
                            <#input id="name" name="优惠券名称" value="${item.name}" underline="true"/>
                            <#input id="effective" name="有效天数" value="${item.effective}" />
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdditionalFee/tAdditionalFee.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdditionalFee/tAdditionalFee_add.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html
@@ -11,7 +11,6 @@
                        <option value="">选择广告类型</option>
                        <option value="1">弹窗广告</option>
                        <option value="2">首页底部广告</option>
                        <option value="3">订单结束页广告</option>
                    </#select>
                    <#select id="provinceId" name="所属省:">
                        <option value="">选择所属省</option>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html
@@ -11,7 +11,6 @@
                        <option value="">选择广告类型</option>
                        <option value="1" ${1 == item.type ? 'selected=selected' : ''}>弹窗广告</option>
                        <option value="2" ${2 == item.type ? 'selected=selected' : ''}>首页底部广告</option>
                        <option value="3" ${3 == item.type ? 'selected=selected' : ''}>订单结束页广告</option>
                    </#select>
                    <#select id="provinceId" name="所属省:">
                        <option value="">选择所属省</option>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/carBuyingProblem.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/intimateAgreement.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/rentalCarAgreement.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/sellCarsAgreement.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementComplaintDeduct.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementTimeOutDeduct.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -47,7 +47,7 @@
                            <div class="col-sm-9">
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()">
                                    <label for="serverBox1"> 快车 </label>
                                    <label for="serverBox1"> 专车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox2" value="2">
@@ -73,7 +73,7 @@
                        </fieldset>
                    </div>
                    <div class="form-group" style="display: none;" id="zcModelDiv">
                        <label class="col-sm-3 control-label">快车车型:</label>
                        <label class="col-sm-3 control-label">专车车型:</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="zcModel" name="zcModel">
                                <option value="">选择车型</option>
@@ -146,7 +146,7 @@
                    <#input id="GPSModel" name="卫星定位装置型号" />
                    <#input id="GPSIMEI" name="卫星定位装置IMEI号" />
                    <#input id="GPSInstallDate" name="卫星定位装置安装时间" type="text"/>
                    <#input id="registerDate" name="平台车辆报备日期" type="text"/>
                    <#input id="registerDate" name="车辆报备日期" type="text"/>
                    <#select id="commercialType" name="服务类型:">
                        <option value="1">网络预约出租车</option>
                        <option value="2">巡游出租汽车</option>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -49,7 +49,7 @@
                            <div class="col-sm-9">
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
                                    <label for="serverBox1"> 快车 </label>
                                    <label for="serverBox1"> 专车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>
@@ -75,7 +75,7 @@
                        </fieldset>
                    </div>
                    <div class="form-group" id="zcModelDiv">
                        <label class="col-sm-3 control-label">快车车型:</label>
                        <label class="col-sm-3 control-label">专车车型:</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="zcModel" name="zcModel">
                                <option value="">选择车型</option>
@@ -139,9 +139,9 @@
                    <#input id="transDateStop" name="车辆运输证有效期止" type="text" value="${item.transDateStop}"/>
                    <#input id="certifyDateB" name="车辆初次登记日期" type="text" value="${item.certifyDateB}"/>
                    <#select id="fixState" name="车辆维修状态:">
                        <option value="0" ${0 == item.fixState ? 'selected=selected' : ''}>未检修</option>
                        <option value="1" ${1 == item.fixState ? 'selected=selected' : ''}>已检修</option>
                        <option value="2" ${2 == item.fixState ? 'selected=selected' : ''}>未知</option>
                        <option value="0" ${'0' == item.fixState ? 'selected=selected' : ''}>未检修</option>
                        <option value="1" ${'1' == item.fixState ? 'selected=selected' : ''}>已检修</option>
                        <option value="2" ${'2' == item.fixState ? 'selected=selected' : ''}>未知</option>
                    </#select>
                    <#input id="nextFixDate" name="车辆下次年检时间" type="text" value="${item.nextFixDate}"/>
                    <#input id="checkState" name="车辆年度审核状态" value="${item.checkState}"/>
@@ -150,7 +150,7 @@
                    <#input id="GPSModel" name="卫星定位装置型号" value="${item.GPSModel}"/>
                    <#input id="GPSIMEI" name="卫星定位装置IMEI号" value="${item.GPSIMEI}"/>
                    <#input id="GPSInstallDate" name="卫星定位装置安装时间" type="text" value="${item.GPSInstallDate}"/>
                    <#input id="registerDate" name="平台车辆报备日期" type="text" value="${item.registerDate}"/>
                    <#input id="registerDate" name="车辆报备日期" type="text" value="${item.registerDate}"/>
                    <#select id="commercialType" name="服务类型:">
                        <option value="1" ${'1' == item.commercialType ? 'selected=selected' : ''}>网络预约出租车</option>
                        <option value="2" ${'2' == item.commercialType ? 'selected=selected' : ''}>巡游出租汽车</option>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
@@ -5,29 +5,11 @@
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="userId" name="userId" value="${user.id}">
            <div class="row">
                <div class="col-sm-6">
                    <#input id="name" name="公司名称" value="${item.name}" />
                    <#input id="code" name="公司代码" value="${item.code}" />
                    <#input id="principalName" name="公司负责人" value="${item.principalName}" />
                    <#input id="adminName" name="公司管理人" value="${item.adminName}" />
                    <#input id="scale" name="公司规模" value="${item.scale}" />
                    <div class="form-group">
                        <label class="col-sm-3 control-label">公司信息:</label>
                        <div class="col-sm-9">
                            <textarea class="form-control" id="companyInfo">${item.companyInfo}</textarea>
                        </div>
                    </div>
                </div>
                <div class="col-sm-6">
                    <#input id="scopeCode" name="公司区划代码" value="${item.scopeCode}"/>
                    <#input id="detailAddress" name="公司具体地址" value="${item.detailAddress}"/>
                    <#input id="principalPhone" name="负责人电话" value="${item.principalPhone}"/>
                    <#input id="adminPhone" name="管理员电话" value="${item.adminPhone}"/>
                </div>
            </div>
            <div class="row">
                <div class="col-sm-6">
                <div class="col-sm-6 b-r">
                    <#input id="name" name="分公司名称" value="${item.name}" />
                    <#input id="code" name="分公司代码" value="${item.code}" />
                    <#input id="principalName" name="分公司负责人" value="${item.principalName}" />
                    <#input id="adminName" name="分公司管理人" value="${item.adminName}" />
                    <#input id="documentAddress" name="行政文书送达地址" value="${item.documentAddress}" />
                    <#input id="setupTime" name="服务机构设立日期" value="${item.setupTime}" />
                    <#input id="licenseNumber" name="网络预约出租汽<br>车经营许可证号" value="${item.licenseNumber}" />
@@ -42,6 +24,10 @@
                </div>
                <div class="col-sm-6">
                    <#input id="scopeCode" name="分公司区划代码" value="${item.scopeCode}"/>
                    <#input id="detailAddress" name="分公司具体地址" value="${item.detailAddress}"/>
                    <#input id="principalPhone" name="负责人电话" value="${item.principalPhone}"/>
                    <#input id="adminPhone" name="管理员电话" value="${item.adminPhone}"/>
                    <#input id="urgentPhoen" name="紧急联系电话" value="${item.urgentPhoen}"/>
                    <#input id="identifier" name="统一社会信用代码" value="${item.identifier}"/>
                    <#input id="serviceScope" name="经营区域" value="${item.serviceScope}"/>
@@ -64,7 +50,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                        快车
                                        专车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="zcDiv">
@@ -232,46 +218,6 @@
                                    <label for="checkbox6">
                                        包车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-warning">
                                    <input name="checkbox" id="checkbox7" type="checkbox" value="7" ${1 == item.isOnCall ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox7()">
                                    <label for="checkbox7">
                                        95128电召
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="dcxDiv">
                                            <div class="col-sm-6">
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx1" value="1" ${1 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="dcx1">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按比例抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxPercent" name="dcxPercent"
                                                                   @if(1 == item.isOnCallFixedOrProportional){
                                                                   value="${item.onCallMoney}"
                                                                   @}
                                                            >
                                                            <span>%</span>
                                                        </div>
                                                    </label>
                                                </div>
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx2" value="2" ${2 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="dcx2">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按固定金额抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxMoney" name="dcxMoney"
                                                                   @if(2 == item.isOnCallFixedOrProportional){
                                                                   value="${item.onCallMoney}"
                                                                   @}
                                                            >
                                                            <span>元</span>
                                                        </div>
                                                    </label>
                                                </div>
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                            </fieldset>
                        </div>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
@@ -53,7 +53,7 @@
                                <#button name="删除" icon="fa-remove" clickFun="TCompany.delete()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tCompany/detail")){
                                <#button name="查看详情" icon="fa-search" clickFun="TCompany.detail()" space="true"/>
                                <#button name="查看详情" icon="fa-remove" clickFun="TCompany.detail()" space="true"/>
                            @}
                        </div>
                        <#table id="TCompanyTable"/>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -50,7 +50,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="TCompanyInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                        快车
                                        专车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="zcDiv">
@@ -186,38 +186,6 @@
                                    <label for="checkbox6">
                                        包车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-warning">
                                    <input name="checkbox" id="checkbox7" type="checkbox" value="7" onclick="TCompanyInfoDlg.checkbox7()">
                                    <label for="checkbox7">
                                        95128电召
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="dcxDiv">
                                            <div class="col-sm-6">
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx1" value="1" checked="">
                                                    <label for="dcx1">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按比例抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxPercent" name="dcxPercent">
                                                            <span>%</span>
                                                        </div>
                                                    </label>
                                                </div>
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx2" value="2">
                                                    <label for="dcx2">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按固定金额抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxMoney" name="dcxMoney">
                                                            <span>元</span>
                                                        </div>
                                                    </label>
                                                </div>
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                            </fieldset>
                        </div>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -31,7 +31,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="FranchiseeInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                        快车
                                        专车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="zcDiv">
@@ -167,38 +167,6 @@
                                    <label for="checkbox6">
                                        包车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-warning">
                                    <input name="checkbox" id="checkbox7" type="checkbox" value="5" onclick="FranchiseeInfoDlg.checkbox7()">
                                    <label for="checkbox7">
                                        95128电召
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="dcxDiv">
                                            <div class="col-sm-6">
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx1" value="1" checked="">
                                                    <label for="dcx1">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按比例抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxPercent" name="dcxPercent">
                                                            <span>%</span>
                                                        </div>
                                                    </label>
                                                </div>
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx2" value="2">
                                                    <label for="dcx2">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按固定金额抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxMoney" name="dcxMoney">
                                                            <span>元</span>
                                                        </div>
                                                    </label>
                                                </div>
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                            </fieldset>
                        </div>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
@@ -91,7 +91,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" disabled value="1" ${1 == item.isSpe ? 'checked=checked' : ''} >
                                    <label for="checkbox1">
                                        快车
                                        专车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="zcDiv">
@@ -214,28 +214,22 @@
                                        </div>
                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-danger">
                                    <input name="checkbox" id="checkbox6" disabled type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} >
                                    <label for="checkbox6">
                                        包车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-warning">
                                    <input name="checkbox" id="checkbox7" disabled type="checkbox" value="7" ${1 == item.isOnCall ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox5()">
                                    <label for="checkbox7">
                                        95128电召
                                    <input name="checkbox" id="checkbox5" type="checkbox" disabled value="5" ${1 == item.isCrossLogistics ? 'checked=checked' : ''} >
                                    <label for="checkbox5">
                                        跨城小件物流
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="dcxDiv">
                                        <div class="row" style="display: none;" id="kcxDiv">
                                            <div class="col-sm-6">
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" disabled id="dcx1" value="1" ${1 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="dcx1">
                                                    <input type="radio" name="kcx" id="kcx1" disabled value="1" ${1 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="kcx1">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按比例抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="dcxPercent" name="dcxPercent"
                                                                   @if(1 == item.isOnCallFixedOrProportional){
                                                                   value="${item.onCallMoney}"
                                                            <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="kcxPercent" name="kcxPercent" disabled
                                                                   @if(1 == item.isCrossLogisticsFixedOrProportional){
                                                                   value="${item.crossLogisticsMoney}"
                                                                   @}
                                                            >
                                                            <span>%</span>
@@ -243,13 +237,13 @@
                                                    </label>
                                                </div>
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx2" value="2" ${2 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="dcx2">
                                                    <input type="radio" name="kcx" disabled id="kcx2" value="2" ${2 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="kcx2">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按固定金额抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxMoney" name="dcxMoney"
                                                                   @if(2 == item.isOnCallFixedOrProportional){
                                                                   value="${item.onCallMoney}"
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxMoney" name="kcxMoney" disabled
                                                                   @if(2 == item.isCrossLogisticsFixedOrProportional){
                                                                   value="${item.crossLogisticsMoney}"
                                                                   @}
                                                            >
                                                            <span>元</span>
@@ -259,6 +253,12 @@
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-danger">
                                    <input name="checkbox" id="checkbox6" disabled type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} >
                                    <label for="checkbox6">
                                        包车
                                    </label>
                                </div>
                            </fieldset>
                        </div>
@@ -324,13 +324,11 @@
        TCompanyInfoDlg.checkbox4();
        TCompanyInfoDlg.checkbox5();
        TCompanyInfoDlg.checkbox6();
        TCompanyInfoDlg.checkbox7();
        var zc = $("input[name='zc']:checked").val();
        var cz = $("input[name='cz']:checked").val();
        var tcx = $("input[name='tcx']:checked").val();
        var kcx = $("input[name='kcx']:checked").val();
        var dcx = $("input[name='dcx']:checked").val();
        if (zc == "" || zc == null || zc == undefined){
            $("#zc1").attr("checked","checked")
        }
@@ -342,9 +340,6 @@
        }
        if (kcx == "" || kcx == null || kcx == undefined){
            $("#kcx1").attr("checked","checked")
        }
        if (dcx == "" || dcx == null || dcx == undefined){
            $("#dcx1").attr("checked","checked")
        }
    });
</script>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -23,7 +23,7 @@
                            <div class="checkbox checkbox-success">
                                <input name="checkbox" id="checkbox1" disabled type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} >
                                <label for="checkbox1">
                                    快车
                                    专车
                                </label>
                                <fieldset>
                                    <div class="row" style="display: none;" id="zcDiv">
@@ -191,46 +191,6 @@
                                <label for="checkbox6">
                                    包车
                                </label>
                            </div>
                            <div class="checkbox checkbox-warning">
                                <input name="checkbox" id="checkbox7" disabled type="checkbox" value="7" ${1 == item.isOnCall ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox7()">
                                <label for="checkbox7">
                                    95128电召
                                </label>
                                <fieldset>
                                    <div class="row" style="display: none;" id="dcxDiv">
                                        <div class="col-sm-6">
                                            <div class="checkbox checkbox-circle">
                                                <input type="radio" name="dcx" disabled id="dcx1" value="1" ${1 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                <label for="dcx1">
                                                    <div style="position: relative;top: -8px;">
                                                        <span>按比例抽成,每笔订单抽取</span>
                                                        <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="dcxPercent" name="dcxPercent"
                                                               @if(1 == item.isOnCallFixedOrProportional){
                                                               value="${item.onCallMoney}"
                                                               @}
                                                        >
                                                        <span>%</span>
                                                    </div>
                                                </label>
                                            </div>
                                            <div class="checkbox checkbox-circle">
                                                <input type="radio" name="dcx" id="dcx2" value="2" ${2 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                <label for="dcx2">
                                                    <div style="position: relative;top: -8px;">
                                                        <span>按固定金额抽成,每笔订单抽取</span>
                                                        <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxMoney" name="dcxMoney"
                                                               @if(2 == item.isOnCallFixedOrProportional){
                                                               value="${item.onCallMoney}"
                                                               @}
                                                        >
                                                        <span>元</span>
                                                    </div>
                                                </label>
                                            </div>
                                        </div>
                                    </div>
                                </fieldset>
                            </div>
                        </fieldset>
                    </div>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -50,7 +50,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                        快车
                                        专车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="zcDiv">
@@ -219,46 +219,6 @@
                                        包车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-warning">
                                    <input name="checkbox" id="checkbox7" type="checkbox" value="7" ${1 == item.isOnCall ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox7()">
                                    <label for="checkbox7">
                                        95128电召
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="dcxDiv">
                                            <div class="col-sm-6">
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx1" value="1" ${1 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="dcx1">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按比例抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxPercent" name="dcxPercent"
                                                                   @if(1 == item.isOnCallFixedOrProportional){
                                                                   value="${item.onCallMoney}"
                                                                   @}
                                                            >
                                                            <span>%</span>
                                                        </div>
                                                    </label>
                                                </div>
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx2" value="2" ${2 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="dcx2">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按固定金额抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxMoney" name="dcxMoney"
                                                                   @if(2 == item.isOnCallFixedOrProportional){
                                                                   value="${item.onCallMoney}"
                                                                   @}
                                                            >
                                                            <span>元</span>
                                                        </div>
                                                    </label>
                                                </div>
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                            </fieldset>
                        </div>
                    </div>
@@ -390,13 +350,11 @@
        TCompanyInfoDlg.checkbox4();
        TCompanyInfoDlg.checkbox5();
        TCompanyInfoDlg.checkbox6();
        TCompanyInfoDlg.checkbox7();
        var zc = $("input[name='zc']:checked").val();
        var cz = $("input[name='cz']:checked").val();
        var tcx = $("input[name='tcx']:checked").val();
        var kcx = $("input[name='kcx']:checked").val();
        var dcx = $("input[name='dcx']:checked").val();
        if (zc == "" || zc == null || zc == undefined){
            $("#zc1").attr("checked","checked")
        }
@@ -408,9 +366,6 @@
        }
        if (kcx == "" || kcx == null || kcx == undefined){
            $("#kcx1").attr("checked","checked")
        }
        if (dcx == "" || dcx == null || dcx == undefined){
            $("#dcx1").attr("checked","checked")
        }
    });
</script>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -31,7 +31,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                        快车
                                        专车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="zcDiv">
@@ -200,46 +200,6 @@
                                        包车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-warning">
                                    <input name="checkbox" id="checkbox7" type="checkbox" value="7" ${1 == item.isOnCall ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox7()">
                                    <label for="checkbox7">
                                        95128电召
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="dcxDiv">
                                            <div class="col-sm-6">
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx1" value="1" ${1 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="dcx1">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按比例抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxPercent" name="dcxPercent"
                                                                   @if(1 == item.isOnCallFixedOrProportional){
                                                                   value="${item.onCallMoney}"
                                                                   @}
                                                            >
                                                            <span>%</span>
                                                        </div>
                                                    </label>
                                                </div>
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="dcx" id="dcx2" value="2" ${2 == item.isOnCallFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="dcx2">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按固定金额抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="dcxMoney" name="dcxMoney"
                                                                   @if(2 == item.isOnCallFixedOrProportional){
                                                                   value="${item.onCallMoney}"
                                                                   @}
                                                            >
                                                            <span>元</span>
                                                        </div>
                                                    </label>
                                                </div>
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                            </fieldset>
                        </div>
                    </div>
@@ -296,13 +256,11 @@
        FranchiseeInfoDlg.checkbox4();
        FranchiseeInfoDlg.checkbox5();
        FranchiseeInfoDlg.checkbox6();
        FranchiseeInfoDlg.checkbox7();
        var zc = $("input[name='zc']:checked").val();
        var cz = $("input[name='cz']:checked").val();
        var tcx = $("input[name='tcx']:checked").val();
        var kcx = $("input[name='kcx']:checked").val();
        var dcx = $("input[name='dcx']:checked").val();
        if (zc == "" || zc == null || zc == undefined){
            $("#zc1").attr("checked","checked")
        }
@@ -314,9 +272,6 @@
        }
        if (kcx == "" || kcx == null || kcx == undefined){
            $("#kcx1").attr("checked","checked")
        }
        if (dcx == "" || dcx == null || dcx == undefined){
            $("#dcx1").attr("checked","checked")
        }
    });
</script>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
@@ -49,6 +49,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tComplaint/tComplaint.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/deductmoney.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tComplaint.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
@@ -61,6 +61,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tDriver/tDriver.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -58,12 +58,11 @@
                            </div>
                        </div>
                    </div>
                    <#input id="mchtNo" name="银行商户号"/>
                    <#input id="driveCard" name="驾驶证号码"/>
                    <#avatar id="driveCardImgUrl" name="驾驶证照片:" />
                    <#input id="driverAge" name="驾龄" />
                    <#input id="idCard" name="身份证号" />
                    <#avatar id="idCardImgUrl1" name="身份证正面照:" />
                    <#avatar id="idCardImgUrl2" name="身份证背面照:" />
                    <#input id="driverAddress" name="居住地址" />
                    <#input id="taxiAptitudeCard" name="出租车资格证号" />
                    <#avatar id="networkCarlssueImg" name="网约车资格证照片:" />
@@ -74,7 +73,7 @@
                            <div class="col-sm-9">
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox1" value="1">
                                    <label for="serverBox1"> 快车/专车 </label>
                                    <label for="serverBox1"> 专车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox2" value="2">
@@ -82,15 +81,19 @@
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="YesDriverInfoDlg.checkBox()" >
                                    <label for="serverBox3"> 机场专线 </label>
                                    <label for="serverBox3"> 跨城出行 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox6" value="7">
                                    <label for="serverBox6"> 景区直通车 </label>
                                    <input type="checkbox" name="serverBox" id="serverBox4" value="4">
                                    <label for="serverBox4"> 小件物流-同城 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox8" value="8">
                                    <label for="serverBox8"> 公务出行 </label>
                                    <input type="checkbox" name="serverBox" id="serverBox5" value="5">
                                    <label for="serverBox5"> 小件物流-跨城 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox6" value="6">
                                    <label for="serverBox6"> 包车 </label>
                                </div>
                            </div>
                        </fieldset>
@@ -219,6 +222,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -62,12 +62,11 @@
                            </div>
                        </div>
                    </div>
                    <#input id="mchtNo" name="银行商户号" value="${item.mchtNo}"/>
                    <#input id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>
                    <#avatar id="driveCardImgUrl" name="驾驶证照片:" avatarImg="${item.driveCardImgUrl}"/>
                    <#input id="driverAge" name="驾龄"  value="${item.driverAge}"/>
                    <#input id="idCard" name="身份证号" value="${item.idCard}"/>
                    <#avatar id="idCardImgUrl1" name="身份证正面照:" avatarImg="${item.idCardImgUrl1}"/>
                    <#avatar id="idCardImgUrl2" name="身份证背面照:" avatarImg="${item.idCardImgUrl2}"/>
                    <#input id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
                    <#input id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
                    <#input id="jobNumber" name="工号(选填)" value="${item.jobNumber}"/>
@@ -77,7 +76,7 @@
                            <div class="col-sm-9">
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''}>
                                    <label for="serverBox1"> 快车 </label>
                                    <label for="serverBox1"> 专车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>
@@ -235,6 +234,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script type="application/javascript">
    laydate.render({
        elem: '#getDriverLicenseDate'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html
@@ -9,6 +9,7 @@
                    <#label id="phone" name="手机号" value="${item.phone}"/>
                    <#label id="sexStr" name="性别" value="${item.sexStr}"/>
                    <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>
                    <#label id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">驾驶证照片:</label>
                        <div class="col-sm-9">
@@ -17,9 +18,9 @@
                                    <div id="driveCardImgUrlPreId">
                                        <div>
                                            @if(isEmpty(item.driveCardImgUrl)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.driveCardImgUrl}')" src="${item.driveCardImgUrl}" style="width:150px;">
                                            <img onclick="lookBigImg('${item.driveCardImgUrl}')" src="${item.driveCardImgUrl}" style="max-width:250px;">
                                            @}
                                        </div>
                                    </div>
@@ -32,7 +33,6 @@
                    <#label id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
                    <#label id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
                    <#label id="serverStr" name="服务模式" value="${item.serverStr}"/>
                    <#label id="placeOfPractice" name="从业地" value="${placeOfPractice}"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">审核结果:</label>
                        <div class="col-sm-9">
@@ -57,9 +57,9 @@
                                    <div id="headImgUrlPreId">
                                        <div>
                                            @if(isEmpty(item.headImgUrl)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.headImgUrl}')" src="${item.headImgUrl}" style="width:150px;">
                                            <img onclick="lookBigImg('${item.headImgUrl}')" src="${item.headImgUrl}" style="max-width:250px;">
                                            @}
                                        </div>
                                    </div>
@@ -70,63 +70,6 @@
                    </div>
                    <#label id="companyName" name="所属机构" value="${item.companyName}"/>
                    <#label id="driverAge" name="驾龄" value="${item.driverAge}"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">身份证正面:</label>
                        <div class="col-sm-9">
                            <div class="form-group">
                                <div class="col-sm-6">
                                    <div id="idCardImgUrl1PreId">
                                        <div>
                                            @if(isEmpty(item.idCardImgUrl1)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.idCardImgUrl1}')" src="${item.idCardImgUrl1}" style="width:150px;">
                                            @}
                                        </div>
                                    </div>
                                </div>
                                <input type="hidden" id="idCardImgUrl1" name="headImgUrl" value="${item.idCardImgUrl1}"/>
                            </div>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">身份证背面:</label>
                        <div class="col-sm-9">
                            <div class="form-group">
                                <div class="col-sm-6">
                                    <div id="idCardImgUrl2PreId">
                                        <div>
                                            @if(isEmpty(item.headImgUrl)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.idCardImgUrl2}')" src="${item.idCardImgUrl2}" style="width:150px;">
                                            @}
                                        </div>
                                    </div>
                                </div>
                                <input type="hidden" id="idCardImgUrl2" name="headImgUrl" value="${item.idCardImgUrl2}"/>
                            </div>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">网约车资格证:</label>
                        <div class="col-sm-9">
                            <div class="form-group">
                                <div class="col-sm-6">
                                    <div id="networkCarlssueImgPreId">
                                        <div>
                                            @if(isEmpty(item.headImgUrl)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.networkCarlssueImg}')" src="${item.networkCarlssueImg}" style="width:150px;">
                                            @}
                                        </div>
                                    </div>
                                </div>
                                <input type="hidden" id="networkCarlssueImg" name="headImgUrl" value="${item.networkCarlssueImg}"/>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
@@ -9,6 +9,7 @@
                    <#label id="phone" name="手机号" value="${item.phone}"/>
                    <#label id="sexStr" name="性别" value="${item.sexStr}"/>
                    <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>
                    <#label id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">驾驶证照片:</label>
                        <div class="col-sm-9">
@@ -17,9 +18,9 @@
                                    <div id="driveCardImgUrlPreId">
                                        <div>
                                            @if(isEmpty(item.driveCardImgUrl)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.driveCardImgUrl}')" src="${item.driveCardImgUrl}" style="width:150px;">
                                            <img onclick="lookBigImg('${item.driveCardImgUrl}')" src="${item.driveCardImgUrl}" style="max-width:250px;">
                                            @}
                                        </div>
                                    </div>
@@ -31,7 +32,6 @@
                    <#label id="idCard" name="身份证号码" value="${item.idCard}"/>
                    <#label id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
                    <#label id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
                    <#label id="placeOfPractice" name="从业地" value="${placeOfPractice}"/>
                    <#label id="serverStr" name="服务模式" value="${item.serverStr}"/>
                    <#label id="authStateStr" name="审核结果" value="${item.authStateStr}"/>
                </div>
@@ -45,9 +45,9 @@
                                    <div id="headImgUrlPreId">
                                        <div>
                                            @if(isEmpty(item.headImgUrl)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.headImgUrl}')" src="${item.headImgUrl}" style="width:150px;">
                                            <img onclick="lookBigImg('${item.headImgUrl}')" src="${item.headImgUrl}" style="max-width:250px;">
                                            @}
                                        </div>
                                    </div>
@@ -58,66 +58,12 @@
                    </div>
                    <#label id="companyName" name="所属机构" value="${item.companyName}"/>
                    <#label id="driverAge" name="驾龄" value="${item.driverAge}"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">身份证正面:</label>
                        <div class="col-sm-9">
                            <div class="form-group">
                                <div class="col-sm-6">
                                    <div id="idCardImgUrl1PreId">
                                        <div>
                                            @if(isEmpty(item.idCardImgUrl1)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.idCardImgUrl1}')" src="${item.idCardImgUrl1}" style="width:150px;">
                                            @}
                                        </div>
                                    </div>
                                </div>
                                <input type="hidden" id="idCardImgUrl1" name="headImgUrl" value="${item.idCardImgUrl1}"/>
                            </div>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">身份证背面:</label>
                        <div class="col-sm-9">
                            <div class="form-group">
                                <div class="col-sm-6">
                                    <div id="idCardImgUrl2PreId">
                                        <div>
                                            @if(isEmpty(item.headImgUrl)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.idCardImgUrl2}')" src="${item.idCardImgUrl2}" style="width:150px;">
                                            @}
                                        </div>
                                    </div>
                                </div>
                                <input type="hidden" id="idCardImgUrl2" name="headImgUrl" value="${item.idCardImgUrl2}"/>
                            </div>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">网约车资格证:</label>
                        <div class="col-sm-9">
                            <div class="form-group">
                                <div class="col-sm-6">
                                    <div id="networkCarlssueImgPreId">
                                        <div>
                                            @if(isEmpty(item.headImgUrl)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.networkCarlssueImg}')" src="${item.networkCarlssueImg}" style="width:150px;">
                                            @}
                                        </div>
                                    </div>
                                </div>
                                <input type="hidden" id="networkCarlssueImg" name="headImgUrl" value="${item.networkCarlssueImg}"/>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tDriver/tDriver_info.js"></script>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
@@ -77,9 +77,6 @@
                            @if(shiro.hasPermission("/tDriver/changeCar")){
                            <#button name="更换/绑定车辆" icon="fa-remove" clickFun="YesDriver.changeCar()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tDriver/deductmoney")){
                            <#button name="添加扣款" icon="fa-remove" clickFun="YesDriver.deductmoney()" space="true"/>
                            @}
                        </div>
                        <#table id="YesDriverTable"/>
                    </div>
@@ -89,6 +86,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tDriver/yesDriver.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html
@@ -43,6 +43,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tFeedback/tFeedback.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html
@@ -43,6 +43,7 @@
</div>
</div>
<script src="${ctxPath}/static/modular/system/tFeedback/userFeedback.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
@@ -42,8 +42,6 @@
                            @if(shiro.hasPermission("/tInvoice/again")){
                                <#button name="重新开票" icon="fa-edit" clickFun="TInvoice.again()"/>
                            @}
                            <#button name="同意开票" icon="fa-check" clickFun="TInvoice.agree()" space="true"/>
                            <#button name="拒绝开票" icon="fa-remove" clickFun="TInvoice.disagree()" space="true"/>
                            @if(shiro.hasPermission("/tInvoice/delete")){
                                <#button name="删除记录" icon="fa-remove" clickFun="TInvoice.delete()" space="true"/>
                            @}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html
@@ -106,14 +106,13 @@
                    <div class="form-group" id="floatDiv" style="display: none;">
                        <label class="col-sm-2 control-label">浮动计价:</label>
                        <div class="col-sm-10">
                            参考价格:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" />&nbsp;元;
                            参考费用:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" />&nbsp;元;
                            参考里程:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num12" id="num12" class="form-control newWidth" />&nbsp;公里;<br><br>
                            保底价:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" />&nbsp;元;
                            超出参考里程优惠系数:&nbsp;<input type="text" oninput="checkIsXiShu1(this)" name="num14" id="num14" class="form-control newWidth" />&nbsp;;<br><br>
                            低于参考里程优惠系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num15" id="num15" class="form-control newWidth" />&nbsp;;
                            包车系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num16" id="num16" class="form-control newWidth" />&nbsp;;<br><br>
                            五座系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num17" id="num17" class="form-control newWidth" />&nbsp;;
                            七座系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num18" id="num18" class="form-control newWidth" />&nbsp;;<br><br>
                            基础单价:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" />&nbsp;元;
                            优惠系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num14" id="num14" class="form-control newWidth" />&nbsp;;<br><br>
                            包车系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num15" id="num15" class="form-control newWidth" />&nbsp;;
                            五座系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num16" id="num16" class="form-control newWidth" />&nbsp;;<br><br>
                            七座系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num17" id="num17" class="form-control newWidth" />&nbsp;;
                        </div>
                    </div>
@@ -212,20 +211,13 @@
        ,format: 'HH:mm'
    });
    var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
    var regXiShu = /^(0(\.\d{1,2})?|1?)$/;
    var regXiShu1 = /^([1-9]{1,})(\.\d{1,2})?$/;
    var regXiShu = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
    var regBiLi = /^([0-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/;
    var regInt = /^[0-9]{0,3}$/;
    function checkIsYuan(obj){
        var num = $(obj).val();
        if(!regDouble.test(num)){
            layer.msg("【元】输入框不能超过3位数,保留两位小数");
        }
    }
    function checkIsXiShu1(obj){
        var num = $(obj).val();
        if(!regXiShu1.test(num)){
            layer.msg("【系数】输入框大于1,保留两位小数");
        }
    }
    function checkIsXiShu(obj){
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html
@@ -106,14 +106,13 @@
                    <div class="form-group" id="floatDiv" style="display: none;">
                        <label class="col-sm-2 control-label">浮动计价:</label>
                        <div class="col-sm-10">
                            参考价格:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" />&nbsp;元;
                            参考费用:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" />&nbsp;元;
                            参考里程:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num12" id="num12" class="form-control newWidth" />&nbsp;公里;<br><br>
                            保底价:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" />&nbsp;元;
                            超出参考里程优惠系数:&nbsp;<input type="text" oninput="checkIsXiShu1(this)" name="num14" id="num14" class="form-control newWidth" />&nbsp;;<br><br>
                            低于参考里程优惠系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num15" id="num15" class="form-control newWidth" />&nbsp;;
                            包车系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num16" id="num16" class="form-control newWidth" />&nbsp;;<br><br>
                            五座系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num17" id="num17" class="form-control newWidth" />&nbsp;;
                            七座系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num18" id="num18" class="form-control newWidth" />&nbsp;;<br><br>
                            基础单价:&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" />&nbsp;元;
                            优惠系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num14" id="num14" class="form-control newWidth" />&nbsp;;<br><br>
                            包车系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num15" id="num15" class="form-control newWidth" />&nbsp;;
                            五座系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num16" id="num16" class="form-control newWidth" />&nbsp;;<br><br>
                            七座系数:&nbsp;<input type="text" oninput="checkIsXiShu(this)" name="num17" id="num17" class="form-control newWidth" />&nbsp;;
                        </div>
                    </div>
@@ -226,20 +225,13 @@
        ,format: 'HH:mm'
    });
    var regDouble = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/;
    var regXiShu = /^(0(\.\d{1,2})?)$/;
    var regXiShu1 = /^([1-9]{1,})(\.\d{1,2})?$/;
    var regXiShu = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
    var regBiLi = /^([0-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/;
    var regInt = /^[0-9]{0,3}$/;
    function checkIsYuan(obj){
        var num = $(obj).val();
        if(!regDouble.test(num)){
            layer.msg("【元】输入框不能超过3位数,保留两位小数");
        }
    }
    function checkIsXiShu1(obj){
        var num = $(obj).val();
        if(!regXiShu1.test(num)){
            layer.msg("【系数】输入框大于1,保留两位小数");
        }
    }
    function checkIsXiShu(obj){
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tMerchant/tMerchantAudit.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tMerchant/tMerchantIndex.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOfflineTravelPayment/tOfflineTravelPayment.html
New file
@@ -0,0 +1,51 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-2">
                                <#NameCon id="driverName" name="司机姓名" />
                            </div>
                            <div class="col-sm-2">
                                <#TimeCon id="payTime" name="订单时间" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="搜索" icon="fa-search" clickFun="TOfflineTravelPayment.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="TOfflineTravelPayment.resetSearch()"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="TOfflineTravelPaymentTableToolbar" role="group">
                            @if(shiro.hasPermission("/tOfflineTravelPayment/export")){
                                <#button name="导出" icon="" clickFun="TOfflineTravelPayment.export()"/>
                            @}
                            @if(shiro.hasPermission("/tOfflineTravelPayment/add")){
                                <#button name="添加" icon="fa-plus" clickFun="TOfflineTravelPayment.openAddTOfflineTravelPayment()"/>
                            @}
                            @if(shiro.hasPermission("/tOfflineTravelPayment/update")){
                                <#button name="修改" icon="fa-edit" clickFun="TOfflineTravelPayment.openTOfflineTravelPaymentDetail()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tOfflineTravelPayment/delete")){
                                <#button name="删除" icon="fa-remove" clickFun="TOfflineTravelPayment.delete()" space="true"/>
                            @}
                        </div>
                        <#table id="TOfflineTravelPaymentTable"/>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOfflineTravelPayment/tOfflineTravelPayment.js"></script>
<script type="text/javascript">
    laydate.render({
        elem: '#payTime'
        ,range: true
    });
</script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOfflineTravelPayment/tOfflineTravelPayment_add.html
New file
@@ -0,0 +1,34 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
            <div class="row">
                <div class="col-sm-6 b-r">
                            <#input id="id" name="主键" underline="true"/>
                            <#input id="orderId" name="下单唯一标识" underline="true"/>
                            <#input id="payType" name="支付方式(1=微信,2=支付宝)" underline="true"/>
                            <#input id="payMoney" name="支付金额" underline="true"/>
                            <#input id="payTime" name="支付时间"/>
                </div>
                <div class="col-sm-6">
                            <#input id="payNumber" name="支付流水号" underline="true"/>
                            <#input id="driverId" name="服务司机id" underline="true"/>
                            <#input id="status" name="状态(1=待支付,2=已支付)" underline="true"/>
                            <#input id="insertTime" name="添加时间" underline="true"/>
                </div>
            </div>
            <div class="row btn-group-m-t">
                <div class="col-sm-10">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOfflineTravelPaymentInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOfflineTravelPaymentInfoDlg.close()"/>
                </div>
            </div>
        </div>
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOfflineTravelPayment/tOfflineTravelPayment_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOfflineTravelPayment/tOfflineTravelPayment_edit.html
New file
@@ -0,0 +1,34 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
            <div class="row">
                <div class="col-sm-6 b-r">
                            <#input id="id" name="主键" value="${item.id}" underline="true"/>
                            <#input id="orderId" name="下单唯一标识" value="${item.orderId}" underline="true"/>
                            <#input id="payType" name="支付方式(1=微信,2=支付宝)" value="${item.payType}" underline="true"/>
                            <#input id="payMoney" name="支付金额" value="${item.payMoney}" underline="true"/>
                            <#input id="payTime" name="支付时间" value="${item.payTime}" />
                </div>
                <div class="col-sm-6">
                            <#input id="payNumber" name="支付流水号" value="${item.payNumber}" underline="true"/>
                            <#input id="driverId" name="服务司机id" value="${item.driverId}" underline="true"/>
                            <#input id="status" name="状态(1=待支付,2=已支付)" value="${item.status}" underline="true"/>
                            <#input id="insertTime" name="添加时间" value="${item.insertTime}" />
                </div>
            </div>
            <div class="row btn-group-m-t">
                <div class="col-sm-10">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOfflineTravelPaymentInfoDlg.editSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOfflineTravelPaymentInfoDlg.close()"/>
                </div>
            </div>
        </div>
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOfflineTravelPayment/tOfflineTravelPayment_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
@@ -26,11 +26,12 @@
                        <div class="col-sm-3">
                            <select class="form-control" id="businessType">
                                <option value="">选择经营业务</option>
                                <option value="1">快车/专车</option>
                                <option value="1">专车</option>
                                <option value="2">出租车</option>
                                <option value="3">机场专线</option>
                                <option value="7">景区直通车</option>
                                <option value="8">公务出行</option>
                                <option value="3">跨城出行</option>
                                <option value="4">跨城小件物流</option>
                                <option value="5">同城小件物流</option>
                                <option value="6">包车</option>
                            </select>
                        </div>
                        <div class="col-sm-3" >
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
@@ -33,13 +33,12 @@
                        <div class="col-sm-3">
                            <select class="form-control" id="businessType">
                                <option value="">选择经营业务</option>
                                <option value="1">快车</option>
                                <option value="1">专车</option>
                                <option value="2">出租车</option>
                                <option value="3">跨城出行</option>
                                <option value="4">跨城小件物流</option>
                                <option value="5">同城小件物流</option>
                                <option value="6">包车</option>
                                <option value="7">95128</option>
                            </select>
                        </div>
                        <div class="col-sm-3" >
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html
@@ -100,6 +100,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html
@@ -101,7 +101,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=d868ee8a0084a4a1b4271d8030e32fba"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html
@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=d868ee8a0084a4a1b4271d8030e32fba"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
@@ -30,7 +30,7 @@
                            <div class="col-sm-3">
                                <#SelectCon id="orderType" name="订单类型" >
                                    <option value="">全部</option>
                                    <option value="1">快车</option>
                                    <option value="1">专车</option>
                                    <option value="2">出租车</option>
                                    <option value="3">跨城出行</option>
                                    <option value="4">跨城小件物流</option>
@@ -62,6 +62,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOrderEvaluate/tOrderEvaluate.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html
@@ -8,7 +8,7 @@
                            <#input id="id" name="" underline="true"/>
                            <#input id="orderId" name="订单id" underline="true"/>
                            <#input id="driverId" name="司机id" underline="true"/>
                            <#input id="orderType" name="1=快车,2=出租车,3=跨城出行,4=跨城小件物流,5=同城小件物流,6=包车"/>
                            <#input id="orderType" name="1=专车,2=出租车,3=跨城出行,4=跨城小件物流,5=同城小件物流,6=包车"/>
                </div>
                <div class="col-sm-6">
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html
@@ -8,7 +8,7 @@
                            <#input id="id" name="" value="${item.id}" underline="true"/>
                            <#input id="orderId" name="订单id" value="${item.orderId}" underline="true"/>
                            <#input id="driverId" name="司机id" value="${item.driverId}" underline="true"/>
                            <#input id="orderType" name="1=快车,2=出租车,3=跨城出行,4=跨城小件物流,5=同城小件物流,6=包车" value="${item.orderType}" />
                            <#input id="orderType" name="1=专车,2=出租车,3=跨城出行,4=跨城小件物流,5=同城小件物流,6=包车" value="${item.orderType}" />
                </div>
                <div class="col-sm-6">
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
@@ -76,9 +76,6 @@
                            @if(shiro.hasPermission("/tOrderLogistics/delete")){
                                <#button name="删除记录" icon="fa-remove" clickFun="TOrderLogistics.delete()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tOrderLogistics/updateRecipient")){
                            <#button name="修改收件人" icon="fa-edit" clickFun="TOrderLogistics.updateRecipient()" space="true"/>
                            @}
                        </div>
                        <#table id="TOrderLogisticsTable"/>
                    </div>
@@ -88,6 +85,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOrderLogistics/tOrderLogistics.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
@@ -2,8 +2,6 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
            <input id="userImg1" type="hidden" value="${item.userImg}">
            <input id="driverImg1" type="hidden" value="${item.driverImg}">
            <div class="row" style="margin-top: 30px;">
                <div class="col-sm-4">
                    <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
@@ -49,17 +47,6 @@
                    @}else{
                    <#label id="couponMoney" name="优惠券抵扣费用" value="0.00元"/>
                    @}
                    <div class="form-group">
                        <label class="col-sm-3 control-label">打车卡优惠金额:</label>
                        <div class="col-sm-9">
                            <label class="control-label" id="couponMoney" name="couponMoney" style="text-align: left;">
                                ${item.orderMoney-item.payMoney-item.couponMoney}元
                            </label>
                        </div>
                    </div>
                    <#label id="timeOutMoney" name="平台超时扣款" value="${item.timeOutMoney}元"/>
                    <#label id="returnMoney" name="申诉退回" value="${item.returnMoney}元"/>
                </div>
                <div class="col-sm-6">
                    <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
@@ -67,18 +54,6 @@
                @}else{
                <h4 style="margin-left: 10%">暂无费用明细</h4>
                @}
            </div><br/>
            <div class="row">
                <label class="control-label col-sm-1">商品图:</label>
                <div class="col-sm-11" id="userImg">
                </div>
            </div><br/>
            <div class="row">
                <label class="control-label col-sm-1">回单照片:</label>
                <div class="col-sm-11" id="driverImg">
                </div>
            </div>
        </div>
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>快车订单管理</h5>
                <h5>专车订单管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
@@ -66,21 +66,13 @@
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="rideType" name="订单类型" >
                                    <option value="">全部</option>
                                    <option value="1">独享订单</option>
                                    <option value="2">一口价订单</option>
                                    <option value="3">拼车订单</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">
                                <#button name="搜索" icon="fa-search" clickFun="TOrderPrivateCar.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="TOrderPrivateCar.resetSearch()" space="true"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="TOrderPrivateCarTableToolbar" role="group">
                            @if(shiro.hasPermission("/tOrderPrivateCar/orderDetail")){
                                <#button name="订单详情" icon="fa-search" clickFun="TOrderPrivateCar.orderDetail()"/>
                                <#button name="订单详情" icon="fa-plus" clickFun="TOrderPrivateCar.orderDetail()"/>
                            @}
                            @if(shiro.hasPermission("/tOrderPrivateCar/cancelOrder")){
                                <#button name="取消订单" icon="fa-edit" clickFun="TOrderPrivateCar.cancelOrder()" space="true"/>
@@ -91,9 +83,6 @@
                            @if(shiro.hasPermission("/tOrderPrivateCar/deleteOrder")){
                                <#button name="删除记录" icon="fa-remove" clickFun="TOrderPrivateCar.deleteOrder()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tOrderPrivateCar/addOrder")){
                            <#button name="添加订单" icon="fa-plus" clickFun="TOrderPrivateCar.addOrder()" space="true"/>
                            @}
                        </div>
                        <#table id="TOrderPrivateCarTable"/>
                    </div>
@@ -103,6 +92,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html
@@ -2,479 +2,88 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
            <input type="hidden" id="html" value="2">
            <input type="hidden" id="type" value="2">
            <div class="row">
                <div class="form-group">
                    <label class="control-label col-sm-2">起点:</label>
                    <div class="col-sm-3">
                        <input class="form-control" id="startAddress" autocomplete="off" onclick="TOrderPrivateCarInfoDlg.startAddress()">
                        <input type="hidden" id="startLon">
                        <input type="hidden" id="startLat">
                    </div>
                </div>
                <div class="form-group" id="startAddressModel" hidden>
                    <label class="control-label col-sm-2"></label>
                    <div class="col-sm-6" style="margin-left: 15px;height: 500px" id="startAddressBody">
                    </div>
                </div>
                <div class="form-group">
                    <label class="control-label col-sm-2">终点:</label>
                    <div class="col-sm-3">
                        <input class="form-control" id="endAddress" autocomplete="off" onclick="TOrderPrivateCarInfoDlg.endAddress()">
                        <input type="hidden" id="endLon">
                        <input type="hidden" id="endLat">
                    </div>
                </div>
                <div class="form-group" id="endAddressModel" hidden>
                    <label class="control-label col-sm-2"></label>
                    <div class="col-sm-6" style="margin-left: 15px;height: 500px" id="endAddressBody">
                    </div>
                </div>
                <div class="form-group">
                    <label class="control-label col-sm-2">用车时间:</label>
                    <div class="col-sm-3">
                        <input class="form-control"  autocomplete="off" id="travelTime">
                    </div>
                </div>
                <div class="form-group">
                    <label class="control-label col-sm-2">乘车人姓名:</label>
                    <div class="col-sm-3">
                        <input class="form-control" id="passengers">
                    </div>
                </div>
                <div class="form-group">
                    <label class="control-label col-sm-2">乘车人手机号:</label>
                    <div class="col-sm-3">
                        <input class="form-control" id="passengersPhone">
                    </div>
                <div class="col-sm-6 b-r">
                            <#input id="id" name="主键id" underline="true"/>
                            <#input id="type" name="类型(1=普通订单,2=摆渡订单)" underline="true"/>
                            <#input id="userId" name="用户id" underline="true"/>
                            <#input id="driverId" name="接单司机ID" underline="true"/>
                            <#input id="carId" name="车辆id" underline="true"/>
                            <#input id="orderNum" name="订单号" underline="true"/>
                            <#input id="placementLon" name="下单地点经度" underline="true"/>
                            <#input id="placementLat" name="下单地点纬度" underline="true"/>
                            <#input id="placementAddress" name="下单地点" underline="true"/>
                            <#input id="startLon" name="出发地经度值" underline="true"/>
                            <#input id="startLat" name="出发地纬度值" underline="true"/>
                            <#input id="endLon" name="目的地经度" underline="true"/>
                            <#input id="startAddress" name="出发地地点" underline="true"/>
                            <#input id="endLat" name="目的地纬度" underline="true"/>
                            <#input id="endAddress" name="目的地地点" underline="true"/>
                            <#input id="boardingLon" name="上车点经度" underline="true"/>
                            <#input id="boardingLat" name="上车点纬度" underline="true"/>
                            <#input id="boardingAddress" name="上车点" underline="true"/>
                            <#input id="boardingTime" name="上车时间" underline="true"/>
                            <#input id="getoffLon" name="下车点经度" underline="true"/>
                            <#input id="getoffLat" name="下车点纬度" underline="true"/>
                            <#input id="getoffAddress" name="下车地点" underline="true"/>
                            <#input id="getoffTime" name="下车时间" underline="true"/>
                            <#input id="mileage" name="行驶里程数(米)" underline="true"/>
                            <#input id="payManner" name="支付方式(1=OK平台支付,2=其他方式支付)" underline="true"/>
                            <#input id="payType" name="支付方式(1=微信,2=支付宝,3=其他)" underline="true"/>
                            <#input id="orderMoney" name="订单金额" underline="true"/>
                            <#input id="startMoney" name="起步价" underline="true"/>
                            <#input id="mileageMoney" name="里程费" underline="true"/>
                            <#input id="durationMoney" name="时长费" underline="true"/>
                            <#input id="longDistanceMoney" name="远途费" underline="true"/>
                            <#input id="parkMoney" name="停车费"/>
                </div>
                <div class="form-group">
                    <label class="control-label col-sm-2">车型:</label>
                    <div class="col-sm-3">
                        <select class="form-control " id="serverCarModelId">
                            @for(carModel in carModelList){
                            <option value="${carModel.id}">${carModel.name}</option>
                            @}
                        </select>
                    </div>
                <div class="col-sm-6">
                            <#input id="roadTollMoney" name="过路费" underline="true"/>
                            <#input id="redPacketMoney" name="红包抵扣金额" underline="true"/>
                            <#input id="couponMoney" name="优惠券抵扣金额" underline="true"/>
                            <#input id="redPacketId" name="红包记录id" underline="true"/>
                            <#input id="couponId" name="优惠券id" underline="true"/>
                            <#input id="discount" name="折扣" underline="true"/>
                            <#input id="discountMoney" name="折扣优惠金额" underline="true"/>
                            <#input id="activityId" name="折扣活动id" underline="true"/>
                            <#input id="companyId" name="公司id" underline="true"/>
                            <#input id="payMoney" name="支付金额" underline="true"/>
                            <#input id="substitute" name="是否是代下单(0:否,1:是)" underline="true"/>
                            <#input id="passengers" name="乘车人" underline="true"/>
                            <#input id="passengersPhone" name="乘车人电话" underline="true"/>
                            <#input id="state" name="状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中,12=取消待支付)" underline="true"/>
                            <#input id="insertTime" name="下单时间" underline="true"/>
                            <#input id="travelTime" name="出行时间" underline="true"/>
                            <#input id="snatchOrderTime" name="抢单时间" underline="true"/>
                            <#input id="setOutTime" name="司机点出发时间" underline="true"/>
                            <#input id="arriveTime" name="司机到达预约地点时间" underline="true"/>
                            <#input id="startServiceTime" name="开始服务时间" underline="true"/>
                            <#input id="endServiceTime" name="结束服务时间" underline="true"/>
                            <#input id="orderType" name="订单类型(1=普通,2=预约)" underline="true"/>
                            <#input id="orderSource" name="下单方式(1:APP下单,2:扫码下单,3:小程序下单,4:司机下单,5:调度下单)" underline="true"/>
                            <#input id="invoiceId" name="发票id" underline="true"/>
                            <#input id="isReassign" name="是否是改派单(1=否,2=是)" underline="true"/>
                            <#input id="reassignNotice" name="改派通知(0=没有改派,1=改派中,2=已改派)" underline="true"/>
                            <#input id="trackId" name="高德猎鹰上的轨迹id" underline="true"/>
                            <#input id="isDelete" name="是否删除  1=否 2=是" underline="true"/>
                            <#input id="oldState" name="状态(改派前订单状态)" underline="true"/>
                            <#input id="telX" name="移动小号" underline="true"/>
                            <#input id="bindId" name="移动小号绑定关系id" underline="true"/>
                            <#input id="serverCarModelId" name="专车车型ID  关联t_server_carmodel表" underline="true"/>
                </div>
            </div>
            <div class="row btn-group-m-t">
                <div class="col-sm-10">
                    <#button btnCss="info" name="保存" id="ensure" icon="fa-check"
                    clickFun="TOrderPrivateCarInfoDlg.addSubmit()"/>
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderPrivateCarInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderPrivateCarInfoDlg.close()"/>
                </div>
            </div>
        </div>
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
<script type="text/javascript"
        src="https://webapi.amap.com/maps?v=1.4.10&key=e9d39125e614f2b22e9f366275877058&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script>
    laydate.render({
        elem: '#travelTime'
        , type: 'datetime'
        ,trigger: 'click' //采用click弹出
        , min:  new Date().toString()
    });
</script>
<script type="text/javascript">
    //起点地图加载
    var marker, map = new AMap.Map("startAddressBody", {
        resizeEnable: true,
        zoom: 15,
        zooms: [3, 20]
    }); //定位标注当前位置
    map.plugin('AMap.Geolocation', function () {
        geolocation = new AMap.Geolocation({
            enableHighAccuracy: true, //是否使用高精度定位,默认:true
            timeout: 10000, //超过10秒后停止定位,默认:无穷大
            maximumAge: 0, //定位结果缓存0毫秒,默认:0
            convert: true, //自动偏移坐标,偏移后的坐标为高德坐标,默认:true
            showButton: true, //显示定位按钮,默认:true
            showMarker: true, //定位成功后在定位到的位置显示点标记,默认:true
            showCircle: true, //定位成功后用圆圈表示定位精度范围,默认:true
            panToLocation: true, //定位成功后将定位到的位置作为地图中心点,默认:true
            buttonPosition: 'LB', //定位按钮的停靠位置  LB左下角、  RB右下角
            buttonOffset: new AMap.Pixel(10, 20), //定位按钮与设置的停靠位置的偏移量,默认:Pixel(10, 20)
            zoomToAccuracy: true, //定位成功后调整地图视野范围使定位位置及精度范围视野内可见,默认:false
        });
        map.addControl(geolocation);
        geolocation.getCurrentPosition();
        AMap.event.addListener(geolocation, 'complete', onComplete);
        //返回定位信息
        AMap.event.addListener(geolocation, 'error', onError);
        //返回定位出错信息
    }); //解析定位结果
    var city;
    map.on('click', function (e) {
        if (marker != null) {
            marker.setMap(null);
        }
        //添加标记点
        $("#startLon").val(e.lnglat.getLng());
        $("#startLat").val(e.lnglat.getLat());
         marker = new AMap.Marker({
            map: map,
            position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()),   // 经纬度对象,也可以是经纬度构成的一维数组[116.39, 39.9]
        });
        regeoCode(e.lnglat.getLng(),e.lnglat.getLat());
    });
    var infoWindow = new AMap.InfoWindow({
        autoMove: true,
        offset: {
            x: 0,
            y: -30
        }
    }); //回调函数
    //根据经纬度获取详细地址
    function regeoCode(lon,lat) {
        var lnglat = [];
        lnglat.push(lon);
        lnglat.push(lat);
        map.add(marker);
        marker.setPosition(lnglat);
        AMap.service('AMap.Geocoder', function() {
            geocoder = new AMap.Geocoder({});
            geocoder.getAddress(lnglat, function (status, result) {
                if (status === 'complete' && result.regeocode) {
                    var address = result.regeocode.formattedAddress;
                    $("#startAddress").val(address);
                } else {
                    Feng.error('根据经纬度查询地址失败')
                }
                var data={
                    "name":result.regeocode.addressComponent.neighborhood,
                    "location":{
                        "lat":lat,
                        "lng":lon
                    },
                    "address":address,
                    "tel":"",
                    "type":result.regeocode.addressComponent.neighborhoodType
                };
                infoWindow.setContent(createContent(data));
                infoWindow.open(map, marker.getPosition());
            });
        })
    }
    function onComplete(data) {
        var str = [];
        city = data.addressComponent.citycode;
        str.push('定位结果:' + data.position);
        str.push('定位类别:' + data.location_type);
        if (data.accuracy) {
            str.push('精度:' + data.accuracy + ' 米');
        }
        //如为IP精确定位结果则没有精度信息
        str.push('是否经过偏移:' + (data.isConverted ? '是' : '否'));
        var lnglatXY = [data.position.getLng(), data.position.getLat()];
        //地图上所标点的坐标
        AMap.service('AMap.Geocoder', function () {
            //回调函数
            geocoder = new AMap.Geocoder({});
            geocoder.getAddress(lnglatXY, function (status, result) {
                if (status === 'complete' && result.info === 'OK') {
                    //获得了有效的地址信息:                    //即,result.regeocode.formattedAddress
//                     console.log(result.regeocode.formattedAddress);
                    var address = result.regeocode.formattedAddress;
                    str.push('详细地址:' + address);
                    // todo 不弹出信息框
                    // alert(str.join(' | '));
                } else {
                    // alert(str.join(' | ')); //获取地址失败
                }
            });
        })
    } //解析定位错误信息
    function onError(data) {
        alert('定位失败,原因:' + data.message);
    }
    //输入搜索点信息
    var autoOptions = {
        city: city, //在规定城市搜索、默认全国
        input: "startAddress"
    };
    var auto = new AMap.Autocomplete(autoOptions);
    var placeSearch = new AMap.PlaceSearch({
        pageSize: 5, // 单页显示结果条数
        pageIndex: 1, // 页码
        children: 0, //不展示子节点数据
        city: city, // 兴趣点城市
        citylimit: true, //是否强制限制在设置的城市内搜索
        panel: "panel", // 结果列表将在此容器中进行展示。
        autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
        extensions: 'base', //返回基本地址信息  */
        map: map // 展现结果的地图实例
    }); //构造地点查询类
    AMap.event.addListener(auto, "select", select); //注册监听,当选中某条记录时会触发
    function select(e) {
        placeSearch.setCity(e.poi.adcode);
        placeSearch.search(e.poi.name); //关键字查询查询        //设置搜索位置定点标注
        if (e.poi && e.poi.location) {
            map.setZoom(15);
            map.setCenter(e.poi.location);
            var id = e.poi.id; //详情查询
            placeSearch.getDetails(id, function (status, result) {
                if (status === 'complete' && result.info === 'OK') {
                    placeSearch_CallBack(result);
                }
            });
        }
    }
    function placeSearch_CallBack(data) {
        if (marker != null) {
            marker.setMap(null);
        }
        var poiArr = data.poiList.pois; //添加marker
          marker = new AMap.Marker({
            map: map,
            position: poiArr[0].location
        });
        map.add(marker);
        marker.setPosition(marker.getPosition());
        infoWindow.setContent(createContent(poiArr[0]));
        infoWindow.open(map, marker.getPosition());
    }
    function createContent(poi) {
        console.log(poi);
        //信息窗体内容
        $("#startAddress").val(poi.address);
        $("#startLon").val(poi.location.lng);
        $("#startLat").val(poi.location.lat);
        $("#areaCode").val(poi.adcode);
        var s = [];
        s.push("<b>名称:" + poi.name + "</b>");
        s.push("地址:" + poi.address);
        s.push("电话:" + poi.tel);
        s.push("类型:" + poi.type);
        return s.join("<br>");
    }
</script>
<script>
    //终点地图加载
    var marker1, mapp = new AMap.Map("endAddressBody", {
        resizeEnable: true,
        zoom: 15,
        zooms: [3, 20]
    }); //定位标注当前位置
    mapp.plugin('AMap.Geolocation', function () {
        geolocation = new AMap.Geolocation({
            enableHighAccuracy: true, //是否使用高精度定位,默认:true
            timeout: 10000, //超过10秒后停止定位,默认:无穷大
            maximumAge: 0, //定位结果缓存0毫秒,默认:0
            convert: true, //自动偏移坐标,偏移后的坐标为高德坐标,默认:true
            showButton: true, //显示定位按钮,默认:true
            showMarker: true, //定位成功后在定位到的位置显示点标记,默认:true
            showCircle: true, //定位成功后用圆圈表示定位精度范围,默认:true
            panToLocation: true, //定位成功后将定位到的位置作为地图中心点,默认:true
            buttonPosition: 'LB', //定位按钮的停靠位置  LB左下角、  RB右下角
            buttonOffset: new AMap.Pixel(10, 20), //定位按钮与设置的停靠位置的偏移量,默认:Pixel(10, 20)
            zoomToAccuracy: true, //定位成功后调整地图视野范围使定位位置及精度范围视野内可见,默认:false
        });
        mapp.addControl(geolocation);
        geolocation.getCurrentPosition();
        AMap.event.addListener(geolocation, 'complete', onComplete);
        //返回定位信息
        AMap.event.addListener(geolocation, 'error', onError);
        //返回定位出错信息
    }); //解析定位结果
    var cityy;
    mapp.on('click', function (e) {
        if (marker1 != null) {
            marker1.setMap(null);
        }
        //添加标记点
        $("#startLon").val(e.lnglat.getLng());
        $("#startLat").val(e.lnglat.getLat());
        marker1 = new AMap.Marker({
            map: mapp,
            position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()),   // 经纬度对象,也可以是经纬度构成的一维数组[116.39, 39.9]
        });
        regeoCode1(e.lnglat.getLng(),e.lnglat.getLat());
    });
    var infoWindow = new AMap.InfoWindow({
        autoMove: true,
        offset: {
            x: 0,
            y: -30
        }
    }); //回调函数
    //根据经纬度获取详细地址
    function regeoCode1(lon,lat) {
        var lnglat = [];
        lnglat.push(lon);
        lnglat.push(lat);
        mapp.add(marker1);
        marker1.setPosition(lnglat);
        AMap.service('AMap.Geocoder', function() {
            geocoder = new AMap.Geocoder({});
            geocoder.getAddress(lnglat, function (status, result) {
                if (status === 'complete' && result.regeocode) {
                    var address = result.regeocode.formattedAddress;
                    $("#endAddress").val(address);
                } else {
                    Feng.error('根据经纬度查询地址失败')
                }
                var data={
                    "name":result.regeocode.addressComponent.neighborhood,
                    "location":{
                        "lat":lat,
                        "lng":lon
                    },
                    "address":address,
                    "tel":"",
                    "type":result.regeocode.addressComponent.neighborhoodType
                };
                infoWindow.setContent(createContentt(data));
                infoWindow.open(mapp, marker1.getPosition());
            });
        })
    }
    function onComplete(data) {
        var str = [];
        cityy = data.addressComponent.citycode;
        str.push('定位结果:' + data.position);
        str.push('定位类别:' + data.location_type);
        if (data.accuracy) {
            str.push('精度:' + data.accuracy + ' 米');
        }
        //如为IP精确定位结果则没有精度信息
        str.push('是否经过偏移:' + (data.isConverted ? '是' : '否'));
        var lnglatXY = [data.position.getLng(), data.position.getLat()];
        //地图上所标点的坐标
        AMap.service('AMap.Geocoder', function () {
            //回调函数
            geocoder = new AMap.Geocoder({});
            geocoder.getAddress(lnglatXY, function (status, result) {
                if (status === 'complete' && result.info === 'OK') {
                    //获得了有效的地址信息:                    //即,result.regeocode.formattedAddress
                    //                     console.log(result.regeocode.formattedAddress);
                    var address = result.regeocode.formattedAddress;
                    str.push('详细地址:' + address);
// todo 不弹出信息框
// alert(str.join(' | '));
                } else {
// alert(str.join(' | ')); //获取地址失败
                }
            });
        })
    } //解析定位错误信息
    function onError(data) {
        alert('定位失败,原因:' + data.message);
    }
    //输入搜索点信息
    var autoOptionss = {
        city: cityy, //在规定城市搜索、默认全国
        input: "endAddress"
    };
    var autoo = new AMap.Autocomplete(autoOptionss);
    var placeSearchh = new AMap.PlaceSearch({
        pageSize: 5, // 单页显示结果条数
        pageIndex: 1, // 页码
        children: 0, //不展示子节点数据
        city: city, // 兴趣点城市
        citylimit: true, //是否强制限制在设置的城市内搜索
        panel: "panel", // 结果列表将在此容器中进行展示。
        autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
        extensions: 'base', //返回基本地址信息  */
        map: mapp // 展现结果的地图实例
    }); //构造地点查询类
    AMap.event.addListener(autoo, "select", selectt); //注册监听,当选中某条记录时会触发
    function selectt(e) {
        placeSearchh.setCity(e.poi.adcode);
        placeSearchh.search(e.poi.name); //关键字查询查询        //设置搜索位置定点标注
        if (e.poi && e.poi.location) {
            mapp.setZoom(15);
            mapp.setCenter(e.poi.location);
            var id = e.poi.id; //详情查询
            placeSearchh.getDetails(id, function (status, result) {
                if (status === 'complete' && result.info === 'OK') {
                    placeSearch_CallBackk(result);
                }
            });
        }
    }
    function placeSearch_CallBackk(data) {
        if (marker1 != null) {
            marker1.setMap(null);
        }
        var poiArr = data.poiList.pois; //添加marker
        marker1 = new AMap.Marker({
            map: mapp,
            position: poiArr[0].location
        });
        mapp.add(marker1);
        marker1.setPosition(marker1.getPosition());
        infoWindow.setContent(createContentt(poiArr[0]));
        infoWindow.open(mapp, marker1.getPosition());
    }
    function createContentt(poi) {
        console.log(poi);
        //信息窗体内容
        $("#endAddress").val(poi.address);
        $("#endLon").val(poi.location.lng);
        $("#endLat").val(poi.location.lat);
        $("#areaCode").val(poi.adcode);
        var ss = [];
        ss.push("<b>名称:" + poi.name + "</b>");
        ss.push("地址:" + poi.address);
        ss.push("电话:" + poi.tel);
        ss.push("类型:" + poi.type);
        return ss.join("<br>");
    }
</script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
@@ -24,111 +24,28 @@
                </div>
            </div>
            <div class="row">
                <div class="col-sm-6">
                <div class="col-sm-6 b-r">
                    <#label id="insertTimeStr" name="下单时间" value="${item.insertTimeStr}"/>
                    <#label id="orderSourceStr" name="订单来源" value="${item.orderSourceStr}"/>
                    <#label id="userName" name="下单用户昵称" value="${item.userName}"/>
                    <#label id="passengers" name="乘车用户昵称" value="${item.passengers}"/>
                    <#label id="placementAddress" name="起点" value="${item.startAddress}"/>
                    <#label id="serverCarModel" name="选择车型" value="${item.serverCarModel}"/>
                    <#label id="car" name="接单车辆" value="${item.car}"/>
                    <#label id="boardingAddress" name="上车地点" value="${item.boardingAddress}"/>
                    <#label id="getoffAddress" name="下车地点" value="${item.getoffAddress}"/>
                </div>
                <div class="col-sm-6">
                    <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
                    <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
                </div>
            </div>
            @for(m in maps){
            <div class="childOrders" style="border: 1px solid;">
                <div class="row">
                    <div class="col-sm-6">
                        <div class="form-group">
                            <label class="col-sm-3 control-label">尾号${m.userPhone1}:</label>
                            <div class="col-sm-9">
                                <label class="control-label">上车地点:${m.boardingAddress}</label>
                            </div>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-3 control-label"></label>
                            <div class="col-sm-9">
                                <label class="control-label">下车地点:${m.getoffAddress}</label>
                            </div>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-3 control-label">下单用户昵称:</label>
                            <div class="col-sm-9">
                                <label class="control-label">${m.userName}</label>
                            </div>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-3 control-label">乘车用户昵称:</label>
                            <div class="col-sm-9">
                                <label class="control-label">${m.passengers}</label>
                            </div>
                        </div>
                    </div>
                    <div class="col-sm-6">
                        <div class="col-sm-6">
                            <div class="form-group">
                                <label class="col-sm-5 control-label">${m.peopleNum}人</label>
                                <div class="col-sm-7">
                                    <label class="control-label"></label>
                                </div>
                            </div>
                            <div class="form-group">
                                <label class="col-sm-5 control-label"></label>
                                <div class="col-sm-7">
                                    <label class="control-label"></label>
                                </div>
                            </div>
                            <div class="form-group">
                                <label class="col-sm-5 control-label">下单用户手机号:</label>
                                <div class="col-sm-7">
                                    <label class="control-label">${m.userPhone}</label>
                                </div>
                            </div>
                            <div class="form-group">
                                <label class="col-sm-5 control-label">乘车用户手机号:</label>
                                <div class="col-sm-7">
                                    <label class="control-label">${m.passengersPhone}</label>
                                </div>
                            </div>
                        </div>
                        <div class="col-sm-6">
                            <div class="form-group">
                                <label class="col-sm-5 control-label"></label>
                                <div class="col-sm-7">
                                    <label class="control-label"></label>
                                </div>
                            </div>
                            <div class="form-group">
                                <label class="col-sm-5 control-label"></label>
                                <div class="col-sm-7">
                                    <label class="control-label"></label>
                                </div>
                            </div>
                            <div class="form-group">
                                <label class="col-sm-5 control-label">上车时间:</label>
                                <div class="col-sm-7">
                                    <label class="control-label">${m.boardingTimeStr}</label>
                                </div>
                            </div>
                            <div class="form-group">
                                <label class="col-sm-5 control-label">下车时间:</label>
                                <div class="col-sm-7">
                                    <label class="control-label">${m.getoffTimeStr}</label>
                                </div>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
            @}
            <div class="row">
                <div class="col-sm-6">
                    <#label id="serverCarModel" name="选择车型" value="${item.serverCarModel}"/>
                    <#label id="car" name="接单车辆" value="${item.car}"/>
                </div>
                <div class="col-sm-6">
                    <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
                    <#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="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/>
                    <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/>
                </div>
            </div>
            <div class="row" style="margin-top: 30px;">
@@ -192,7 +109,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=d868ee8a0084a4a1b4271d8030e32fba"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html
@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=d868ee8a0084a4a1b4271d8030e32fba"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html
@@ -79,9 +79,6 @@
                            @if(shiro.hasPermission("/tOrderTaxi/changeOrder")){
                                <#button name="改派订单" icon="fa-remove" clickFun="TOrderTaxi.changeOrder()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tOrderTaxi/tOrderTaxi_add")){
                            <#button name="添加订单" icon="fa-plus" clickFun="TOrderTaxi.openAddTOrderTaxi()" space="true"/>
                            @}
                        </div>
                        <#table id="TOrderTaxiTable"/>
                    </div>
@@ -91,6 +88,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
@@ -3,482 +3,74 @@
    <div class="ibox-content">
        <div class="form-horizontal">
            <input type="hidden" id="html" value="2">
            <div class="row">
                <div class="form-group">
                    <label class="control-label col-sm-2">起点:</label>
                    <div class="col-sm-3">
                        <input class="form-control" id="startAddress" onclick="TOrderTaxiInfoDlg.startAddress()">
                        <input type="hidden" id="startLon">
                        <input type="hidden" id="startLat">
                    </div>
                <div class="col-sm-6 b-r">
                            <#input id="id" name="主键id" underline="true"/>
                            <#input id="userId" name="用户id" underline="true"/>
                            <#input id="driverId" name="接单司机ID" underline="true"/>
                            <#input id="carId" name="车辆id" underline="true"/>
                            <#input id="orderNum" name="订单号" underline="true"/>
                            <#input id="placementLon" name="下单地点经度" underline="true"/>
                            <#input id="placementLat" name="下单地点纬度" underline="true"/>
                            <#input id="placementAddress" name="下单地点" underline="true"/>
                            <#input id="startLon" name="出发地经度值" underline="true"/>
                            <#input id="startLat" name="出发地纬度值" underline="true"/>
                            <#input id="endLon" name="目的地经度" underline="true"/>
                            <#input id="startAddress" name="出发地地点" underline="true"/>
                            <#input id="endLat" name="目的地纬度" underline="true"/>
                            <#input id="endAddress" name="目的地地点" underline="true"/>
                            <#input id="boardingLon" name="上车点经度" underline="true"/>
                            <#input id="boardingLat" name="上车点纬度" underline="true"/>
                            <#input id="boardingAddress" name="上车点" underline="true"/>
                            <#input id="boardingTime" name="上车时间" underline="true"/>
                            <#input id="getoffLon" name="下车点经度" underline="true"/>
                            <#input id="getoffLat" name="下车点纬度" underline="true"/>
                            <#input id="getoffAddress" name="下车地点" underline="true"/>
                            <#input id="getoffTime" name="下车时间" underline="true"/>
                            <#input id="mileage" name="行驶里程数(米)" underline="true"/>
                            <#input id="payManner" name="支付方式(1=OK平台支付,2=其他方式支付)" underline="true"/>
                            <#input id="payType" name="支付方式(1=微信,2=支付宝,3=其他)" underline="true"/>
                            <#input id="orderMoney" name="订单金额"/>
                </div>
                <div class="form-group" id="startAddressModel" hidden>
                    <label class="control-label col-sm-2"></label>
                    <div class="col-sm-6" style="margin-left: 15px;height: 500px" id="startAddressBody">
                    </div>
                <div class="col-sm-6">
                            <#input id="travelMoney" name="行程费" underline="true"/>
                            <#input id="parkMoney" name="停车费" underline="true"/>
                            <#input id="roadTollMoney" name="过路费" underline="true"/>
                            <#input id="tipMoney" name="小费" underline="true"/>
                            <#input id="redPacketMoney" name="红包抵扣金额" underline="true"/>
                            <#input id="couponMoney" name="优惠券抵扣金额" underline="true"/>
                            <#input id="redPacketId" name="红包记录id" underline="true"/>
                            <#input id="couponId" name="优惠券id" underline="true"/>
                            <#input id="companyId" name="公司id" underline="true"/>
                            <#input id="payMoney" name="支付金额" underline="true"/>
                            <#input id="substitute" name="是否是代下单(0:否,1:是)" underline="true"/>
                            <#input id="passengers" name="乘车人" underline="true"/>
                            <#input id="passengersPhone" name="乘车人电话" underline="true"/>
                            <#input id="state" name="状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中)" underline="true"/>
                            <#input id="insertTime" name="下单时间" underline="true"/>
                            <#input id="travelTime" name="出行时间" underline="true"/>
                            <#input id="snatchOrderTime" name="抢单时间" underline="true"/>
                            <#input id="setOutTime" name="司机点出发时间" underline="true"/>
                            <#input id="arriveTime" name="司机到达预约地点时间" underline="true"/>
                            <#input id="startServiceTime" name="开始服务时间" underline="true"/>
                            <#input id="endServiceTime" name="结束服务时间" underline="true"/>
                            <#input id="orderType" name="订单类型(1=普通,2=预约)" underline="true"/>
                            <#input id="orderSource" name="下单方式(1:APP下单,2:扫码下单,3:小程序下单,4:司机下单,5:调度下单)" underline="true"/>
                            <#input id="invoiceId" name="发票id" underline="true"/>
                            <#input id="isReassign" name="是否是改派单(1=否,2=是)" underline="true"/>
                </div>
                <div class="form-group">
                    <label class="control-label col-sm-2">终点:</label>
                    <div class="col-sm-3">
                        <input class="form-control" id="endAddress" onclick="TOrderTaxiInfoDlg.endAddress()">
                        <input type="hidden" id="endLon">
                        <input type="hidden" id="endLat">
                    </div>
                </div>
                <div class="form-group" id="endAddressModel" hidden>
                    <label class="control-label col-sm-2"></label>
                    <div class="col-sm-6" style="margin-left: 15px;height: 500px" id="endAddressBody">
                    </div>
                </div>
                <div class="form-group">
                    <label class="control-label col-sm-2">用车时间:</label>
                    <div class="col-sm-3">
                        <input class="form-control"  autocomplete="off" id="travelTime">
                    </div>
                </div>
                <div class="form-group">
                    <label class="control-label col-sm-2">乘车人姓名:</label>
                    <div class="col-sm-3">
                        <input class="form-control" id="passengers">
                    </div>
                </div>
                <div class="form-group">
                    <label class="control-label col-sm-2">乘车人手机号:</label>
                    <div class="col-sm-3">
                        <input class="form-control" id="passengersPhone">
                    </div>
                </div>
                <!--                <div class="form-group">-->
                <!--                    <label class="control-label col-sm-2">备注信息:</label>-->
                <!--                    <div class="col-sm-3">-->
                <!--                        <input class="form-control" id="remark">-->
                <!--                    </div>-->
                <!--                </div>-->
            </div>
            <div class="row btn-group-m-t">
                <div class="col-sm-10">
                    <#button btnCss="info" name="保存" id="ensure" icon="fa-check"
                    clickFun="TOrderTaxiInfoDlg.addSubmit()"/>
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderTaxiInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderTaxiInfoDlg.close()"/>
                </div>
            </div>
        </div>
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
<script type="text/javascript"
        src="https://webapi.amap.com/maps?v=1.4.10&key=e9d39125e614f2b22e9f366275877058&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script>
    laydate.render({
        elem: '#travelTime'
        , type: 'datetime'
        ,trigger: 'click' //采用click弹出
        , min:  new Date().toString()
        ,
    });
</script>
<script type="text/javascript">
    //起点地图加载
    var marker, map = new AMap.Map("startAddressBody", {
        resizeEnable: true,
        zoom: 15,
        zooms: [3, 20]
    }); //定位标注当前位置
    map.plugin('AMap.Geolocation', function () {
        geolocation = new AMap.Geolocation({
            enableHighAccuracy: true, //是否使用高精度定位,默认:true
            timeout: 10000, //超过10秒后停止定位,默认:无穷大
            maximumAge: 0, //定位结果缓存0毫秒,默认:0
            convert: true, //自动偏移坐标,偏移后的坐标为高德坐标,默认:true
            showButton: true, //显示定位按钮,默认:true
            showMarker: true, //定位成功后在定位到的位置显示点标记,默认:true
            showCircle: true, //定位成功后用圆圈表示定位精度范围,默认:true
            panToLocation: true, //定位成功后将定位到的位置作为地图中心点,默认:true
            buttonPosition: 'LB', //定位按钮的停靠位置  LB左下角、  RB右下角
            buttonOffset: new AMap.Pixel(10, 20), //定位按钮与设置的停靠位置的偏移量,默认:Pixel(10, 20)
            zoomToAccuracy: true, //定位成功后调整地图视野范围使定位位置及精度范围视野内可见,默认:false
        });
        map.addControl(geolocation);
        geolocation.getCurrentPosition();
        AMap.event.addListener(geolocation, 'complete', onComplete);
//返回定位信息
        AMap.event.addListener(geolocation, 'error', onError);
//返回定位出错信息
    }); //解析定位结果
    var city;
    map.on('click', function (e) {
        console.log(marker);
        if (marker != null) {
            marker.setMap(null);
        }
        //添加标记点
        $("#startLon").val(e.lnglat.getLng());
        $("#startLat").val(e.lnglat.getLat());
        marker = new AMap.Marker({
            map: map,
            position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()),   // 经纬度对象,也可以是经纬度构成的一维数组[116.39, 39.9]
        });
        regeoCode(e.lnglat.getLng(), e.lnglat.getLat());
    });
    var infoWindow = new AMap.InfoWindow({
        autoMove: true,
        offset: {
            x: 0,
            y: -30
        }
    }); //回调函数
    //根据经纬度获取详细地址
    function regeoCode(lon, lat) {
        var lnglat = [];
        lnglat.push(lon);
        lnglat.push(lat);
        map.add(marker);
        marker.setPosition(lnglat);
        AMap.service('AMap.Geocoder', function () {
            geocoder = new AMap.Geocoder({});
            geocoder.getAddress(lnglat, function (status, result) {
                if (status === 'complete' && result.regeocode) {
                    var address = result.regeocode.formattedAddress;
                    $("#startAddress").val(address);
                } else {
                    Feng.error('根据经纬度查询地址失败')
                }
                var data = {
                    "name": result.regeocode.addressComponent.neighborhood,
                    "location": {
                        "lat": lat,
                        "lng": lon
                    },
                    "address": address,
                    "tel": "",
                    "type": result.regeocode.addressComponent.neighborhoodType
                };
                infoWindow.setContent(createContent(data));
                infoWindow.open(map, marker.getPosition());
            });
        })
    }
    function onComplete(data) {
        var str = [];
        city = data.addressComponent.citycode;
        str.push('定位结果:' + data.position);
        str.push('定位类别:' + data.location_type);
        if (data.accuracy) {
            str.push('精度:' + data.accuracy + ' 米');
        }
//如为IP精确定位结果则没有精度信息
        str.push('是否经过偏移:' + (data.isConverted ? '是' : '否'));
        var lnglatXY = [data.position.getLng(), data.position.getLat()];
//地图上所标点的坐标
        AMap.service('AMap.Geocoder', function () {
//回调函数
            geocoder = new AMap.Geocoder({});
            geocoder.getAddress(lnglatXY, function (status, result) {
                if (status === 'complete' && result.info === 'OK') {
//获得了有效的地址信息:                    //即,result.regeocode.formattedAddress
//                     console.log(result.regeocode.formattedAddress);
                    var address = result.regeocode.formattedAddress;
                    str.push('详细地址:' + address);
// todo 不弹出信息框
// alert(str.join(' | '));
                } else {
// alert(str.join(' | ')); //获取地址失败
                }
            });
        })
    } //解析定位错误信息
    function onError(data) {
        alert('定位失败,原因:' + data.message);
    }
    //输入搜索点信息
    var autoOptions = {
        city: city, //在规定城市搜索、默认全国
        input: "startAddress"
    };
    var auto = new AMap.Autocomplete(autoOptions);
    var placeSearch = new AMap.PlaceSearch({
        pageSize: 5, // 单页显示结果条数
        pageIndex: 1, // 页码
        children: 0, //不展示子节点数据
        city: city, // 兴趣点城市
        citylimit: true, //是否强制限制在设置的城市内搜索
        panel: "panel", // 结果列表将在此容器中进行展示。
        autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
        extensions: 'base', //返回基本地址信息  */
        map: map // 展现结果的地图实例
    }); //构造地点查询类
    AMap.event.addListener(auto, "select", select); //注册监听,当选中某条记录时会触发
    function select(e) {
        placeSearch.setCity(e.poi.adcode);
        placeSearch.search(e.poi.name); //关键字查询查询        //设置搜索位置定点标注
        if (e.poi && e.poi.location) {
            map.setZoom(15);
            map.setCenter(e.poi.location);
            var id = e.poi.id; //详情查询
            placeSearch.getDetails(id, function (status, result) {
                if (status === 'complete' && result.info === 'OK') {
                    placeSearch_CallBack(result);
                }
            });
        }
    }
    var infoWindow = new AMap.InfoWindow({
        autoMove: true,
        offset: {
            x: 0,
            y: -30
        }
    }); //回调函数
    function placeSearch_CallBack(data) {
        if (marker != null) {
            marker.setMap(null);
        }
        var poiArr = data.poiList.pois; //添加marker
        marker = new AMap.Marker({
            map: map,
            position: poiArr[0].location
        });
        ////
        map.add(marker);
        marker.setPosition(marker.getPosition());
        // map.setCenter(marker.getPosition());
        infoWindow.setContent(createContent(poiArr[0]));
        infoWindow.open(map, marker.getPosition());
    }
    function createContent(poi) {
        console.log(poi);
//信息窗体内容
        $("#startAddress").val(poi.address);
        $("#startLon").val(poi.location.lng);
        $("#startLat").val(poi.location.lat);
        $("#areaCode").val(poi.adcode);
        var s = [];
        s.push("<b>名称:" + poi.name + "</b>");
        s.push("地址:" + poi.address);
        s.push("电话:" + poi.tel);
        s.push("类型:" + poi.type);
        return s.join("<br>");
    }
</script>
<script>
    //终点地图加载
    var marker1, mapp = new AMap.Map("endAddressBody", {
        resizeEnable: true,
        zoom: 15,
        zooms: [3, 20]
    }); //定位标注当前位置
    mapp.plugin('AMap.Geolocation', function () {
        geolocation = new AMap.Geolocation({
            enableHighAccuracy: true, //是否使用高精度定位,默认:true
            timeout: 10000, //超过10秒后停止定位,默认:无穷大
            maximumAge: 0, //定位结果缓存0毫秒,默认:0
            convert: true, //自动偏移坐标,偏移后的坐标为高德坐标,默认:true
            showButton: true, //显示定位按钮,默认:true
            showMarker: true, //定位成功后在定位到的位置显示点标记,默认:true
            showCircle: true, //定位成功后用圆圈表示定位精度范围,默认:true
            panToLocation: true, //定位成功后将定位到的位置作为地图中心点,默认:true
            buttonPosition: 'LB', //定位按钮的停靠位置  LB左下角、  RB右下角
            buttonOffset: new AMap.Pixel(10, 20), //定位按钮与设置的停靠位置的偏移量,默认:Pixel(10, 20)
            zoomToAccuracy: true, //定位成功后调整地图视野范围使定位位置及精度范围视野内可见,默认:false
        });
        mapp.addControl(geolocation);
        geolocation.getCurrentPosition();
        AMap.event.addListener(geolocation, 'complete', onComplete);
//返回定位信息
        AMap.event.addListener(geolocation, 'error', onError);
//返回定位出错信息
    }); //解析定位结果
    var cityy;
    mapp.on('click', function (e) {
        if (marker1 != null) {
            marker1.setMap(null);
        }
        //添加标记点
        $("#startLon").val(e.lnglat.getLng());
        $("#startLat").val(e.lnglat.getLat());
        marker1 = new AMap.Marker({
            map: mapp,
            position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()),   // 经纬度对象,也可以是经纬度构成的一维数组[116.39, 39.9]
        });
        regeoCode1(e.lnglat.getLng(),e.lnglat.getLat());
    });
    var infoWindow = new AMap.InfoWindow({
        autoMove: true,
        offset: {
            x: 0,
            y: -30
        }
    }); //回调函数
    //根据经纬度获取详细地址
    function regeoCode1(lon,lat) {
        var lnglat = [];
        lnglat.push(lon);
        lnglat.push(lat);
        mapp.add(marker1);
        marker1.setPosition(lnglat);
        AMap.service('AMap.Geocoder', function() {
            geocoder = new AMap.Geocoder({});
            geocoder.getAddress(lnglat, function (status, result) {
                if (status === 'complete' && result.regeocode) {
                    var address = result.regeocode.formattedAddress;
                    $("#endAddress").val(address);
                } else {
                    Feng.error('根据经纬度查询地址失败')
                }
                var data={
                    "name":result.regeocode.addressComponent.neighborhood,
                    "location":{
                        "lat":lat,
                        "lng":lon
                    },
                    "address":address,
                    "tel":"",
                    "type":result.regeocode.addressComponent.neighborhoodType
                };
                infoWindow.setContent(createContentt(data));
                infoWindow.open(mapp, marker1.getPosition());
            });
        })
    }
    function onComplete(data) {
        var str = [];
        cityy = data.addressComponent.citycode;
        str.push('定位结果:' + data.position);
        str.push('定位类别:' + data.location_type);
        if (data.accuracy) {
            str.push('精度:' + data.accuracy + ' 米');
        }
//如为IP精确定位结果则没有精度信息
        str.push('是否经过偏移:' + (data.isConverted ? '是' : '否'));
        var lnglatXY = [data.position.getLng(), data.position.getLat()];
//地图上所标点的坐标
        AMap.service('AMap.Geocoder', function () {
//回调函数
            geocoder = new AMap.Geocoder({});
            geocoder.getAddress(lnglatXY, function (status, result) {
                if (status === 'complete' && result.info === 'OK') {
//获得了有效的地址信息:                    //即,result.regeocode.formattedAddress
//                     console.log(result.regeocode.formattedAddress);
                    var address = result.regeocode.formattedAddress;
                    str.push('详细地址:' + address);
// todo 不弹出信息框
// alert(str.join(' | '));
                } else {
// alert(str.join(' | ')); //获取地址失败
                }
            });
        })
    } //解析定位错误信息
    function onError(data) {
        alert('定位失败,原因:' + data.message);
    }
    //输入搜索点信息
    var autoOptionss = {
        city: cityy, //在规定城市搜索、默认全国
        input: "endAddress"
    };
    var autoo = new AMap.Autocomplete(autoOptionss);
    var placeSearchh = new AMap.PlaceSearch({
        pageSize: 5, // 单页显示结果条数
        pageIndex: 1, // 页码
        children: 0, //不展示子节点数据
        city: city, // 兴趣点城市
        citylimit: true, //是否强制限制在设置的城市内搜索
        panel: "panel", // 结果列表将在此容器中进行展示。
        autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
        extensions: 'base', //返回基本地址信息  */
        map: mapp // 展现结果的地图实例
    }); //构造地点查询类
    AMap.event.addListener(autoo, "select", selectt); //注册监听,当选中某条记录时会触发
    function selectt(e) {
        placeSearchh.setCity(e.poi.adcode);
        placeSearchh.search(e.poi.name); //关键字查询查询        //设置搜索位置定点标注
        if (e.poi && e.poi.location) {
            mapp.setZoom(15);
            mapp.setCenter(e.poi.location);
            var id = e.poi.id; //详情查询
            placeSearchh.getDetails(id, function (status, result) {
                if (status === 'complete' && result.info === 'OK') {
                    placeSearch_CallBackk(result);
                }
            });
        }
    }
    var infoWindoww = new AMap.InfoWindow({
        autoMove: true,
        offset: {
            x: 0,
            y: -30
        }
    }); //回调函数
    function placeSearch_CallBackk(data) {
        if (marker1 != null) {
            marker1.setMap(null);
        }
        var poiArr = data.poiList.pois; //添加marker
        marker1 = new AMap.Marker({
            map: mapp,
            position: poiArr[0].location
        });
        mapp.add(marker1);
        marker1.setPosition(marker1.getPosition());
        /*  mapp.setCenter(marker.getPosition());*/
        infoWindow.setContent(createContentt(poiArr[0]));
        infoWindow.open(mapp, marker1.getPosition());
    }
    function createContentt(poi) {
        console.log(poi);
//信息窗体内容
        $("#endAddress").val(poi.address);
        $("#endLon").val(poi.location.lng);
        $("#endLat").val(poi.location.lat);
        $("#areaCode").val(poi.adcode);
        var ss = [];
        ss.push("<b>名称:" + poi.name + "</b>");
        ss.push("地址:" + poi.address);
        ss.push("电话:" + poi.tel);
        ss.push("类型:" + poi.type);
        return ss.join("<br>");
    }
</script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
@@ -5,12 +5,12 @@
        width: 100%;
    }
    .input-card .btn {
    .input-card .btn{
        margin-right: 1.2rem;
        width: 9rem;
    }
    .input-card .btn:last-child {
    .input-card .btn:last-child{
        margin-right: 0;
    }
</style>
@@ -55,46 +55,22 @@
            <div class="row">
                <div class="col-sm-6">
                    @if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
                    <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
                        <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
                    <#label id="travelMoney" name="行程费" value="${item.travelMoney}元"/>
                    <#label id="parkMoney" name="停车费" value="${item.parkMoney}元"/>
                    <#label id="roadTollMoney" name="过路费" value="${item.roadTollMoney}元"/>
                    @if(item.surchargeList!=null){
                    @for(surcharge in item.surchargeList){
                    <div class="form-group">
                        <label class="col-sm-3 control-label">${surcharge.name}:</label>
                        <div class="col-sm-9">
                            <label class="control-label" style="text-align: left;">
                                ${surcharge.amount}元
                            </label>
                        </div>
                    </div>
                    @}
                    @}
                    <#label id="tipMoney" name="小费" value="${item.tipMoney}元"/>
                    @if(isNotEmpty(item.payMoney)){
                    <#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
                        <#label id="travelMoney" name="行程费" value="${item.travelMoney}元"/>
                        <#label id="parkMoney" name="停车费" value="${item.parkMoney}元"/>
                        <#label id="roadTollMoney" name="过路费" value="${item.roadTollMoney}元"/>
                        <#label id="tipMoney" name="小费" value="${item.tipMoney}元"/>
                        @if(isNotEmpty(item.payMoney)){
                        <#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
                        @}else{
                        <#label id="payMoney" name="实际支付费用" value="0.00元"/>
                        @}
                        <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
                        <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
                        <#label id="redPacketMoney" name="红包抵扣金额" value="${item.redPacketMoney}元"/>
                    @}else{
                    <#label id="payMoney" name="实际支付费用" value="0.00元"/>
                    @}
                    @if(isNotEmpty(item.discountAmount)){
                    <#label id="discountAmount" name="打车卡优惠金额" value="${item.discountAmount}元"/>
                    @}else{
                    <#label id="discountAmount" name="打车卡优惠金额" value="0.00元"/>
                    @}
                    @if(isNotEmpty(item.couponMoney)){
                    <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
                    @}else{
                    <#label id="couponMoney" name="优惠券抵扣费用" value="0.00元"/>
                    @}
                    <#label id="redPacketMoney" name="红包抵扣金额" value="${item.redPacketMoney}元"/>
                    @}else{
                    <h4 style="margin-left: 10%">暂无费用明细</h4>
                        <h4 style="margin-left: 10%">暂无费用明细</h4>
                    @}
                </div>
            </div>
@@ -105,8 +81,7 @@
            </div>
            <div class="row">
                <div class="col-sm-10">
                    <div class="form-horizontal" id="container"
                         style="margin-left: 50px;width: 100%; height: 500px;"></div>
                    <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
                    <div class="input-card" style="margin-left: 50px;">
                        <h4>轨迹回放控制</h4>
                        <div class="input-item">
@@ -127,7 +102,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=d868ee8a0084a4a1b4271d8030e32fba"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html
@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=d868ee8a0084a4a1b4271d8030e32fba"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html
@@ -40,6 +40,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tProblem/tProblem.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
@@ -40,6 +40,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tPubWithdrawal/tPubWithdrawal.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html
@@ -69,9 +69,6 @@
                            @if(shiro.hasPermission("/tReassign/cancelCross")){
                            <#button name="取消订单" icon="fa-remove" clickFun="TCross.opt(2)" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tReassign/excelCross")){
                            <#button name="导出" icon="fa-remove" clickFun="TCross.excel()" space="true"/>
                            @}
                        </div>
                        <#table id="TCrossTable"/>
                    </div>
@@ -81,6 +78,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tReassign/tCross.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
@@ -68,9 +68,6 @@
                            @if(shiro.hasPermission("/smallPieceLogistics/cancel")){
                                <#button name="取消订单" icon="fa-remove" clickFun="TReassign.opt(2)" space="true"/>
                            @}
                            @if(shiro.hasPermission("/smallPieceLogistics/excel")){
                                <#button name="导出" icon="fa-remove" clickFun="TReassign.excel()" space="true"/>
                            @}
                        </div>
                        <#table id="TReassignTable"/>
                    </div>
@@ -80,6 +77,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tReassign/smallPieceLogistics.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>快车改派管理</h5>
                <h5>专车改派管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
@@ -69,9 +69,6 @@
                            @if(shiro.hasPermission("/tReassign/cancel")){
                                <#button name="取消订单" icon="fa-remove" clickFun="TReassign.opt(2)" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tReassign/excel")){
                                <#button name="导出" icon="fa-remove" clickFun="TReassign.excel()" space="true"/>
                            @}
                        </div>
                        <#table id="TReassignTable"/>
                    </div>
@@ -81,6 +78,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tReassign/tReassign.js"></script>
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTaxi.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/taxi.html
File was deleted
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html
@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>快车车型设置管理</h5>
                <h5>专车车型设置管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html
@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>景区站点管理</h5>
                <h5>跨城站点管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html
@@ -164,7 +164,7 @@
    </div>
</div>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=d868ee8a0084a4a1b4271d8030e32fba&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html
@@ -187,7 +187,7 @@
    </div>
</div>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=d868ee8a0084a4a1b4271d8030e32fba&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
@}
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -3,34 +3,6 @@
    .newWidth, .single-line{
        max-width:150px !important;display: initial !important;
    }
    .lab{
        display: block;
        width: 150px;
        height: 45px;
        text-align: center;
        line-height: 45px;
        cursor: pointer;
        font-size: 16px;
        background-color: #F8F8F8;
        margin: 0;
    }
    .lab:hover{
        background-color: #F3F4F5;
    }
    .checked{
        background-color: #FFF !important;
        border-left: 10px solid #077CCB;
    }
    table{
        width: 100%;
    }
    tr{
        height: 40px;
    }
    th, td{
        text-align: center;
        border: 1px solid #F4F4F4;
    }
</style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
@@ -40,589 +12,350 @@
                    <div class="ibox-title">
                        <h3>系统设置:</h3>
                    </div>
                    <div>
                        <div style="float: left;">
                            <label class="lab checked" onclick="checkedLable(this)" tag="pushOrderSettings">推单设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="cancelOrderSettings">取消订单设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="cancelTheReservationOrderSetting">预约单取消设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="spellOrderSetting">拼单派单设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="timeoutDeductionSettings">超时扣款设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="reassigningSet">改派设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="faceRecognitionSettings">人脸识别设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="integralSet">积分设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="withdrawalFeeSetting">提现手续费设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="phoneSettings">电话设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="holidayServiceFeeSetting">节假日服务费设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="95128TheOnCall">95128电召</label>
                            <label class="lab" onclick="checkedLable(this)" tag="moduleManagement">模块管理</label>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">改派设置:</label>
                        <div class="col-sm-10">
                            改派费用为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                              @if(isNotEmpty(reformist)){
                                              value="${reformist.money}"
                                              @}else{
                                              value=""
                                              @}
                                              name="one" id="one" class="form-control newWidth" />&nbsp;元;<br/>
                        </div>
                        <div style="float: left;width: 1200px;margin-left: 50px;">
                            <div class="pushOrderSettings">
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">快车推单:</label>
                                    <div class="col-sm-10">
                                        第一轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                                @if(isNotEmpty(zcOne)){
                                                                value="${zcOne.pushDistance}"
                                                                @}else{
                                                                value=""
                                                                @}
                                                                name="zc1" id="zc1" class="form-control newWidth" />&nbsp;公里,
                                        推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                          @if(isNotEmpty(zcOne)){
                                                          value="${zcOne.pushTime}"
                                                          @}else{
                                                          value=""
                                                          @}
                                                          name="zc2" id="zc2" class="form-control newWidth" />&nbsp;秒钟;
                                        每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                             @if(isNotEmpty(zcOne)){
                                                             value="${zcOne.driverProportion}"
                                                             @}else{
                                                             value=""
                                                             @}
                                                             name="zc3" id="zc3" class="form-control newWidth" />&nbsp;%
                                        <br/>
                                        <br/>
                                        第二轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                                @if(isNotEmpty(zcTwo)){
                                                                value="${zcTwo.pushDistance}"
                                                                @}else{
                                                                value=""
                                                                @}
                                                                name="zc4" id="zc4" class="form-control newWidth" />&nbsp;公里,
                                        推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                          @if(isNotEmpty(zcTwo)){
                                                          value="${zcTwo.pushTime}"
                                                          @}else{
                                                          value=""
                                                          @}
                                                          name="zc5" id="zc5" class="form-control newWidth" />&nbsp;秒钟;
                                        每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                             @if(isNotEmpty(zcTwo)){
                                                             value="${zcTwo.driverProportion}"
                                                             @}else{
                                                             value=""
                                                             @}
                                                             name="zc6" id="zc6" class="form-control newWidth" />&nbsp;%
                                        <br/>
                                        <br/>
                                        第三轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                                @if(isNotEmpty(zcThree)){
                                                                value="${zcThree.pushDistance}"
                                                                @}else{
                                                                value=""
                                                                @}
                                                                name="zc7" id="zc7" class="form-control newWidth" />&nbsp;公里,
                                        推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                          @if(isNotEmpty(zcThree)){
                                                          value="${zcThree.pushTime}"
                                                          @}else{
                                                          value=""
                                                          @}
                                                          name="zc8" id="zc8" class="form-control newWidth" />&nbsp;秒钟;
                                        每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                             @if(isNotEmpty(zcThree)){
                                                             value="${zcThree.driverProportion}"
                                                             @}else{
                                                             value=""
                                                             @}
                                                             name="zc9" id="zc9" class="form-control newWidth" />&nbsp;%
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">出租车推单:</label>
                                    <div class="col-sm-10">
                                        第一轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                                @if(isNotEmpty(czcOne)){
                                                                value="${czcOne.pushDistance}"
                                                                @}else{
                                                                value=""
                                                                @}
                                                                name="czc1" id="czc1" class="form-control newWidth" />&nbsp;公里,
                                        推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                          @if(isNotEmpty(czcOne)){
                                                          value="${czcOne.pushTime}"
                                                          @}else{
                                                          value=""
                                                          @}
                                                          name="czc2" id="czc2" class="form-control newWidth" />&nbsp;秒钟;
                                        每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                             @if(isNotEmpty(czcOne)){
                                                             value="${czcOne.driverProportion}"
                                                             @}else{
                                                             value=""
                                                             @}
                                                             name="czc3" id="czc3" class="form-control newWidth" />&nbsp;%
                                        <br/>
                                        <br/>
                                        第二轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                                @if(isNotEmpty(czcTwo)){
                                                                value="${czcTwo.pushDistance}"
                                                                @}else{
                                                                value=""
                                                                @}
                                                                name="czc4" id="czc4" class="form-control newWidth" />&nbsp;公里,
                                        推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                          @if(isNotEmpty(czcTwo)){
                                                          value="${czcTwo.pushTime}"
                                                          @}else{
                                                          value=""
                                                          @}
                                                          name="czc5" id="czc5" class="form-control newWidth" />&nbsp;秒钟;
                                        每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                             @if(isNotEmpty(czcTwo)){
                                                             value="${czcTwo.driverProportion}"
                                                             @}else{
                                                             value=""
                                                             @}
                                                             name="czc6" id="czc6" class="form-control newWidth" />&nbsp;%
                                        <br/>
                                        <br/>
                                        第三轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                                @if(isNotEmpty(czcThree)){
                                                                value="${czcThree.pushDistance}"
                                                                @}else{
                                                                value=""
                                                                @}
                                                                name="czc7" id="czc7" class="form-control newWidth" />&nbsp;公里,
                                        推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                          @if(isNotEmpty(czcThree)){
                                                          value="${czcThree.pushTime}"
                                                          @}else{
                                                          value=""
                                                          @}
                                                          name="czc8" id="czc8" class="form-control newWidth" />&nbsp;秒钟;
                                        每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                             @if(isNotEmpty(czcThree)){
                                                             value="${czcThree.driverProportion}"
                                                             @}else{
                                                             value=""
                                                             @}
                                                             name="czc9" id="czc9" class="form-control newWidth" />&nbsp;%
                                        <br/>
                                    </div>
                                </div>
                    </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('pushOrderSettings')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="cancelOrderSettings" hidden>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">取消设置:</label>
                                    <div class="col-sm-10">
                                        快车订单取消规则:快车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                       @if(isNotEmpty(ptCancel1)){
                                                                       value="${ptCancel1.minuteNum}"
                                                                       @}else{
                                                                       value=""
                                                                       @}
                                                                       name="ptCancel1" id="ptCancel1" class="form-control newWidth" />&nbsp;分钟后,
                                        取消订单收取&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                           @if(isNotEmpty(ptCancel1)){
                                                           value="${ptCancel1.money}"
                                                           @}else{
                                                           value=""
                                                           @}
                                                           name="ptCancel2" id="ptCancel2" class="form-control newWidth" />&nbsp;元取消费用;
                                        <br/>
                                        <br/>
                                        出租车订单取消规则:出租车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                         @if(isNotEmpty(ptCancel2)){
                                                                         value="${ptCancel2.minuteNum}"
                                                                         @}else{
                                                                         value=""
                                                                         @}
                                                                         name="ptCancel3" id="ptCancel3" class="form-control newWidth" />&nbsp;分钟后,
                                        取消订单收取&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                           @if(isNotEmpty(ptCancel2)){
                                                           value="${ptCancel2.money}"
                                                           @}else{
                                                           value=""
                                                           @}
                                                           name="ptCancel4" id="ptCancel4" class="form-control newWidth" />&nbsp;元取消费用;
                                        <br/>
                                        <br/>
                                        跨城出行取消规则:跨城订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                       @if(isNotEmpty(ptCancel3)){
                                                                       value="${ptCancel3.minuteNum}"
                                                                       @}else{
                                                                       value=""
                                                                       @}
                                                                       name="ptCancel5" id="ptCancel5" class="form-control newWidth" />&nbsp;分钟后,
                                        取消订单收取&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                           @if(isNotEmpty(ptCancel3)){
                                                           value="${ptCancel3.money}"
                                                           @}else{
                                                           value=""
                                                           @}
                                                           name="ptCancel6" id="ptCancel6" class="form-control newWidth" />&nbsp;元取消费用;
                                        <br/>
                                    </div>
                                </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">积分设置:</label>
                        <div class="col-sm-10">
                            消费一元积&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(integral)){
                                              value="${integral.integral}"
                                              @}else{
                                              value=""
                                              @}
                                              name="two" id="two" class="form-control newWidth" />&nbsp;积分;<br/>
                        </div>
                    </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('cancelOrderSettings')"/>
                                    </div>
                                </div>
                    <div class="form-group" style="height: 70px;">
                        <label class="col-sm-2 control-label">人脸识别:</label>
                        <div class="col-sm-10">
                            <div class="radio radio-danger">
                                <input type="radio" name="three" id="three1" value="2"
                                       ${isNotEmpty(faceDistinguish) && 2 == faceDistinguish.isOpen  ? 'checked=checked' : ''}
                                       onclick="threeClick(2)">
                                <label for="three1">
                                    关闭
                                </label>
                            </div>
                            <div class="cancelTheReservationOrderSetting" hidden>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">预约单取消设置:</label>
                                    <div class="col-sm-10">
                                        快车订单取消规则:快车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                       @if(isNotEmpty(yyCancel1)){
                                                                       value="${yyCancel1.minuteNum}"
                                                                       @}else{
                                                                       value=""
                                                                       @}
                                                                       name="yyCancel1" id="yyCancel1" class="form-control newWidth" />&nbsp;分钟后,
                                        取消订单收取&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                           @if(isNotEmpty(yyCancel1)){
                                                           value="${yyCancel1.money}"
                                                           @}else{
                                                           value=""
                                                           @}
                                                           name="yyCancel2" id="yyCancel2" class="form-control newWidth" />&nbsp;元取消费用;
                                        <br/>
                                        <br/>
                                        出租车订单取消规则:出租车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                                         @if(isNotEmpty(yyCancel2)){
                                                                         value="${yyCancel2.minuteNum}"
                                                                         @}else{
                                                                         value=""
                                                                         @}
                                                                         name="yyCancel3" id="yyCancel3" class="form-control newWidth" />&nbsp;分钟后,
                                        取消订单收取&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                           @if(isNotEmpty(yyCancel2)){
                                                           value="${yyCancel2.money}"
                                                           @}else{
                                                           value=""
                                                           @}
                                                           name="yyCancel4" id="yyCancel4" class="form-control newWidth" />&nbsp;元取消费用;
                                        <br/>
                            <div class="radio radio-danger">
                                <input type="radio" name="three" id="three2" value="1"
                                       ${isNotEmpty(faceDistinguish) && 1 == faceDistinguish.isOpen  ? 'checked=checked' : ''}
                                       onclick="threeClick(1)">
                                <label for="three2">
                                    打开
                                    <div id="openDiv" style="position: relative;top: -26px;margin-left: 50px;display: none;">
                                        <span style="margin-left: 20px;">上班中每隔</span>
                                        <input type="text" oninput="checkIsInt(this)" class="form-control newWidth"
                                               ${isNotEmpty(faceDistinguish) && 1 == faceDistinguish.isOpen  ? 'value='+faceDistinguish.minuteNum : ''}
                                               id="openValue" name="openValue">
                                        <span>分钟,进行一次人脸识别;</span>
                                    </div>
                                </div>
                                </label>
                            </div>
                        </div>
                    </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('cancelTheReservationOrderSetting')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="spellOrderSetting" hidden>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">实时拼单:</label>
                                    <div class="col-sm-10">
                                        满足用户起点位置&nbsp;<input type="text"
                                                                  @if(isNotEmpty(spellOrderRule)){
                                                                  value="${spellOrderRule.num1}"
                                                                  @}else{
                                                                  value=""
                                                                  @}
                                                                  id="pdpd1" class="form-control newWidth" />&nbsp;公里范围内,
                                        且满足终点位置&nbsp;<input type="text"
                                                               @if(isNotEmpty(spellOrderRule)){
                                                               value="${spellOrderRule.num2}"
                                                               @}else{
                                                               value=""
                                                               @}
                                                               id="pdpd2" class="form-control newWidth" />&nbsp;公里范围内的拼车用户匹配订单
                                        <br>
                                        <br>
                                        满足司机当前位置&nbsp;<input type="text"
                                                       @if(isNotEmpty(spellOrderRule)){
                                                       value="${spellOrderRule.num3}"
                                                       @}else{
                                                       value=""
                                                       @}
                                                       id="pdpd3" class="form-control newWidth" />&nbsp;公里范围内,
                                        且终点满足当前服务用户终点位置的&nbsp;<input type="text"
                                                            @if(isNotEmpty(spellOrderRule)){
                                                            value="${spellOrderRule.num4}"
                                                            @}else{
                                                            value=""
                                                            @}
                                                            id="pdpd4" class="form-control newWidth" />&nbsp;公里范围内的拼车用户匹配订单
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">预约拼车:</label>
                                    <div class="col-sm-10">
                                        用户的出发时间前&nbsp;<input type="text"
                                               @if(isNotEmpty(spellOrderRule)){
                                               value="${spellOrderRule.num5}"
                                               @}else{
                                               value=""
                                               @}
                                               id="pdpd5" class="form-control newWidth" />&nbsp;分钟,
                                        后&nbsp;<input type="text"
                                                               @if(isNotEmpty(spellOrderRule)){
                                                               value="${spellOrderRule.num6}"
                                                               @}else{
                                                               value=""
                                                               @}
                                                               id="pdpd6" class="form-control newWidth" />&nbsp;分钟的订单,可匹配一起
                                    </div>
                                </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('spellOrderSetting')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="timeoutDeductionSettings" hidden>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">超过:</label>
                                    &nbsp;<input type="text"
                                                 @if(isNotEmpty(tSysTimeoutMoney)){
                                                 value="${tSysTimeoutMoney.timeOut}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 id="timeOut" class="form-control newWidth" />&nbsp;分钟,
                                    小件物流超时扣除金额&nbsp;<input type="text"
                                                           @if(isNotEmpty(tSysTimeoutMoney)){
                                                           value="${tSysTimeoutMoney.deductMoney}"
                                                           @}else{
                                                           value=""
                                                           @}
                                                           id="deductMoney" class="form-control newWidth" />&nbsp;%
                                </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('timeoutDeductionSettings')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="reassigningSet" hidden>
                                <div class="col-sm-3">
                                    改派费用为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                      @if(isNotEmpty(reformist)){
                                                      value="${reformist.money}"
                                                      @}else{
                                                      value=""
                                                      @}
                                                      name="one" id="one" class="form-control newWidth" />&nbsp;元;<br/>
                                </div>
                                <div class="col-sm-3">
                                    <label class="col-sm-5 control-label">快车改派:</label>
                                    <div class="col-sm-7">
                                        <div class="form-group">
                                            <div class="col-sm-9">
                                                <input type="checkbox" class="js-switch" id="isSpecialCar"
                                                       @if(isNotEmpty(reformist)){
                                                       ${1 == reformist.isSpecialCar ? '' : 'checked=checked'}
                                                @}
                                                />
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <div class="col-sm-3">
                                    <label class="col-sm-5 control-label">出租车改派:</label>
                                    <div class="col-sm-7">
                                        <div class="form-group">
                                            <div class="col-sm-9">
                                                <input type="checkbox" class="js-switch1" id="isTaxiCar"
                                                       @if(isNotEmpty(reformist)){
                                                       ${1 == reformist.isTaxiCar ? '' : 'checked=checked'}
                                                @}
                                                />
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('reassigningSet')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="faceRecognitionSettings" hidden>
                                <div class="form-group" style="height: 70px;">
                                    <label class="col-sm-2 control-label">人脸识别:</label>
                                    <div class="col-sm-10">
                                        <div class="radio radio-danger">
                                            <input type="radio" name="three" id="three1" value="2"
                                                   ${isNotEmpty(faceDistinguish) && 2 == faceDistinguish.isOpen  ? 'checked=checked' : ''}
                                            onclick="threeClick(2)">
                                            <label for="three1">
                                                关闭
                                            </label>
                                        </div>
                                        <div class="radio radio-danger">
                                            <input type="radio" name="three" id="three2" value="1"
                                                   ${isNotEmpty(faceDistinguish) && 1 == faceDistinguish.isOpen  ? 'checked=checked' : ''}
                                            onclick="threeClick(1)">
                                            <label for="three2">
                                                打开
                                                <div id="openDiv" style="position: relative;top: -26px;margin-left: 50px;display: none;">
                                                    <span style="margin-left: 20px;">上班中每隔</span>
                                                    <input type="text" oninput="checkIsInt(this)" class="form-control newWidth"
                                                           ${isNotEmpty(faceDistinguish) && 1 == faceDistinguish.isOpen  ? 'value='+faceDistinguish.minuteNum : ''}
                                                    id="openValue" name="openValue">
                                                    <span>分钟,进行一次人脸识别;</span>
                                                </div>
                                            </label>
                                        </div>
                                    </div>
                                </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('faceRecognitionSettings')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="integralSet" hidden>
                                <div class="form-group">
                                    <div class="col-sm-10">
                                        消费一元积&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                          @if(isNotEmpty(integral)){
                                                          value="${integral.integral}"
                                                          @}else{
                                                          value=""
                                                          @}
                                                          name="two" id="two" class="form-control newWidth" />&nbsp;积分;<br/>
                                    </div>
                                </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('integralSet')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="withdrawalFeeSetting" hidden>
                                <div class="form-group" style="border: 0">
                                    <label class="col-sm-2 control-label">提现手续费:</label>
                                    &nbsp;<input type="text"
                                                 @if(isNotEmpty(tSysWithdrawalPoundage)){
                                                 value="${tSysWithdrawalPoundage.percentage}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 id="percentage" class="form-control newWidth" />&nbsp;%
                                </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('withdrawalFeeSetting')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="phoneSettings" hidden>
                                <div class="form-group">
                                    <div class="col-sm-10">
                                        报警电话:&nbsp;<input type="text"
                                                          @if(isNotEmpty(phone1)){
                                                          value="${phone1.phone}"
                                                          @}else{
                                                          value=""
                                                          @}
                                                          name="phone1" id="phone1" class="form-control newWidth" />&nbsp;
                                        <br/>
                                        <br/>
                                        客服电话:&nbsp;<input type="text"
                                                          @if(isNotEmpty(phone2)){
                                                          value="${phone2.phone}"
                                                          @}else{
                                                          value=""
                                                          @}
                                                          name="phone2" id="phone2" class="form-control newWidth" />&nbsp;
                                        <br/>
                                        <br/>
                                        包车调度电话:&nbsp;<input type="text"
                                                            @if(isNotEmpty(phone3)){
                                                            value="${phone3.phone}"
                                                            @}else{
                                                            value=""
                                                            @}
                                                            name="phone3" id="phone3" class="form-control newWidth" />&nbsp;
                                        <br/>
                                        <br/>
                                        招聘电话:&nbsp;<input type="text"
                                                            @if(isNotEmpty(phone5)){
                                                            value="${phone5.phone}"
                                                            @}else{
                                                            value=""
                                                            @}
                                                            name="phone3" id="phone5" class="form-control newWidth" />&nbsp;
                                    </div>
                                </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('phoneSettings')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="holidayServiceFeeSetting" hidden>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">节假日服务费:</label>
                                    <div class="col-sm-2">
                                        <input class="form-control" id="holidayFee"
                                               @if(isNotEmpty(holidayFee)){
                                               value="${holidayFee}"
                                               @}else{
                                               value=""
                                               @}
                                        />
                                    </div>
                                </div>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('holidayServiceFeeSetting')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="95128TheOnCall" hidden>
                                95128电召电话:&nbsp;<input type="text"
                                                       @if(isNotEmpty(phone4)){
                                                       value="${phone4.phone}"
                                                       @}else{
                                                       value=""
                                                       @}
                                                       name="phone4" id="phone4" class="form-control newWidth" />&nbsp;
                                <br/>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('95128TheOnCall')"/>
                                    </div>
                                </div>
                            </div>
                            <div class="moduleManagement" hidden>
                                <table>
                                    <thead>
                                        <tr><th>序号</th><th>模块名</th><th>用户端是否显示</th><th>司机端是否显示</th></tr>
                                    </thead>
                                    <tbody>
                                        <tr><td>1</td><td>司机招聘</td><td><input type="checkbox" class="js-switch1-1" id="sjzp1" ${2 == showModulars.sjzp1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch1-2" id="sjzp2" ${2 == showModulars.sjzp2 ? '' : 'checked=checked'}/></td></tr>
                                        <tr><td>2</td><td>租车</td><td><input type="checkbox" class="js-switch2-1" id="zuc1" ${2 == showModulars.zuc1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch2-2" id="zuc2" ${2 == showModulars.zuc2 ? '' : 'checked=checked'}/></td></tr>
                                        <tr><td>3</td><td>买车</td><td><input type="checkbox" class="js-switch3-1" id="mc1" ${2 == showModulars.mc1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch3-2" id="mc2" ${2 == showModulars.mc2 ? '' : 'checked=checked'}/></td></tr>
                                        <tr><td>4</td><td>出租个人车辆</td><td><input type="checkbox" class="js-switch4-1" id="czgrcl1" ${2 == showModulars.czgrcl1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch4-2" id="czgrcl2" ${2 == showModulars.czgrcl2 ? '' : 'checked=checked'}/></td></tr>
                                        <tr><td>5</td><td>卖车</td><td><input type="checkbox" class="js-switch5-1" id="mac1" ${2 == showModulars.mac1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch5-2" id="mac2" ${2 == showModulars.mac2 ? '' : 'checked=checked'}/></td></tr>
                                        <tr><td>6</td><td>商家中心</td><td><input type="checkbox" class="js-switch6-1" id="sjzx1" ${2 == showModulars.sjzx1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch6-2" id="sjzx2" ${2 == showModulars.sjzx2 ? '' : 'checked=checked'}/></td></tr>
                                        <tr><td>7</td><td>打车卡</td><td><input type="checkbox" class="js-switch7-1" id="dck1" ${2 == showModulars.dck1 ? '' : 'checked=checked'}/></td><td> - </td></tr>
                                    </tbody>
                                </table>
                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('moduleManagement')"/>
                                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">专车改派:</label>
                        <div class="col-sm-10">
                            <div class="form-group">
                                <div class="col-sm-9">
                                    <input type="checkbox" class="js-switch" id="isSpecialCar"
                                           @if(isNotEmpty(reformist)){
                                           ${1 == reformist.isSpecialCar ? '' : 'checked=checked'}
                                           @}
                                    />
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">出租车改派:</label>
                        <div class="col-sm-10">
                            <div class="form-group">
                                <div class="col-sm-9">
                                    <input type="checkbox" class="js-switch1" id="isTaxiCar"
                                           @if(isNotEmpty(reformist)){
                                           ${1 == reformist.isTaxiCar ? '' : 'checked=checked'}
                                    @}
                                    />
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="ibox-title" >
                        <h3>推单设置:</h3>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">专车推单:</label>
                        <div class="col-sm-10">
                            第一轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(zcOne)){
                                                    value="${zcOne.pushDistance}"
                                                    @}else{
                                                    value=""
                                                    @}
                                                    name="zc1" id="zc1" class="form-control newWidth" />&nbsp;公里,
                            推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(zcOne)){
                                              value="${zcOne.pushTime}"
                                              @}else{
                                              value=""
                                              @}
                                              name="zc2" id="zc2" class="form-control newWidth" />&nbsp;秒钟;
                            每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                 @if(isNotEmpty(zcOne)){
                                                 value="${zcOne.driverProportion}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="zc3" id="zc3" class="form-control newWidth" />&nbsp;%
                            <br/>
                            <br/>
                            第二轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(zcTwo)){
                                                    value="${zcTwo.pushDistance}"
                                                    @}else{
                                                    value=""
                                                    @}
                                                    name="zc4" id="zc4" class="form-control newWidth" />&nbsp;公里,
                            推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(zcTwo)){
                                              value="${zcTwo.pushTime}"
                                              @}else{
                                              value=""
                                              @}
                                              name="zc5" id="zc5" class="form-control newWidth" />&nbsp;秒钟;
                            每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                 @if(isNotEmpty(zcTwo)){
                                                 value="${zcTwo.driverProportion}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="zc6" id="zc6" class="form-control newWidth" />&nbsp;%
                            <br/>
                            <br/>
                            第三轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(zcThree)){
                                                    value="${zcThree.pushDistance}"
                                                    @}else{
                                                    value=""
                                                    @}
                                                    name="zc7" id="zc7" class="form-control newWidth" />&nbsp;公里,
                            推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(zcThree)){
                                              value="${zcThree.pushTime}"
                                              @}else{
                                              value=""
                                              @}
                                              name="zc8" id="zc8" class="form-control newWidth" />&nbsp;秒钟;
                            每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                 @if(isNotEmpty(zcThree)){
                                                 value="${zcThree.driverProportion}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="zc9" id="zc9" class="form-control newWidth" />&nbsp;%
                            <br/>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">出租车推单:</label>
                        <div class="col-sm-10">
                            第一轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(czcOne)){
                                                    value="${czcOne.pushDistance}"
                                                    @}else{
                                                    value=""
                                                    @}
                                                    name="czc1" id="czc1" class="form-control newWidth" />&nbsp;公里,
                            推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(czcOne)){
                                              value="${czcOne.pushTime}"
                                              @}else{
                                              value=""
                                              @}
                                              name="czc2" id="czc2" class="form-control newWidth" />&nbsp;秒钟;
                            每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                 @if(isNotEmpty(czcOne)){
                                                 value="${czcOne.driverProportion}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="czc3" id="czc3" class="form-control newWidth" />&nbsp;%
                            <br/>
                            <br/>
                            第二轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(czcTwo)){
                                                    value="${czcTwo.pushDistance}"
                                                    @}else{
                                                    value=""
                                                    @}
                                                    name="czc4" id="czc4" class="form-control newWidth" />&nbsp;公里,
                            推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(czcTwo)){
                                              value="${czcTwo.pushTime}"
                                              @}else{
                                              value=""
                                              @}
                                              name="czc5" id="czc5" class="form-control newWidth" />&nbsp;秒钟;
                            每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                 @if(isNotEmpty(czcTwo)){
                                                 value="${czcTwo.driverProportion}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="czc6" id="czc6" class="form-control newWidth" />&nbsp;%
                            <br/>
                            <br/>
                            第三轮推单:推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(czcThree)){
                                                    value="${czcThree.pushDistance}"
                                                    @}else{
                                                    value=""
                                                    @}
                                                    name="czc7" id="czc7" class="form-control newWidth" />&nbsp;公里,
                            推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(czcThree)){
                                              value="${czcThree.pushTime}"
                                              @}else{
                                              value=""
                                              @}
                                              name="czc8" id="czc8" class="form-control newWidth" />&nbsp;秒钟;
                            每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                 @if(isNotEmpty(czcThree)){
                                                 value="${czcThree.driverProportion}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="czc9" id="czc9" class="form-control newWidth" />&nbsp;%
                            <br/>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">取消设置:</label>
                        <div class="col-sm-10">
                            专车订单取消规则:专车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                           @if(isNotEmpty(ptCancel1)){
                                                           value="${ptCancel1.minuteNum}"
                                                           @}else{
                                                           value=""
                                                           @}
                                                           name="ptCancel1" id="ptCancel1" class="form-control newWidth" />&nbsp;分钟后,
                            取消订单收取&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                               @if(isNotEmpty(ptCancel1)){
                                               value="${ptCancel1.money}"
                                               @}else{
                                               value=""
                                               @}
                                               name="ptCancel2" id="ptCancel2" class="form-control newWidth" />&nbsp;元取消费用;
                            <br/>
                            <br/>
                            出租车订单取消规则:出租车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                             @if(isNotEmpty(ptCancel2)){
                                                             value="${ptCancel2.minuteNum}"
                                                             @}else{
                                                             value=""
                                                             @}
                                                             name="ptCancel3" id="ptCancel3" class="form-control newWidth" />&nbsp;分钟后,
                            取消订单收取&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                               @if(isNotEmpty(ptCancel2)){
                                               value="${ptCancel2.money}"
                                               @}else{
                                               value=""
                                               @}
                                               name="ptCancel4" id="ptCancel4" class="form-control newWidth" />&nbsp;元取消费用;
                            <br/>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">预约单取消设置:</label>
                        <div class="col-sm-10">
                            专车订单取消规则:专车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                           @if(isNotEmpty(yyCancel1)){
                                                           value="${yyCancel1.minuteNum}"
                                                           @}else{
                                                           value=""
                                                           @}
                                                           name="yyCancel1" id="yyCancel1" class="form-control newWidth" />&nbsp;分钟后,
                            取消订单收取&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                               @if(isNotEmpty(yyCancel1)){
                                               value="${yyCancel1.money}"
                                               @}else{
                                               value=""
                                               @}
                                               name="yyCancel2" id="yyCancel2" class="form-control newWidth" />&nbsp;元取消费用;
                            <br/>
                            <br/>
                            出租车订单取消规则:出租车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                             @if(isNotEmpty(yyCancel2)){
                                                             value="${yyCancel2.minuteNum}"
                                                             @}else{
                                                             value=""
                                                             @}
                                                             name="yyCancel3" id="yyCancel3" class="form-control newWidth" />&nbsp;分钟后,
                            取消订单收取&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                               @if(isNotEmpty(yyCancel2)){
                                               value="${yyCancel2.money}"
                                               @}else{
                                               value=""
                                               @}
                                               name="yyCancel4" id="yyCancel4" class="form-control newWidth" />&nbsp;元取消费用;
                            <br/>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">电话设置:</label>
                        <div class="col-sm-10">
                            报警电话:&nbsp;<input type="text"
                                              @if(isNotEmpty(phone1)){
                                              value="${phone1.phone}"
                                              @}else{
                                              value=""
                                              @}
                                              name="phone1" id="phone1" class="form-control newWidth" />&nbsp;
                            <br/>
                            <br/>
                            客服电话:&nbsp;<input type="text"
                                              @if(isNotEmpty(phone2)){
                                              value="${phone2.phone}"
                                              @}else{
                                              value=""
                                              @}
                                              name="phone2" id="phone2" class="form-control newWidth" />&nbsp;
                            <br/>
                            <br/>
                            包车调度电话:&nbsp;<input type="text"
                                              @if(isNotEmpty(phone3)){
                                              value="${phone3.phone}"
                                              @}else{
                                              value=""
                                              @}
                                              name="phone3" id="phone3" class="form-control newWidth" />&nbsp;
                            <br/>
                        </div>
                    </div>
                </div>
            </div>
            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp()"/>
                </div>
            </div>
        </div>
@@ -635,34 +368,6 @@
        var init = new Switchery(elem);
        var elem1 = document.querySelector(".js-switch1");
        var init1 = new Switchery(elem1);
        var elem1_1 = document.querySelector(".js-switch1-1");
        var init1 = new Switchery(elem1_1);
        var elem1_2 = document.querySelector(".js-switch1-2");
        var init1 = new Switchery(elem1_2);
        var elem2_1 = document.querySelector(".js-switch2-1");
        var init1 = new Switchery(elem2_1);
        var elem2_2 = document.querySelector(".js-switch2-2");
        var init1 = new Switchery(elem2_2);
        var elem3_1 = document.querySelector(".js-switch3-1");
        var init1 = new Switchery(elem3_1);
        var elem3_2 = document.querySelector(".js-switch3-2");
        var init1 = new Switchery(elem3_2);
        var elem4_1 = document.querySelector(".js-switch4-1");
        var init1 = new Switchery(elem4_1);
        var elem4_2 = document.querySelector(".js-switch4-2");
        var init1 = new Switchery(elem4_2);
        var elem5_1 = document.querySelector(".js-switch5-1");
        var init1 = new Switchery(elem5_1);
        var elem5_2 = document.querySelector(".js-switch5-2");
        var init1 = new Switchery(elem5_2);
        var elem6_1 = document.querySelector(".js-switch6-1");
        var init1 = new Switchery(elem6_1);
        var elem6_2 = document.querySelector(".js-switch6-2");
        var init1 = new Switchery(elem6_2);
        var elem7_1 = document.querySelector(".js-switch7-1");
        var init1 = new Switchery(elem7_1);
        var elem7_2 = document.querySelector(".js-switch7-2");
        var init1 = new Switchery(elem7_2);
        var three = $("input[name='three']:checked").val();
        if (three == "" || three == null || three == undefined){
@@ -697,30 +402,14 @@
        }
    }
    function checkedLable(e) {
        $(e).attr('class', 'lab checked');
        let tag = $(e).attr('tag');
        $('.' + tag).show();
        $(e).siblings().each(function (i, el) {
            $(el).attr('class', 'lab');
            let tag1 = $(el).attr('tag');
            $('.' + tag1).hide();
        })
    }
    /**
     * 提交操作
     */
    function setUp(type) {
    function setUp() {
        var one = $("#one").val().trim();
        var two = $("#two").val().trim();
        var three = $("input[name='three']:checked").val();
        var openValue = $("#openValue").val();
        var percentage = $("#percentage").val();
        var timeOut = $("#timeOut").val();
        var deductMoney = $("#deductMoney").val();
        var isSpecialCar = $("#isSpecialCar").is(":checked");
        if (isSpecialCar){
@@ -733,17 +422,6 @@
            isTaxiCar = 2;
        } else {
            isTaxiCar = 1;
        }
        if(type == 'faceRecognitionSettings'){
            if (1 == three){
                if ("" == openValue || null == openValue || undefined == openValue){
                    Feng.info("人脸识别分钟数不能为空!");
                    return;
                }else if (!regInt.test(openValue)) {
                    Feng.info("人脸识别分钟数格式不正确!");
                    return;
                }
            }
        }
        var zc1 = $("#zc1").val().trim();
@@ -765,138 +443,54 @@
        var czc7 = $("#czc7").val().trim();
        var czc8 = $("#czc8").val().trim();
        var czc9 = $("#czc9").val().trim();
        if(type == 'pushOrderSettings'){
            if("" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
                || "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9){
                Feng.info("输入框不能为空!");
                return;
            }
            if(!regDouble.test(zc1) || !regInt.test(zc2) || !regDouble.test(zc3)
                || !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6)
                || !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9)
                || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
                || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
                || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)){
                Feng.info("格式不正确!");
                return ;
            }
        }
        var ptCancel1 = $("#ptCancel1").val().trim();
        var ptCancel2 = $("#ptCancel2").val().trim();
        var ptCancel3 = $("#ptCancel3").val().trim();
        var ptCancel4 = $("#ptCancel4").val().trim();
        var ptCancel5 = $("#ptCancel5").val().trim();
        var ptCancel6 = $("#ptCancel6").val().trim();
        if(type == 'cancelOrderSettings'){
            if("" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 || "" == ptCancel5 || "" == ptCancel6){
                Feng.info("输入框不能为空!");
                return;
            }
            if(!regInt.test(ptCancel1) || !regDouble.test(ptCancel2) || !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) || !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)){
                Feng.info("格式不正确!");
                return ;
            }
        }
        // var ptCancel5 = $("#ptCancel5").val().trim();
        // var ptCancel6 = $("#ptCancel6").val().trim();
        var yyCancel1 = $("#yyCancel1").val().trim();
        var yyCancel2 = $("#yyCancel2").val().trim();
        var yyCancel3 = $("#yyCancel3").val().trim();
        var yyCancel4 = $("#yyCancel4").val().trim();
        if(type == 'cancelTheReservationOrderSetting'){
            if("" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4){
                Feng.info("输入框不能为空!");
                return;
            }
            if(!regInt.test(yyCancel1) || !regDouble.test(yyCancel2) || !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)){
                Feng.info("格式不正确!");
                return ;
            }
        }
        var pdpd1 = $('#pdpd1').val().trim();
        var pdpd2 = $('#pdpd2').val().trim();
        var pdpd3 = $('#pdpd3').val().trim();
        var pdpd4 = $('#pdpd4').val().trim();
        var pdpd5 = $('#pdpd5').val().trim();
        var pdpd6 = $('#pdpd6').val().trim();
        if(type == 'spellOrderSetting'){
            if("" == pdpd1 || "" == pdpd2 || "" == pdpd3 || "" == pdpd4 || "" == pdpd5 || "" == pdpd6){
                Feng.info("输入框不能为空!");
                return;
            }
            if(!regInt.test(pdpd1) || !regDouble.test(pdpd2) || !regInt.test(pdpd3) || !regDouble.test(pdpd4) || !regDouble.test(pdpd5) || !regDouble.test(pdpd6)){
                Feng.info("格式不正确!");
                return ;
            }
        }
        var phone1 = $("#phone1").val().trim();
        var phone2 = $("#phone2").val().trim();
        var phone3 = $("#phone3").val().trim();
        var phone5 = $("#phone5").val().trim();
        if(type == "phoneSettings"){
            if('' == phone1 || '' == phone2 || '' == phone3 || '' == phone5){
                Feng.info("输入框不能为空!");
        if ("" == one || "" == two || "" == three
            || "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
            || "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9
            || "" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 /*|| "" == ptCancel5 || "" == ptCancel6*/
            || "" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4
            || "" == phone1 || "" == phone2 ) {
            Feng.info("输入框不能为空!");
            return;
        }else if (1 == three){
            if ("" == openValue || null == openValue || undefined == openValue){
                Feng.info("人脸识别分钟数不能为空!");
                return;
            }else if (!regInt.test(openValue)) {
                Feng.info("人脸识别分钟数格式不正确!");
                return;
            }
        } else if (!regDouble.test(one) || !regInt.test(two)
            || !regDouble.test(zc1) || !regInt.test(zc2) || !regDouble.test(zc3)
            || !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6)
            || !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9)
            || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
            || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
            || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)
            || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) || !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) /*|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
            || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) || !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)) {
            Feng.info("格式不正确!");
            return ;
        }
        var phone4 = $("#phone4").val().trim();
        if(type == "95128TheOnCall"){
            if('' == phone4){
                Feng.info("输入框不能为空!");
                return;
            }
        }
        var holidayFee = $("#holidayFee").val().trim();
        if(type == 'holidayServiceFeeSetting'){
            if('' == holidayFee){
                Feng.info("输入框不能为空!");
                return;
            }
            if(!regDouble.test(holidayFee)){
                Feng.info("格式不正确!");
                return ;
            }
        }
        var sjzp1 = $("#sjzp1").is(":checked");
        if (sjzp1){sjzp1 = 1;} else {sjzp1 = 2;}
        var sjzp2 = $("#sjzp2").is(":checked");
        if (sjzp2){sjzp2 = 1;} else {sjzp2 = 2;}
        var zuc1 = $("#zuc1").is(":checked");
        if (zuc1){zuc1 = 1;} else {zuc1 = 2;}
        var zuc2 = $("#zuc2").is(":checked");
        if (zuc2){zuc2 = 1;} else {zuc2 = 2;}
        var mc1 = $("#mc1").is(":checked");
        if (mc1){mc1 = 1;} else {mc1 = 2;}
        var mc2 = $("#mc2").is(":checked");
        if (mc2){mc2 = 1;} else {mc2 = 2;}
        var czgrcl1 = $("#czgrcl1").is(":checked");
        if (czgrcl1){czgrcl1 = 1;} else {czgrcl1 = 2;}
        var czgrcl2 = $("#czgrcl2").is(":checked");
        if (czgrcl2){czgrcl2 = 1;} else {czgrcl2 = 2;}
        var mac1 = $("#mac1").is(":checked");
        if (mac1){mac1 = 1;} else {mac1 = 2;}
        var mac2 = $("#mac2").is(":checked");
        if (mac2){mac2 = 1;} else {mac2 = 2;}
        var sjzx1 = $("#sjzx1").is(":checked");
        if (sjzx1){sjzx1 = 1;} else {sjzx1 = 2;}
        var sjzx2 = $("#sjzx2").is(":checked");
        if (sjzx2){sjzx2 = 1;} else {sjzx2 = 2;}
        var dck1 = $("#dck1").is(":checked");
        if (dck1){dck1 = 1;} else {dck1 = 2;}
        var dck2 = $("#dck2").is(":checked");
        if (dck2){dck2 = 1;} else {dck2 = 2;}
        //提交信息
        var ajax = new $ax(Feng.ctxPath + "/tSysReformist/setUp", function(data){
@@ -905,109 +499,53 @@
        },function(data){
            Feng.error("操作失败!" + data.responseJSON.message + "!");
        });
        if(type == 'integralSet'){
            ajax.set("two", two);
        ajax.set("one", one);
        ajax.set("two", two);
        ajax.set("three", three);
        if (1 == three){
            ajax.set("openValue",openValue);
        } else if (2 == three){
            ajax.set("openValue",0);
        }
        if(type == 'faceRecognitionSettings'){
            ajax.set("three", three);
            if (1 == three){
                ajax.set("openValue",openValue);
            } else if (2 == three){
                ajax.set("openValue",0);
            }
        }
        ajax.set("isSpecialCar", isSpecialCar);
        ajax.set("isTaxiCar", isTaxiCar);
        if(type == 'withdrawalFeeSetting'){
            ajax.set("percentage", percentage);
        }
        ajax.set("zc1", zc1);
        ajax.set("zc2", zc2);
        ajax.set("zc3", zc3);
        ajax.set("zc4", zc4);
        ajax.set("zc5", zc5);
        ajax.set("zc6", zc6);
        ajax.set("zc7", zc7);
        ajax.set("zc8", zc8);
        ajax.set("zc9", zc9);
        if(type == 'timeoutDeductionSettings'){
            ajax.set("timeOut", timeOut);
            ajax.set("deductMoney", deductMoney);
        }
        ajax.set("czc1", czc1);
        ajax.set("czc2", czc2);
        ajax.set("czc3", czc3);
        ajax.set("czc4", czc4);
        ajax.set("czc5", czc5);
        ajax.set("czc6", czc6);
        ajax.set("czc7", czc7);
        ajax.set("czc8", czc8);
        ajax.set("czc9", czc9);
        if(type == 'reassigningSet'){
            ajax.set("one", one);
            ajax.set("isSpecialCar", isSpecialCar);
            ajax.set("isTaxiCar", isTaxiCar);
        }
        ajax.set("ptCancel1", ptCancel1);
        ajax.set("ptCancel2", ptCancel2);
        ajax.set("ptCancel3", ptCancel3);
        ajax.set("ptCancel4", ptCancel4);
        ajax.set("ptCancel5", 0);
        ajax.set("ptCancel6", 0);
        if(type == 'pushOrderSettings'){
            ajax.set("zc1", zc1);
            ajax.set("zc2", zc2);
            ajax.set("zc3", zc3);
            ajax.set("zc4", zc4);
            ajax.set("zc5", zc5);
            ajax.set("zc6", zc6);
            ajax.set("zc7", zc7);
            ajax.set("zc8", zc8);
            ajax.set("zc9", zc9);
        ajax.set("yyCancel1", yyCancel1);
        ajax.set("yyCancel2", yyCancel2);
        ajax.set("yyCancel3", yyCancel3);
        ajax.set("yyCancel4", yyCancel4);
            ajax.set("czc1", czc1);
            ajax.set("czc2", czc2);
            ajax.set("czc3", czc3);
            ajax.set("czc4", czc4);
            ajax.set("czc5", czc5);
            ajax.set("czc6", czc6);
            ajax.set("czc7", czc7);
            ajax.set("czc8", czc8);
            ajax.set("czc9", czc9);
        }
        if(type == 'cancelOrderSettings'){
            ajax.set("ptCancel1", ptCancel1);
            ajax.set("ptCancel2", ptCancel2);
            ajax.set("ptCancel3", ptCancel3);
            ajax.set("ptCancel4", ptCancel4);
            ajax.set("ptCancel5", ptCancel5);
            ajax.set("ptCancel6", ptCancel6);
        }
        if(type == 'cancelTheReservationOrderSetting'){
            ajax.set("yyCancel1", yyCancel1);
            ajax.set("yyCancel2", yyCancel2);
            ajax.set("yyCancel3", yyCancel3);
            ajax.set("yyCancel4", yyCancel4);
        }
        if(type == 'spellOrderSetting'){
            ajax.set("pdpd1", pdpd1);
            ajax.set("pdpd2", pdpd2);
            ajax.set("pdpd3", pdpd3);
            ajax.set("pdpd4", pdpd4);
            ajax.set("pdpd5", pdpd5);
            ajax.set("pdpd6", pdpd6);
        }
        if(type == "phoneSettings"){
            ajax.set("phone1", phone1);
            ajax.set("phone2", phone2);
            ajax.set("phone3", phone3);
            ajax.set("phone5", phone5);
        }
        if(type == "95128TheOnCall"){
            ajax.set("phone4", phone4);
        }
        if(type == 'holidayServiceFeeSetting'){
            ajax.set("holidayFee", holidayFee);
        }
        if(type == 'moduleManagement'){
            ajax.set("sjzp1", sjzp1);
            ajax.set("sjzp2", sjzp2);
            ajax.set("zuc1", zuc1);
            ajax.set("zuc2", zuc2);
            ajax.set("mc1", mc1);
            ajax.set("mc2", mc2);
            ajax.set("czgrcl1", czgrcl1);
            ajax.set("czgrcl2", czgrcl2);
            ajax.set("mac1", mac1);
            ajax.set("mac2", mac2);
            ajax.set("sjzx1", sjzx1);
            ajax.set("sjzx2", sjzx2);
            ajax.set("dck1", dck1);
            ajax.set("dck2", dck2);
        }
        ajax.set("type", type);
        ajax.set("phone1", phone1);
        ajax.set("phone2", phone2);
        ajax.set("phone3", phone3);
        ajax.start();
    }
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>快车价格设置管理</h5>
                <h5>专车价格设置管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
@@ -3,36 +3,6 @@
    .newWidth, .single-line{
        max-width:150px !important;display: initial !important;
    }
    .lab{
        display: block;
        width: 150px;
        height: 45px;
        text-align: center;
        line-height: 45px;
        cursor: pointer;
        font-size: 16px;
        background-color: #F8F8F8;
        margin: 0;
    }
    .lab:hover{
        background-color: #F3F4F5;
    }
    .checked{
        background-color: #FFF !important;
        border-left: 10px solid #077CCB;
    }
    .shareSeatPriceSetting>div>label{
        text-align: center;
        height: 35px;
        line-height: 35px;
        width: 200px;
        border: 1px solid #E4E4E4;
    }
    .shareSeatPriceSetting .people, .shareSeatPriceSetting .carpool{
        text-align: center;
        border: 1px solid #377CCD;
        color: #377CCD;
    }
</style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
@@ -51,764 +21,100 @@
                            </select>
                        </div>
                    </div>
                    <div class="form-group waitFee">
                        <label class="col-sm-2 control-label">等待费设置:</label>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">运价类型说明:</label>
                        <div class="col-sm-10">
                            司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟过后开始收取等待费,
                            为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元/分,不足一分钟按照一分钟计算
                            <textarea class="form-control" id="fareTypeNote" name="fareTypeNote" style="height: 100px;"></textarea>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">起步价设置:</label>
                        <div class="col-sm-10">
                            起步价为&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            起步包含&nbsp;<input type="text" oninput="checkIsGongLi(this)" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                            &nbsp;<input type="text" oninput="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                            <br/>
                        </div>
                    </div>
                    <div  style="border-top: 1px solid #e4e4e4;padding-top: 20px;margin-top: 20px;">
                        <div style="float: left;">
                            <label class="lab checked" onclick="checkedLable(this)" tag="shareSeatPriceSetting">拼座价格设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="exclusivePriceSettings">独享价格设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="onePriceSetting">一口价设置</label>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">里程费设置:</label>
                        <div class="col-sm-10">
                            超过起步里程后每公里&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                        <div style="float: left;width: 1200px;margin-left: 50px;">
                            <div class="shareSeatPriceSetting">
                                <h3 style="color: #377CCD;margin-bottom: 20px;">拼座价格设置</h3>
                                <div><label class="people" onclick="chooseCarpool(this, 1)" tag="1">1人</label><label onclick="chooseCarpool(this, 1)" tag="2">2人</label><label onclick="chooseCarpool(this, 1)" tag="3">3人</label></div>
                                <div><label class="carpool" onclick="chooseCarpool(this, 2)" tag="spell">拼成</label><label onclick="chooseCarpool(this, 2)" tag="notSpelled">未拼成</label></div>
                                <div>
                                    <div style="margin-top: 20px;">
                                        <div class="p1" >
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input  type="text" onblur="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">时长费设置:</label>
                        <div class="col-sm-10">
                            超过起步时长后每分钟&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input  type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">等待费设置:</label>
                        <div class="col-sm-10">
                            司机到达预约地点&nbsp;<input type="text" oninput="checkIsMinute(this)" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟过后开始收取等待费,
                            为&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元/分,不足一分钟按照一分钟计算
                            <br/>
                        </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input  type="text" onblur="checkIsYuan(this, 'p1')" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" maxlength="3" disabled onblur="checkIsGongLi(this, 'p1')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" maxlength="3" onblur="checkIsGongLi(this, 'p1')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input  type="text" onblur="checkIsYuan(this, 'p1')" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">远途费设置:</label>
                        <div class="col-sm-10">
                            总里程超过&nbsp;<input type="text" oninput="checkIsGongLi(this)" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                            不足&nbsp;<input type="text" oninput="checkIsGongLi(this)" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                            超出部分每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            超过&nbsp;<input type="text" disabled oninput="checkIsGongLi(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                            不足&nbsp;<input type="text" oninput="checkIsGongLi(this)" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                            超出部分每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                            <br>
                            超过&nbsp;<input type="text" disabled oninput="checkIsGongLi(this)" name="num14" id="num14" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                            超出部分每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                        <div class="col-sm-10">
                            <input type="text" name="num16" id="num16" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                            起步价变为&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            里程费为每公里&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            时长费为每分钟&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            远途费为每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num21" id="num21" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num22" id="num22" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="p2" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="p3" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="wp1" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="wp2" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="wp3" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="form-group">
                                        <label class="col-sm-2 control-label">计价说明:</label>
                                        <div class="col-sm-10">
                                            <textarea class="form-control" id="fareTypeNote1" name="fareTypeNote" style="height: 100px;"></textarea>
                                        </div>
                                    </div>
                                    <div class="form-group">
                                        <label class="col-sm-2 control-label">是否开启独享:</label>
                                        <div class="col-sm-7">
                                            <div class="form-group">
                                                <div class="col-sm-9">
                                                    <input type="checkbox" class="js-switch1" id="isOpen"/>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="exclusivePriceSettings" hidden>
                                <h3 style="color: #377CCD;margin-bottom: 20px;">独享价格设置</h3>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">起步价设置:</label>
                                    <div class="col-sm-10">
                                        起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                        &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">里程费设置:</label>
                                    <div class="col-sm-10">
                                        超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">时长费设置:</label>
                                    <div class="col-sm-10">
                                        超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">远途费设置:</label>
                                    <div class="col-sm-10">
                                        总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                        <br>
                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                    <div class="col-sm-10">
                                        <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                    <div class="col-sm-10">
                                        <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                        和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">计价说明:</label>
                                    <div class="col-sm-10">
                                        <textarea class="form-control" id="fareTypeNote2" name="fareTypeNote" style="height: 100px;"></textarea>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">是否开启独享:</label>
                                    <div class="col-sm-7">
                                        <div class="form-group">
                                            <div class="col-sm-9">
                                                <input type="checkbox" class="js-switch2" id="isOpenExclusive"/>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="onePriceSetting" hidden>
                                <h3 style="color: #377CCD;margin-bottom: 20px;">一口价设置</h3>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">起步价设置:</label>
                                    <div class="col-sm-10">
                                        起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                        &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">里程费设置:</label>
                                    <div class="col-sm-10">
                                        超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">时长费设置:</label>
                                    <div class="col-sm-10">
                                        超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">远途费设置:</label>
                                    <div class="col-sm-10">
                                        总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                        <br>
                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                    <div class="col-sm-10">
                                        <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                    <div class="col-sm-10">
                                        <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                        和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">超过预估里程设置:</label>
                                    <div class="col-sm-10">
                                        超过预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以内,按一口价计算
                                        <br>
                                        <br>
                                        超过预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以上,按实时计价计算
                                        <br>
                                        <br>
                                        低于预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num31" id="num31" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以上,按实时计价计算
                                        <br>
                                        <br>
                                        低于预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num32" id="num32" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以内,按一口价计算
                                        <br>
                                        <br>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">计价说明:</label>
                                    <div class="col-sm-10">
                                        <textarea class="form-control" id="fareTypeNote3" name="fareTypeNote" style="height: 100px;"></textarea>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">是否开启一口价:</label>
                                    <div class="col-sm-7">
                                        <div class="form-group">
                                            <div class="col-sm-9">
                                                <input type="checkbox" class="js-switch3" id="isOpenPrice"/>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">高峰期费用设置:</label>
                        <div class="col-sm-10">
                            <input type="text" name="num23" id="num23" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                            和&nbsp;&nbsp;<input type="text" name="num24" id="num24" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                            起步价变为&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            里程费为每公里&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            时长费为每分钟&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            远途费为每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>
@@ -828,152 +134,19 @@
<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice_info.js"></script>
<script type="text/javascript">
    laydate.render({
        elem: '.p1 #num14'
        elem: '#num16'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p1 #num21'
        elem: '#num23'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p1 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p2 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p2 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p2 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p3 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p3 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p3 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp1 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp1 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp1 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp2 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp2 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp2 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp3 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp3 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp3 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.exclusivePriceSettings #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.exclusivePriceSettings #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.exclusivePriceSettings #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.onePriceSetting #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.onePriceSetting #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.onePriceSetting #num22'
        elem: '#num24'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
@@ -985,26 +158,23 @@
        var num = $(obj).val();
        if(!regDouble.test(num)){
            layer.msg("【元】输入框不能超过3位数,保留两位小数");
            $(obj).val('');
        }
    }
    function checkIsGongLi(obj, clazz){
    function checkIsGongLi(obj){
        var num = $(obj).val();
        if(!regDouble.test(num)){
            layer.msg("【公里】输入框不能超过3位数,保留两位小数");
            $(obj).val('');
        }
        if (obj.id == "num7"){
            $("." + clazz + " #num9").val(num);
        }else if (obj.id == "num10"){
            $("." + clazz + " #num12").val(num);
        if (obj.id == "num9"){
            $("#num11").val(num);
        }else if (obj.id == "num12"){
            $("#num14").val(num);
        }
    }
    function checkIsMinute(obj){
        var num = $(obj).val();
        if(!regInt.test(num)){
            layer.msg("【分钟】输入框不能超过3位数");
            $(obj).val('');
        }
    }
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
@@ -3,812 +3,118 @@
    .newWidth, .single-line{
        max-width:150px !important;display: initial !important;
    }
    .lab{
        display: block;
        width: 150px;
        height: 45px;
        text-align: center;
        line-height: 45px;
        cursor: pointer;
        font-size: 16px;
        background-color: #F8F8F8;
        margin: 0;
    }
    .lab:hover{
        background-color: #F3F4F5;
    }
    .checked{
        background-color: #FFF !important;
        border-left: 10px solid #077CCB;
    }
    .shareSeatPriceSetting>div>label{
        text-align: center;
        height: 35px;
        line-height: 35px;
        width: 200px;
        border: 1px solid #E4E4E4;
    }
    .shareSeatPriceSetting .people, .shareSeatPriceSetting .carpool{
        text-align: center;
        border: 1px solid #377CCD;
        color: #377CCD;
    }
</style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="specialPriceInfoForm">
            <input type="hidden" id="id" value="${item.id}"/>
            <label style="display: none;" id="id">${item.id}</label>
            <div class="row">
                <div class="col-sm-11">
                <div class="col-sm-111">
                    <div class="form-group">
                        <label class="col-sm-2 control-label">选择车型:</label>
                        <div class="col-sm-10">
                            <select class="form-control" id="serverCarModelId" name="serverCarModelId"  style="width: 200px;">
                                <option value="">选择车型</option>
                                @for(obj in modelList!){
                                <option value="${obj.id}" ${item.serverCarModelId == obj.id ? 'selected' : ''}>${obj.name}</option>
                                <option value="${obj.id}" ${obj.id == item.serverCarModelId ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                        </div>
                    </div>
                    <div class="form-group waitFee">
                        <label class="col-sm-2 control-label">等待费设置:</label>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">运价类型说明:</label>
                        <div class="col-sm-10">
                            司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数" value="${content.num1}"/>&nbsp;分钟过后开始收取等待费,
                            为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数" value="${content.num2}"/>&nbsp;元/分,不足一分钟按照一分钟计算
                            <textarea class="form-control" id="fareTypeNote" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote}</textarea>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">起步价设置:</label>
                        <div class="col-sm-10">
                            起步价为&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" value="${json.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            起步包含&nbsp;<input type="text" oninput="checkIsGongLi(this)" name="num2" id="num2" value="${json.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                            &nbsp;<input type="text" oninput="checkIsMinute(this)" name="num3" id="num3" value="${json.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                            <br/>
                        </div>
                    </div>
                    <div  style="border-top: 1px solid #e4e4e4;padding-top: 20px;margin-top: 20px;">
                        <div style="float: left;">
                            <label class="lab checked" onclick="checkedLable(this)" tag="shareSeatPriceSetting">拼座价格设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="exclusivePriceSettings">独享价格设置</label>
                            <label class="lab" onclick="checkedLable(this)" tag="onePriceSetting">一口价设置</label>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">里程费设置:</label>
                        <div class="col-sm-10">
                            超过起步里程后每公里&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num4" id="num4" value="${json.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                        <div style="float: left;width: 1200px;margin-left: 50px;">
                            <div class="shareSeatPriceSetting">
                                <h3 style="color: #377CCD;margin-bottom: 20px;">拼座价格设置</h3>
                                <div><label class="people" onclick="chooseCarpool(this, 1)" tag="1">1人</label><label onclick="chooseCarpool(this, 1)" tag="2">2人</label><label onclick="chooseCarpool(this, 1)" tag="3">3人</label></div>
                                <div><label class="carpool" onclick="chooseCarpool(this, 2)" tag="spell">拼成</label><label onclick="chooseCarpool(this, 2)" tag="notSpelled">未拼成</label></div>
                                <div>
                                    <div style="margin-top: 20px;">
                                        <div class="p1" >
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" value="${contentPutOne.num1}" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num2" id="num2" class="form-control newWidth" value="${contentPutOne.num2}" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" value="${contentPutOne.num3}" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPutOne.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">时长费设置:</label>
                        <div class="col-sm-10">
                            超过起步时长后每分钟&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num5" id="num5" value="${json.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPutOne.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">等待费设置:</label>
                        <div class="col-sm-10">
                            司机到达预约地点&nbsp;<input type="text" oninput="checkIsMinute(this)" name="num6" id="num6" value="${json.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟过后开始收取等待费,
                            为&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num7" id="num7" value="${json.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元/分,不足一分钟按照一分钟计算
                            <br/>
                        </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num6" id="num6" value="${contentPutOne.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num7" id="num7" value="${contentPutOne.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num8" id="num8" value="${contentPutOne.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num9" id="num9" value="${contentPutOne.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p1')" name="num10" id="num10" value="${contentPutOne.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num11" id="num11" value="${contentPutOne.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num12" id="num12" value="${contentPutOne.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'p1')" name="num13" id="num13" value="${contentPutOne.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">远途费设置:</label>
                        <div class="col-sm-10">
                            总里程超过&nbsp;<input type="text" oninput="checkIsGongLi(this)" name="num8" id="num8" value="${json.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                            不足&nbsp;<input type="text" oninput="checkIsGongLi(this)" name="num9" id="num9" value="${json.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                            超出部分每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num10" id="num10" value="${json.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            超过&nbsp;<input type="text" disabled oninput="checkIsGongLi(this)" name="num11" id="num11" value="${json.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                            不足&nbsp;<input type="text" oninput="checkIsGongLi(this)" name="num12" id="num12" value="${json.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                            超出部分每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num13" value="${json.num13}" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                            <br>
                            超过&nbsp;<input type="text" disabled oninput="checkIsGongLi(this)" name="num14" id="num14" value="${json.num14}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                            超出部分每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num15" id="num15" value="${json.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" value="${contentPutOne.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPutOne.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPutOne.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPutOne.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPutOne.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPutOne.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPutOne.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                        <div class="col-sm-10">
                            <input type="text" name="num16" id="num16" value="${json.num16}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                            起步价变为&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num17" id="num17" value="${json.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            里程费为每公里&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num18" id="num18" value="${json.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            时长费为每分钟&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num19" id="num19" value="${json.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            远途费为每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num20" id="num20" value="${json.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num21" id="num21" value="${json.num21}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num22" id="num22" value="${json.num22}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" value="${contentPutOne.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentPutOne.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPutOne.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPutOne.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPutOne.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPutOne.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPutOne.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPutOne.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="p2" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentPutTwo.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num2" id="num2" value="${contentPutTwo.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentPutTwo.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPutTwo.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPutTwo.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num6" id="num6" value="${contentPutTwo.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num7" id="num7" value="${contentPutTwo.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentPutTwo.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num9" id="num9" value="${contentPutTwo.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p2')" name="num10" id="num10" value="${contentPutTwo.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentPutTwo.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num12" id="num12" value="${contentPutTwo.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentPutTwo.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" value="${contentPutTwo.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPutTwo.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPutTwo.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPutTwo.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPutTwo.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPutTwo.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPutTwo.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" value="${contentPutTwo.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentPutTwo.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPutTwo.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPutTwo.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPutTwo.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPutTwo.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPutTwo.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPutTwo.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="p3" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentPutThree.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num2" id="num2" value="${contentPutThree.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentPutThree.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPutThree.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPutThree.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num6" id="num6" value="${contentPutThree.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num7" id="num7" value="${contentPutThree.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentPutThree.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num9" id="num9" value="${contentPutThree.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'p3')" name="num10" id="num10" value="${contentPutThree.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentPutThree.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num12" id="num12" value="${contentPutThree.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentPutThree.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" value="${contentPutThree.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPutThree.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPutThree.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPutThree.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPutThree.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPutThree.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPutThree.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" value="${contentPutThree.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentPutThree.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPutThree.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPutThree.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPutThree.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPutThree.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPutThree.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPutThree.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="wp1" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentNotOne.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num2" id="num2" value="${contentNotOne.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentNotOne.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentNotOne.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentNotOne.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num6" id="num6" value="${contentNotOne.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num7" id="num7" value="${contentNotOne.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentNotOne.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num9" id="num9" value="${contentNotOne.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num10" id="num10" value="${contentNotOne.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentNotOne.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num12" id="num12" value="${contentNotOne.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentNotOne.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" value="${contentNotOne.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentNotOne.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentNotOne.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentNotOne.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentNotOne.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentNotOne.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentNotOne.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" value="${contentNotOne.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentNotOne.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentNotOne.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentNotOne.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentNotOne.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentNotOne.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentNotOne.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentNotOne.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="wp2" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentNotTwo.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num2" id="num2" value="${contentNotTwo.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentNotTwo.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentNotTwo.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentNotTwo.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num6" id="num6" value="${contentNotTwo.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num7" id="num7" value="${contentNotTwo.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentNotTwo.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num9" id="num9" value="${contentNotTwo.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num10" id="num10" value="${contentNotTwo.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentNotTwo.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num12" id="num12" value="${contentNotTwo.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentNotTwo.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" value="${contentNotTwo.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentNotTwo.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentNotTwo.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentNotTwo.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentNotTwo.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentNotTwo.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentNotTwo.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" value="${contentNotTwo.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentNotTwo.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentNotTwo.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentNotTwo.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentNotTwo.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentNotTwo.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentNotTwo.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentNotTwo.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="wp3" style="display: none;">
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">起步价设置:</label>
                                                <div class="col-sm-10">
                                                    起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentNotThree.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num2" id="num2" value="${contentNotThree.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentNotThree.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">里程费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentNotThree.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">时长费设置:</label>
                                                <div class="col-sm-10">
                                                    超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentNotThree.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">远途费设置:</label>
                                                <div class="col-sm-10">
                                                    总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num6" id="num6" value="${contentNotThree.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num7" id="num7" value="${contentNotThree.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentNotThree.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num9" id="num9" value="${contentNotThree.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                                    不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num10" id="num10" value="${contentNotThree.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentNotThree.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                    <br>
                                                    超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num12" id="num12" value="${contentNotThree.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                                    超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentNotThree.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num14" id="num14" value="${contentNotThree.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentNotThree.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentNotThree.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentNotThree.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentNotThree.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentNotThree.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentNotThree.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                            <div class="form-group">
                                                <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                                <div class="col-sm-10">
                                                    <input type="text" name="num21" id="num21" value="${contentNotThree.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                                    和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentNotThree.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                                    起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentNotThree.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentNotThree.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                                    时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentNotThree.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br>
                                                    <br>
                                                    远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentNotThree.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentNotThree.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                                    、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentNotThree.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                                    <br/>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="form-group">
                                        <label class="col-sm-2 control-label">计价说明:</label>
                                        <div class="col-sm-10">
                                            <textarea class="form-control" id="fareTypeNote1" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote1}</textarea>
                                        </div>
                                    </div>
                                    <div class="form-group">
                                        <label class="col-sm-2 control-label">是否开启拼车:</label>
                                        <div class="col-sm-7">
                                            <div class="form-group">
                                                <div class="col-sm-9">
                                                    <input type="checkbox" class="js-switch1" id="isOpen" ${item.isOpen == 1 ? 'checked=checked' : ''}/>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="exclusivePriceSettings" hidden>
                                <h3 style="color: #377CCD;margin-bottom: 20px;">独享价格设置</h3>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">起步价设置:</label>
                                    <div class="col-sm-10">
                                        起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentExclusive.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" value="${contentExclusive.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                        &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentExclusive.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">里程费设置:</label>
                                    <div class="col-sm-10">
                                        超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentExclusive.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">时长费设置:</label>
                                    <div class="col-sm-10">
                                        超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentExclusive.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">远途费设置:</label>
                                    <div class="col-sm-10">
                                        总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" value="${contentExclusive.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" value="${contentExclusive.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" value="${contentExclusive.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" value="${contentExclusive.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" value="${contentExclusive.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentExclusive.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                        <br>
                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" value="${contentExclusive.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentExclusive.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                    <div class="col-sm-10">
                                        <input type="text" name="num14" id="num14" value="${contentExclusive.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentExclusive.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentExclusive.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentExclusive.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentExclusive.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentExclusive.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentExclusive.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                    <div class="col-sm-10">
                                        <input type="text" name="num21" id="num21" value="${contentExclusive.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                        和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentExclusive.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentExclusive.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentExclusive.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentExclusive.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentExclusive.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentExclusive.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentExclusive.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">计价说明:</label>
                                    <div class="col-sm-10">
                                        <textarea class="form-control" id="fareTypeNote2" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote2}</textarea>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">是否开启独享:</label>
                                    <div class="col-sm-7">
                                        <div class="form-group">
                                            <div class="col-sm-9">
                                                <input type="checkbox" class="js-switch2" id="isOpenExclusive" ${item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="onePriceSetting" hidden>
                                <h3 style="color: #377CCD;margin-bottom: 20px;">一口价设置</h3>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">起步价设置:</label>
                                    <div class="col-sm-10">
                                        起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentPrice.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num2" id="num2" value="${contentPrice.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                        &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentPrice.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">里程费设置:</label>
                                    <div class="col-sm-10">
                                        超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPrice.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">时长费设置:</label>
                                    <div class="col-sm-10">
                                        超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPrice.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">远途费设置:</label>
                                    <div class="col-sm-10">
                                        总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num6" id="num6" value="${contentPrice.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num7" id="num7" value="${contentPrice.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentPrice.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num9" id="num9" value="${contentPrice.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                        不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num10" id="num10" value="${contentPrice.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentPrice.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                        <br>
                                        超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num12" id="num12" value="${contentPrice.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                        超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentPrice.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">夜间行驶费用设置:</label>
                                    <div class="col-sm-10">
                                        <input type="text" name="num14" id="num14" value="${contentPrice.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPrice.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPrice.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPrice.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPrice.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPrice.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPrice.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">高峰期费用设置:</label>
                                    <div class="col-sm-10">
                                        <input type="text" name="num21" id="num21" value="${contentPrice.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                        和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentPrice.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                        起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPrice.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPrice.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                        时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPrice.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br>
                                        <br>
                                        远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPrice.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPrice.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                        、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPrice.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                        <br/>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">超过预估里程设置:</label>
                                    <div class="col-sm-10">
                                        超过预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num29" id="num29" value="${contentPrice.num29}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以内,按一口价计算
                                        <br>
                                        <br>
                                        超过预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" value="${contentPrice.num30}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以上,按实时计价计算
                                        <br>
                                        <br>
                                        低于预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num31" id="num31" value="${contentPrice.num31}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以上,按实时计价计算
                                        <br>
                                        <br>
                                        低于预估里程&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num32" id="num32" value="${contentPrice.num32}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以内,按一口价计算
                                        <br>
                                        <br>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">计价说明:</label>
                                    <div class="col-sm-10">
                                        <textarea class="form-control" id="fareTypeNote3" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote3}</textarea>
                                    </div>
                                </div>
                                <div class="form-group">
                                    <label class="col-sm-2 control-label">是否开启一口价:</label>
                                    <div class="col-sm-7">
                                        <div class="form-group">
                                            <div class="col-sm-9">
                                                <input type="checkbox" class="js-switch3" id="isOpenPrice" ${item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">高峰期费用设置:</label>
                        <div class="col-sm-10">
                            <input type="text" name="num23" id="num23" value="${json.num23}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                            和&nbsp;&nbsp;<input type="text" name="num24" id="num24" value="${json.num24}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                            起步价变为&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num25" id="num25" value="${json.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            里程费为每公里&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num26" id="num26" value="${json.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            时长费为每分钟&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num27" id="num27" value="${json.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            远途费为每公里加收&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num28" id="num28" value="${json.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num29" id="num29" value="${json.num29}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" oninput="checkIsYuan(this)" name="num30" id="num30" value="${json.num30}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>
@@ -828,152 +134,19 @@
<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice_info.js"></script>
<script type="text/javascript">
    laydate.render({
        elem: '.p1 #num14'
        elem: '#num16'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p1 #num21'
        elem: '#num23'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p1 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p2 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p2 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p2 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p3 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p3 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p3 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp1 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp1 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp1 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp2 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp2 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp2 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp3 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp3 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp3 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.exclusivePriceSettings #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.exclusivePriceSettings #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.exclusivePriceSettings #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.onePriceSetting #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.onePriceSetting #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.onePriceSetting #num22'
        elem: '#num24'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
@@ -985,26 +158,23 @@
        var num = $(obj).val();
        if(!regDouble.test(num)){
            layer.msg("【元】输入框不能超过3位数,保留两位小数");
            $(obj).val('');
        }
    }
    function checkIsGongLi(obj, clazz){
    function checkIsGongLi(obj){
        var num = $(obj).val();
        if(!regDouble.test(num)){
            layer.msg("【公里】输入框不能超过3位数,保留两位小数");
            $(obj).val('');
        }
        if (obj.id == "num7"){
            $("." + clazz + " #num9").val(num);
        }else if (obj.id == "num10"){
            $("." + clazz + " #num12").val(num);
        if (obj.id == "num9"){
            $("#num11").val(num);
        }else if (obj.id == "num12"){
            $("#num14").val(num);
        }
    }
    function checkIsMinute(obj){
        var num = $(obj).val();
        if(!regInt.test(num)){
            layer.msg("【分钟】输入框不能超过3位数");
            $(obj).val('');
        }
    }
Diff truncated after the above file
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCard.html (deleted) ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCardAudit.html (deleted) ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCardAudit_detail.html (deleted) ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCardPayment.html (deleted) ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCardPayment_detail.html (deleted) ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCard_add.html (deleted) ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCard_edit.html (deleted) ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/timeOutAppeal/timeOutAppeal.html (deleted) ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/css/bootstrap-select.css (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/css/bootstrap-select.css.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/css/bootstrap-select.min.css (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/bootstrap-select.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/bootstrap-select.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/bootstrap-select.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/bootstrap-select.min.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-am_ET.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-am_ET.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-am_ET.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ar_AR.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ar_AR.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ar_AR.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-bg_BG.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-bg_BG.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-bg_BG.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-cs_CZ.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-cs_CZ.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-cs_CZ.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-da_DK.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-da_DK.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-da_DK.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-de_DE.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-de_DE.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-de_DE.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-en_US.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-en_US.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-en_US.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_CL.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_CL.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_CL.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_ES.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_ES.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-es_ES.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-et_EE.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-et_EE.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-et_EE.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-eu.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-eu.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-eu.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fa_IR.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fa_IR.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fa_IR.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fi_FI.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fi_FI.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fi_FI.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fr_FR.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fr_FR.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-fr_FR.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hr_HR.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hr_HR.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hr_HR.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hu_HU.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hu_HU.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-hu_HU.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-id_ID.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-id_ID.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-id_ID.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-it_IT.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-it_IT.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-it_IT.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ja_JP.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ja_JP.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ja_JP.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-kh_KM.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-kh_KM.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-kh_KM.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ko_KR.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ko_KR.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ko_KR.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lt_LT.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lt_LT.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lt_LT.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lv_LV.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lv_LV.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-lv_LV.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nb_NO.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nb_NO.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nb_NO.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nl_NL.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nl_NL.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-nl_NL.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pl_PL.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pl_PL.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pl_PL.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_BR.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_BR.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_BR.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_PT.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_PT.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-pt_PT.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ro_RO.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ro_RO.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ro_RO.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ru_RU.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ru_RU.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ru_RU.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sk_SK.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sk_SK.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sk_SK.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sl_SI.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sl_SI.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sl_SI.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sv_SE.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sv_SE.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-sv_SE.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-tr_TR.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-tr_TR.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-tr_TR.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ua_UA.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ua_UA.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-ua_UA.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-vi_VN.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-vi_VN.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-vi_VN.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_CN.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_CN.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_CN.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_TW.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_TW.js.map (deleted) ManagementTravel/guns-admin/src/main/webapp/static/bootstrap-select-1.13.0/js/i18n/defaults-zh_TW.min.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/aes.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/cipher-core.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/core.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/crypto-js.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-base64.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-base64url.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-hex.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-latin1.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-utf16.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/enc-utf8.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/evpkdf.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/format-hex.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/format-openssl.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-md5.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-ripemd160.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha1.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha224.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha256.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha3.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha384.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac-sha512.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/hmac.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/index.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/lib-typedarrays.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/md5.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-cfb.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-ctr-gladman.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-ctr.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-ecb.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/mode-ofb.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-ansix923.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-iso10126.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-iso97971.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-nopadding.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-pkcs7.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pad-zeropadding.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/pbkdf2.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/rabbit-legacy.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/rabbit.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/rc4.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/ripemd160.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha1.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha224.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha256.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha3.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha384.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/sha512.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/tripledes.js ManagementTravel/guns-admin/src/main/webapp/static/crypto-js/x64-core.js ManagementTravel/guns-admin/src/main/webapp/static/home.js ManagementTravel/guns-admin/src/main/webapp/static/img/icon100.png ManagementTravel/guns-admin/src/main/webapp/static/img/login.png (deleted) ManagementTravel/guns-admin/src/main/webapp/static/js/common/bootstrap-table-object.js ManagementTravel/guns-admin/src/main/webapp/static/js/md5.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airLine/airLine.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airLine/airLine_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airSite/airSite.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airSite/airSite_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/airSite/electricFence.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/carRental/auditCarRental.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/carRental/auditCarRental_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/carRental/carRental.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/carRental/carRental_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/driverActivityHistory/driverActivityHistory.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/complaintDeductmoney.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/order.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/otherOtherIncomeDetail.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/summaryOfIncomeDetails.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/summaryOfSpendingDetails.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/taxiCardPayment.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/incomeDetail/timeOut.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/activityExamine_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/merchantActivity.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/merchantActivityExamine.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/merchantActivity_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/merchantCoupon.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivity/receivingRecord.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/merchantActivityGive.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/merchantActivityGive_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/merchantCoupon.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/receivingRecord.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantActivityGive/userInfo.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantCoupon/merchandiseCoupon.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantCoupon/merchantCoupon.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/merchantCoupon/merchantCoupon_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/paymentRecord/balanceModify.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/paymentRecord/paymentRecord.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/recruit/recruit.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/recruit/recruit_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/balanceModify.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/companyIncome.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/complaintDeductmoney.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/order.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/tCompany.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/tDriver.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/tPubWithdrawal.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/tUser.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/report/taxiCardPayment.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sellingCar/auditSellingCar.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sellingCar/auditSellingCar_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sellingCar/sellingCar.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sellingCar/sellingCar_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/hasCollectOrderDetail.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/noCollectOrderDetail.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/orderRevenueDetails.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/orderWithdrawalDetail.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/orderWithdrawalDetails.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/otherSpendingDetail.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/rewardDetails.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/rewardEarningDetail.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/rewardWithdrawalDetail.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/spendingDetailPlatform/rewardWithdrawalDetails.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tAdditionalFee/tAdditionalFee.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tComplaint/tComplaint.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/deductmoney.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tComplaint.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tFeedback/tFeedback.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tFeedback/userFeedback.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tMerchant/tMerchant.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tMerchant/tMerchantAudit.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tMerchant/tMerchant_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOfflineTravelPayment/tOfflineTravelPayment.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOfflineTravelPayment/tOfflineTravelPayment_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tProblem/tProblem.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectTaxiDriver.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tCross.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/taxi.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/charter.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/charter_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCard.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCardAudit.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCardPayment.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCard_info.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tVerified/tVerified.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/timeOutAppeal/timeOutAppeal.js (deleted) ManagementTravel/guns-admin/src/main/webapp/static/modular/system/user/user_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js ManagementTravel/guns-admin/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js