DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
@@ -79,7 +79,7 @@ querySettlementAmount.setAmount(new BigDecimal(sum).add(new BigDecimal(sum1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue()); List<Integer> collect = settlementRecords.stream().map(SettlementRecord::getId).collect(Collectors.toList()); Wrapper<SettlementDetail> wrapper = new EntityWrapper<SettlementDetail>(); Wrapper<SettlementDetail> wrapper = new EntityWrapper<SettlementDetail>().eq("driverId", driverId); if(collect.size() > 0){ wrapper.in("settlementRecordId", collect).or().isNull("settlementRecordId"); }else{ ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -206,7 +206,7 @@ orderPrivateCar.setOrderMoney(money); orderPrivateCar.setPayMoney(money); orderPrivateCar.setState(7); orderPrivateCar.setIsDispute(1); orderPrivateCar.setIsDispute(3); orderPrivateCar.updateById(); return SUCCESS_TIP; } ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
@@ -6,7 +6,9 @@ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TServerCarmodel"> <id column="id" property="id" /> <result column="type" property="type" /> <result column="name" property="name" /> <result column="chineseName" property="chineseName" /> <result column="englishName" property="englishName" /> <result column="frenchName" property="frenchName" /> <result column="img" property="img" /> <result column="state" property="state" /> <result column="insertTime" property="insertTime" /> @@ -14,7 +16,7 @@ <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id, type, name, img, state, insertTime id, type, chineseName, englishName, frenchName, img, state, insertTime </sql> <!--根据条件查询服务车型列表--> @@ -22,7 +24,7 @@ SELECT * FROM t_server_carmodel as o <where> <if test="name != null and name != ''"> and o.name LIKE CONCAT('%',#{name},'%') and o.chineseName LIKE CONCAT('%',#{name},'%') or o.englishName LIKE CONCAT('%',#{name},'%') or o.frenchName LIKE CONCAT('%',#{name},'%') </if> <if test="state != null and state != ''"> and o.state = #{state} ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js
@@ -28,8 +28,8 @@ {title: '车型名称（中文）', field: 'chineseName', visible: true, align: 'center', valign: 'middle', formatter: function (value, row) { var btn = ""; if(row.name != '' && row.name != null) { btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>'] if(row.chineseName != '' && row.chineseName != null) { btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.chineseName + '" onfocus="TUser.tooltip()">' + row.chineseName + '</p>'] } return btn; } @@ -37,8 +37,8 @@ {title: '车型名称（英文）', field: 'englishName', visible: true, align: 'center', valign: 'middle', formatter: function (value, row) { var btn = ""; if(row.name != '' && row.name != null) { btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>'] if(row.englishName != '' && row.englishName != null) { btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.englishName + '" onfocus="TUser.tooltip()">' + row.englishName + '</p>'] } return btn; } @@ -46,8 +46,8 @@ {title: '车型名称（法文）', field: 'frenchName', visible: true, align: 'center', valign: 'middle', formatter: function (value, row) { var btn = ""; if(row.name != '' && row.name != null) { btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>'] if(row.frenchName != '' && row.frenchName != null) { btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.frenchName + '" onfocus="TUser.tooltip()">' + row.frenchName + '</p>'] } return btn; } ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js
@@ -79,7 +79,9 @@ this .set('id') .set('type') .set('name') .set('chineseName') .set('englishName') .set('frenchName') .set('img') .set('state') .set('insertTime'); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1284,7 +1284,7 @@ if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("I-GO电子收据"); document.getElementsByTag("title").get(0).text("包裹收据"); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney()); Element qbj_chinese = document.getElementById("qbj_chinese"); @@ -1392,7 +1392,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Receipt"); document.getElementsByTag("title").get(0).text("Delivery receipt"); Element title_english = document.getElementById("title_english"); title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip "); Element qbj_english = document.getElementById("qbj_english"); @@ -1500,7 +1500,7 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Reçu"); document.getElementsByTag("title").get(0).text("Reçu de livraison"); Element title_french = document.getElementById("title_french"); title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO "); Element qbj_french = document.getElementById("qbj_french"); @@ -1606,7 +1606,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -1643,7 +1643,7 @@ tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); tEmail.setType(1); tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu"); tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison"); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; @@ -1820,7 +1820,7 @@ if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("I-GO电子收据"); document.getElementsByTag("title").get(0).text("包裹收据"); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney()); Element qbj_chinese = document.getElementById("qbj_chinese"); @@ -1928,7 +1928,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Receipt"); document.getElementsByTag("title").get(0).text("Delivery receipt"); Element title_english = document.getElementById("title_english"); title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip "); Element qbj_english = document.getElementById("qbj_english"); @@ -2036,7 +2036,7 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Reçu"); document.getElementsByTag("title").get(0).text("Reçu de livraison"); Element title_french = document.getElementById("title_french"); title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO "); Element qbj_french = document.getElementById("qbj_french"); @@ -2142,7 +2142,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -2179,7 +2179,7 @@ tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); tEmail.setType(1); tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu"); tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison"); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; @@ -2455,7 +2455,7 @@ if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("I-GO电子收据"); document.getElementsByTag("title").get(0).text("包裹收据"); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney()); Element qbj_chinese = document.getElementById("qbj_chinese"); @@ -2563,7 +2563,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Receipt"); document.getElementsByTag("title").get(0).text("Delivery receipt"); Element title_english = document.getElementById("title_english"); title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip "); Element qbj_english = document.getElementById("qbj_english"); @@ -2671,7 +2671,7 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Reçu"); document.getElementsByTag("title").get(0).text("Reçu de livraison"); Element title_french = document.getElementById("title_french"); title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO "); Element qbj_french = document.getElementById("qbj_french"); @@ -2777,7 +2777,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -2814,7 +2814,7 @@ tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); tEmail.setType(1); tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu"); tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison"); tEmail.setOrderId(id); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -1440,7 +1440,7 @@ if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("I-GO电子收据"); document.getElementsByTag("title").get(0).text("打车收据"); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); Element qbj_chinese = document.getElementById("qbj_chinese"); @@ -1547,7 +1547,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Receipt"); document.getElementsByTag("title").get(0).text("Ride receipt"); Element title_english = document.getElementById("title_english"); title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip "); Element qbj_english = document.getElementById("qbj_english"); @@ -1654,7 +1654,7 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Reçu"); document.getElementsByTag("title").get(0).text("Reçu de course"); Element title_french = document.getElementById("title_french"); title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage"); Element qbj_french = document.getElementById("qbj_french"); @@ -1758,7 +1758,7 @@ Element server_tel_french = document.getElementById("server_tel_french"); server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -1794,7 +1794,7 @@ TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu"); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course"); tEmail.setType(1); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); @@ -1976,7 +1976,7 @@ if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("I-GO电子收据"); document.getElementsByTag("title").get(0).text("打车收据"); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); Element qbj_chinese = document.getElementById("qbj_chinese"); @@ -2083,7 +2083,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Receipt"); document.getElementsByTag("title").get(0).text("Ride receipt"); Element title_english = document.getElementById("title_english"); title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip "); Element qbj_english = document.getElementById("qbj_english"); @@ -2190,7 +2190,7 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Reçu"); document.getElementsByTag("title").get(0).text("Reçu de course"); Element title_french = document.getElementById("title_french"); title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage"); Element qbj_french = document.getElementById("qbj_french"); @@ -2295,7 +2295,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -2330,7 +2330,7 @@ TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu"); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course"); tEmail.setType(1); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); @@ -2670,7 +2670,7 @@ if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("I-GO电子收据"); document.getElementsByTag("title").get(0).text("打车收据"); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); Element qbj_chinese = document.getElementById("qbj_chinese"); @@ -2777,7 +2777,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Receipt"); document.getElementsByTag("title").get(0).text("Ride receipt"); Element title_english = document.getElementById("title_english"); title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip "); Element qbj_english = document.getElementById("qbj_english"); @@ -2884,7 +2884,7 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Reçu"); document.getElementsByTag("title").get(0).text("Reçu de course"); Element title_french = document.getElementById("title_french"); title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage"); Element qbj_french = document.getElementById("qbj_french"); @@ -2989,7 +2989,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -3025,7 +3025,7 @@ String link ="http://182.160.16.251:81/files/html/ride_receipt_" + id + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu"); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course"); tEmail.setUserId(userInfo.getId()); tEmail.setType(1); tEmail.setOrderId(id); UserIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -1,5 +1,7 @@ server: port: 8006 tomcat: basedir: /usr/local/server/location guns: swagger-open: true #是否开启swagger (true/false) ZuulIGOTravel/src/main/resources/application.yml
@@ -3,6 +3,10 @@ spring: application: name: zuul-gateway #服务名称 servlet: multipart: max-file-size: 100MB max-request-size: 100MB eureka: client:
