UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1118,10 +1118,12 @@ } Map<String, Object> map = new HashMap<>(); Double payMoney = 0D; Integer companyId = null; switch (orderType){ case 1: map = orderPrivateCarService.queryBalance(orderId, uid); OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId); companyId = orderPrivateCar.getCompanyId(); payMoney = orderPrivateCar.getOrderMoney(); UserActivityDiscount1 query = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId()); if(null != query){ @@ -1147,6 +1149,7 @@ case 4: map = orderLogisticsService.queryBalance(orderId, uid); OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId); companyId = orderLogistics.getCompanyId(); payMoney = orderLogistics.getOrderMoney(); UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderLogistics.getCompanyId()); if(null != query2){ @@ -1166,7 +1169,12 @@ // map = orderLogisticsService.queryBalance(orderId, uid); // break; } Double aDouble = userRedPacketRecordService.queryRemainingAmount(uid); List<UserRedPacketRecord> userRedPacketRecords = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>() .eq("companyId", companyId).eq("state", 1).eq("userId", uid)); Double aDouble = 0D; if(userRedPacketRecords.size() > 0){ aDouble = userRedPacketRecords.stream().mapToDouble(UserRedPacketRecord::getRemainingAmount).sum(); } map.put("redTotal", aDouble); RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings(); if(null == redEnvelopePaymentSettings){ UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1142,10 +1142,9 @@ if(null != redDeduction && 1 == redDeduction && null == orderLogistics.getRedPacketId()){ RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings(); if(null != redEnvelopePaymentSettings){ Double total = userRedPacketRecordService.queryRemainingAmount(uid); List<UserRedPacketRecord> userRedPacketRecords = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>().eq("userId", uid) .eq("state", 1).eq("companyId", orderLogistics.getCompanyId()).gt("remainingAmount", 0).orderBy("insertTime", false)); Double total = userRedPacketRecords.stream().mapToDouble(UserRedPacketRecord::getRemainingAmount).sum(); BigDecimal deductionRatio = redEnvelopePaymentSettings.getDeductionRatio(); BigDecimal multiply1 = orderMoney.multiply(deductionRatio.divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_EVEN); if(total > 0 && multiply1.doubleValue() > 0 && total.compareTo(multiply1.doubleValue()) >= 0){ @@ -1358,6 +1357,9 @@ if(null != orderLogistics.getDriverId()){ aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId()); } Double aDouble1 = new BigDecimal(orderLogistics.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); Long serviceTime = new BigDecimal(orderLogistics.getEndServiceTime().getTime() - orderLogistics.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue(); if(1 == finalLanguage1){ document.getElementById("english").remove(); document.getElementById("french").remove(); @@ -1458,6 +1460,8 @@ cp_chinese.text("车牌：" + car.getCarLicensePlate()); Element pf_chinese = document.getElementById("pf_chinese"); pf_chinese.text("司机评分：" + aDouble); Element lc_chinese = document.getElementById("lc_chinese"); lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟"); Element start_address_chinese = document.getElementById("start_address_chinese"); start_address_chinese.text(orderLogistics.getStartAddress()); Element end_address_chinese = document.getElementById("end_address_chinese"); @@ -1566,6 +1570,8 @@ cp_english.text("Number Plate：" + car.getCarLicensePlate()); Element pf_english = document.getElementById("pf_english"); pf_english.text("Driver Rating：" + aDouble); Element lc_english = document.getElementById("lc_english"); lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes"); Element start_address_english = document.getElementById("start_address_english"); start_address_english.text(orderLogistics.getStartAddress()); Element end_address_english = document.getElementById("end_address_english"); @@ -1674,6 +1680,8 @@ cp_french.text("Plaque: GS " + car.getCarLicensePlate()); Element pf_french = document.getElementById("pf_french"); pf_french.text("Note du chauffeur: " + aDouble); Element lc_french = document.getElementById("lc_french"); lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes"); Element start_address_french = document.getElementById("start_address_french"); start_address_french.text(orderLogistics.getStartAddress()); Element end_address_french = document.getElementById("end_address_french"); @@ -1995,6 +2003,8 @@ if(null != orderLogistics.getDriverId()){ aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId()); } Double aDouble1 = new BigDecimal(orderLogistics.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); Long serviceTime = new BigDecimal(orderLogistics.getEndServiceTime().getTime() - orderLogistics.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue(); if(1 == finalLanguage){ document.getElementById("english").remove(); document.getElementById("french").remove(); @@ -2095,6 +2105,8 @@ cp_chinese.text("车牌：" + car.getCarLicensePlate()); Element pf_chinese = document.getElementById("pf_chinese"); pf_chinese.text("司机评分：" + aDouble); Element lc_chinese = document.getElementById("lc_chinese"); lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟"); Element start_address_chinese = document.getElementById("start_address_chinese"); start_address_chinese.text(orderLogistics.getStartAddress()); Element end_address_chinese = document.getElementById("end_address_chinese"); @@ -2203,6 +2215,8 @@ cp_english.text("Number Plate：" + car.getCarLicensePlate()); Element pf_english = document.getElementById("pf_english"); pf_english.text("Driver Rating：" + aDouble); Element lc_english = document.getElementById("lc_english"); lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes"); Element start_address_english = document.getElementById("start_address_english"); start_address_english.text(orderLogistics.getStartAddress()); Element end_address_english = document.getElementById("end_address_english"); @@ -2311,6 +2325,8 @@ cp_french.text("Plaque: GS " + car.getCarLicensePlate()); Element pf_french = document.getElementById("pf_french"); pf_french.text("Note du chauffeur: " + aDouble); Element lc_french = document.getElementById("lc_french"); lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes"); Element start_address_french = document.getElementById("start_address_french"); start_address_french.text(orderLogistics.getStartAddress()); Element end_address_french = document.getElementById("end_address_french"); @@ -2643,6 +2659,8 @@ if(null != orderLogistics.getDriverId()){ aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId()); } Double aDouble1 = new BigDecimal(orderLogistics.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); Long serviceTime = new BigDecimal(orderLogistics.getEndServiceTime().getTime() - orderLogistics.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue(); if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); @@ -2743,6 +2761,8 @@ cp_chinese.text("车牌：" + car.getCarLicensePlate()); Element pf_chinese = document.getElementById("pf_chinese"); pf_chinese.text("司机评分：" + aDouble); Element lc_chinese = document.getElementById("lc_chinese"); lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟"); Element start_address_chinese = document.getElementById("start_address_chinese"); start_address_chinese.text(orderLogistics.getStartAddress()); Element end_address_chinese = document.getElementById("end_address_chinese"); @@ -2851,6 +2871,8 @@ cp_english.text("Number Plate：" + car.getCarLicensePlate()); Element pf_english = document.getElementById("pf_english"); pf_english.text("Driver Rating：" + aDouble); Element lc_english = document.getElementById("lc_english"); lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes"); Element start_address_english = document.getElementById("start_address_english"); start_address_english.text(orderLogistics.getStartAddress()); Element end_address_english = document.getElementById("end_address_english"); @@ -2959,6 +2981,8 @@ cp_french.text("Plaque: GS " + car.getCarLicensePlate()); Element pf_french = document.getElementById("pf_french"); pf_french.text("Note du chauffeur: " + aDouble); Element lc_french = document.getElementById("lc_french"); lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes"); Element start_address_french = document.getElementById("start_address_french"); start_address_french.text(orderLogistics.getStartAddress()); Element end_address_french = document.getElementById("end_address_french"); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -1530,6 +1530,7 @@ aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId()); } Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); Long serviceTime = new BigDecimal(orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue(); if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); @@ -1624,7 +1625,7 @@ Element pf_chinese = document.getElementById("pf_chinese"); pf_chinese.text("司机评分：" + aDouble); Element lc_chinese = document.getElementById("lc_chinese"); lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟"); lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟"); Element start_time_chinese = document.getElementById("start_time_chinese"); start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime())); Element start_address_chinese = document.getElementById("start_address_chinese"); @@ -1731,7 +1732,7 @@ Element pf_english = document.getElementById("pf_english"); pf_english.text("Driver Rating：" + aDouble); Element lc_english = document.getElementById("lc_english"); lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes"); lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes"); Element start_time_english = document.getElementById("start_time_english"); start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime())); Element start_address_english = document.getElementById("start_address_english"); @@ -1838,7 +1839,7 @@ Element pf_french = document.getElementById("pf_french"); pf_french.text("Note du chauffeur: " + aDouble); Element lc_french = document.getElementById("lc_french"); lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes"); lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes"); Element start_time_french = document.getElementById("start_time_french"); start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime())); Element start_address_french = document.getElementById("start_address_french"); @@ -2120,6 +2121,7 @@ aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId()); } Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); Long serviceTime = new BigDecimal(orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue(); Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); if(1 == language){ document.getElementById("english").remove(); @@ -2215,7 +2217,7 @@ Element pf_chinese = document.getElementById("pf_chinese"); pf_chinese.text("司机评分：" + aDouble); Element lc_chinese = document.getElementById("lc_chinese"); lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟"); lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟"); Element start_time_chinese = document.getElementById("start_time_chinese"); start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime())); Element start_address_chinese = document.getElementById("start_address_chinese"); @@ -2322,7 +2324,7 @@ Element pf_english = document.getElementById("pf_english"); pf_english.text("Driver Rating：" + aDouble); Element lc_english = document.getElementById("lc_english"); lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes"); lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes"); Element start_time_english = document.getElementById("start_time_english"); start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime())); Element start_address_english = document.getElementById("start_address_english"); @@ -2429,7 +2431,7 @@ Element pf_french = document.getElementById("pf_french"); pf_french.text("Note du chauffeur: " + aDouble); Element lc_french = document.getElementById("lc_french"); lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes"); lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes"); Element start_time_french = document.getElementById("start_time_french"); start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime())); Element start_address_french = document.getElementById("start_address_french"); @@ -2852,6 +2854,7 @@ aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId()); } Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); Long serviceTime = new BigDecimal(orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue(); if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); @@ -2946,7 +2949,7 @@ Element pf_chinese = document.getElementById("pf_chinese"); pf_chinese.text("司机评分：" + aDouble); Element lc_chinese = document.getElementById("lc_chinese"); lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟"); lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟"); Element start_time_chinese = document.getElementById("start_time_chinese"); start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime())); Element start_address_chinese = document.getElementById("start_address_chinese"); @@ -3053,7 +3056,7 @@ Element pf_english = document.getElementById("pf_english"); pf_english.text("Driver Rating：" + aDouble); Element lc_english = document.getElementById("lc_english"); lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes"); lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes"); Element start_time_english = document.getElementById("start_time_english"); start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime())); Element start_address_english = document.getElementById("start_address_english"); @@ -3160,7 +3163,7 @@ Element pf_french = document.getElementById("pf_french"); pf_french.text("Note du chauffeur: " + aDouble); Element lc_french = document.getElementById("lc_french"); lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes"); lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes"); Element start_time_french = document.getElementById("start_time_french"); start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime())); Element start_address_french = document.getElementById("start_address_french"); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -68,17 +68,38 @@ String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ if(s.equals(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ if(s.equals(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ if(s.equals(frenchName)){ collect.add(city1.getId()); break; } } } if(collect.size() == 0){ for (City city1 : cities1) { String chineseName = city1.getChineseName(); String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ collect.add(city1.getId()); break; } } } } @@ -99,17 +120,38 @@ String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ if(s.equals(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ if(s.equals(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ if(s.equals(frenchName)){ collect.add(city1.getId()); break; } } } if(collect.size() == 0){ for (City city1 : cities1) { String chineseName = city1.getChineseName(); String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ collect.add(city1.getId()); break; } } } } @@ -137,20 +179,41 @@ String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ if(s.equals(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ if(s.equals(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ if(s.equals(frenchName)){ collect.add(city1.getId()); break; } } } if(collect.size() == 0){ for (City city1 : cities1) { String chineseName = city1.getChineseName(); String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ collect.add(city1.getId()); break; } } } } List<Company> query = companyMapper.queryList1(collect, 3); if(query.size() == 0){ query = companyMapper.queryList1(collect, 2); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
New file @@ -0,0 +1,72 @@ package com.stylefeng.guns.modular.system.util; import com.stylefeng.guns.core.util.ToolUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import java.util.concurrent.TimeUnit; /** * Redis工具类 */ @Component public class RedisUtil { @Autowired private RedisTemplate redisTemplate; /** * 向redis中存储字符串没有过期时间 * @param key * @param value */ public void setStrValue(String key, String value){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){ redisTemplate.opsForValue().set(key, value); } } /** * 以分钟为单位设置存储值（设置过期时间） * @param key * @param value * @param time 秒 */ public void setStrValue(String key, String value, int time){ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){ redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); } } /** * 从redis中获取值 * @param key * @return */ public String getValue(String key){ if(ToolUtil.isNotEmpty(key)){ String data = (String) redisTemplate.opsForValue().get(key); return data; } return null; } /** * 删除key * @param key */ public void remove(String key){ if(ToolUtil.isNotEmpty(key)){ redisTemplate.delete(key); } } } UserIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -52,9 +52,9 @@ spring: datasource: url: jdbc:mysql://172.16.0.4:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 username: i-go password: HjKbXilb9zajmXbl url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 username: root password: _6)S]<vpfvj?N#t2 db-name: guns #用来搜集数据库的所有表 filters: wall,mergeStat
