UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -237,7 +237,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Verification email"); document.getElementsByTag("title").get(0).text("Verification code"); Element user_chinese = document.getElementById("user_english"); user_chinese.text("Hello " + nickName + ","); Element content_english = document.getElementById("content_english"); @@ -246,13 +246,13 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Courriel de vérification"); document.getElementsByTag("title").get(0).text("Code de validation"); Element user_french = document.getElementById("user_french"); user_french.text("Bonjour " + nickName + ","); Element content_french = document.getElementById("content_french"); content_french.text(authCode); } EmailUtil.send(email, language == 1 ? "邮箱验证" : language == 2 ? "Verification mailbox" : "Courriel de vérification", document.html()); EmailUtil.send(email, language == 1 ? "邮箱验证" : language == 2 ? "Verification code" : "Code de validation", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -268,24 +268,13 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/mainbox_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/mainbox_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "邮箱验证" : language == 2 ? "Verification email" : "Courriel de vérification"); tEmail.setName(language == 1 ? "邮箱验证" : language == 2 ? "Verification code" : "Code de validation"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; tEmail.setWeek(EmailUtil.getWeek(language,i)); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -827,8 +827,19 @@ UserInfo userInfo = userInfoService.selectById(uid); map.put("balance", userInfo.getBalance()); OrderPrivateCar orderPrivateCar = this.selectById(orderId); int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney()); i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney()); UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId()); double v = orderPrivateCar.getOrderMoney(); if(null != query2){ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())")); if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){ Double special = query2.getSpecial(); orderPrivateCar.setDiscount(special); Double orderMoney = orderPrivateCar.getOrderMoney(); v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); } } int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, v); i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, v); map.put("coupon", i); return map; } @@ -836,8 +847,19 @@ @Override public List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception { OrderPrivateCar orderPrivateCar = this.selectById(orderId); List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney(), pageNum, size); List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney(), pageNum, size); UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId()); double v = orderPrivateCar.getOrderMoney(); if(null != query2){ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())")); if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){ Double special = query2.getSpecial(); orderPrivateCar.setDiscount(special); Double orderMoney = orderPrivateCar.getOrderMoney(); v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); } } List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 1, v, pageNum, size); List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 0, v, pageNum, size); list.addAll(list1); return list; } @@ -860,6 +882,22 @@ ResultUtil resultUtil = ResultUtil.success(""); orderPrivateCar.setCouponMoney(0D);//初始化历史数据 orderPrivateCar.setCouponId(null); //计算折扣 UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId()); if(null != query2){ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())")); if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){ Double special = query2.getSpecial(); orderPrivateCar.setDiscount(special); double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); if(orderMoney.compareTo(v) > 0){ orderPrivateCar.setDiscountMoney(orderMoney - v); orderPrivateCar.setActivityId(query2.getId()); orderMoney = v; } } } //计算优惠券 UserCouponRecord userCouponRecord = null; @@ -892,22 +930,6 @@ orderMoney = orderMoney - query.getMoney(); orderPrivateCar.setRedPacketMoney(query.getMoney()); orderPrivateCar.setRedPacketId(query.getId()); } //计算折扣 UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId()); if(null != query2){ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())")); if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){ Double special = query2.getSpecial(); orderPrivateCar.setDiscount(special); double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); if(orderMoney.compareTo(v) > 0){ orderPrivateCar.setDiscountMoney(orderMoney - v); orderPrivateCar.setActivityId(query2.getId()); orderMoney = v; } } } if(payType == 1){//手机支付 @@ -1034,7 +1056,7 @@ if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("打车收据"); document.getElementsByTag("title").get(0).text("I-GO电子收据"); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney()); Element xcf_chinese = document.getElementById("xcf_chinese"); @@ -1079,7 +1101,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Ride Receipt"); document.getElementsByTag("title").get(0).text("Receipt"); Element title_english = document.getElementById("title_english"); title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip "); Element xcf_english = document.getElementById("xcf_english"); @@ -1124,7 +1146,7 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Reçu de course"); document.getElementsByTag("title").get(0).text("Reçu"); Element title_french = document.getElementById("title_french"); title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage"); Element xcf_french = document.getElementById("xcf_french"); @@ -1166,7 +1188,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 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -1194,6 +1216,7 @@ FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); }catch (Exception e){ e.printStackTrace(); System.out.println("html转pdf异常"); } @@ -1201,7 +1224,7 @@ TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course"); tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu"); tEmail.setType(1); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); @@ -1349,7 +1372,7 @@ if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("打车收据"); document.getElementsByTag("title").get(0).text("I-GO电子收据"); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney()); Element xcf_chinese = document.getElementById("xcf_chinese"); @@ -1394,7 +1417,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Ride Receipt"); document.getElementsByTag("title").get(0).text("Receipt"); Element title_english = document.getElementById("title_english"); title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip "); Element xcf_english = document.getElementById("xcf_english"); @@ -1439,7 +1462,7 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Reçu de course"); document.getElementsByTag("title").get(0).text("Reçu"); Element title_french = document.getElementById("title_french"); title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage"); Element xcf_french = document.getElementById("xcf_french"); @@ -1482,7 +1505,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -1506,13 +1529,18 @@ if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); try { FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); }catch (Exception e){ e.printStackTrace(); System.out.println("html转pdf异常"); } String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course"); tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu"); tEmail.setType(1); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); @@ -1643,7 +1671,7 @@ Element user_chinese = document.getElementById("user_chinese"); user_chinese.text("您好 " + userInfo.getNickName() + ","); Element time_chinese = document.getElementById("time_chinese"); time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + ",详情请查看I-GO平台"); time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + ",详情请查看I-GO平台"); } if(2 == language){ document.getElementById("chinese").remove(); @@ -1652,7 +1680,7 @@ Element user_english = document.getElementById("user_english"); user_english.text("Hello " + userInfo.getNickName() + ","); Element time_english = document.getElementById("time_english"); time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + ",check more details on the app."); time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + ",check more details on the app."); } if(3 == language){ document.getElementById("chinese").remove(); @@ -1661,7 +1689,7 @@ Element user_french = document.getElementById("user_french"); user_french.text("Bonjour " + userInfo.getNickName() + ","); Element time_french = document.getElementById("time_french"); time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails."); time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails."); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus", document.html()); @@ -1678,17 +1706,6 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/redpacket_" + orderId + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html"; TEmail tEmail = new TEmail(); @@ -1859,7 +1876,7 @@ if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("打车收据"); document.getElementsByTag("title").get(0).text("I-GO电子收据"); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney()); Element xcf_chinese = document.getElementById("xcf_chinese"); @@ -1904,7 +1921,7 @@ if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Ride Receipt"); document.getElementsByTag("title").get(0).text("Receipt"); Element title_english = document.getElementById("title_english"); title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip "); Element xcf_english = document.getElementById("xcf_english"); @@ -1949,7 +1966,7 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Reçu de course"); document.getElementsByTag("title").get(0).text("Reçu"); Element title_french = document.getElementById("title_french"); title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage"); Element xcf_french = document.getElementById("xcf_french"); @@ -1992,7 +2009,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -2016,14 +2033,19 @@ if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); try { FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); }catch (Exception e){ e.printStackTrace(); System.out.println("html转pdf异常"); } 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 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course"); tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu"); tEmail.setUserId(userInfo.getId()); tEmail.setType(1); tEmail.setOrderId(id); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java
@@ -46,6 +46,8 @@ ResultUtil<LoginWarpper> captchaLogin(String phoneOperator, String phone, String code, Integer uid, Integer type, Integer userType, Integer language) throws Exception; /** * 手机号码查询用户 * @param phone UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java
@@ -67,7 +67,6 @@ description = description.replaceAll(s.getContent(), "***"); } } language = userInfoService.queryLanguage(uid, language); Complaint complaint = new Complaint(); complaint.setInsertTime(new Date()); complaint.setDriverId(driverId); @@ -117,17 +116,6 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/complain_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/complain_" + randomString + ".html"; TEmail tEmail = new TEmail(); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
@@ -101,11 +101,11 @@ if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Rétroaction"); document.getElementsByTag("title").get(0).text("Avis"); Element user_french = document.getElementById("user_french"); user_french.text("Bonjour " + userInfo.getNickName() + ","); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "反馈意见" : language == 2 ? "Feedback" : "Rétroaction", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "反馈意见" : language == 2 ? "Feedback" : "Avis", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -121,24 +121,13 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/feedback_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/feedback_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "反馈意见" : language == 2 ? "Feedback" : "Rétroaction"); tEmail.setName(language == 1 ? "反馈意见" : language == 2 ? "Feedback" : "Avis"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; tEmail.setWeek(EmailUtil.getWeek(language,i)); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReportLossServiceImpl.java
@@ -138,17 +138,6 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/reportLoss_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/reportLoss_" + randomString + ".html"; TEmail tEmail = new TEmail(); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
@@ -260,7 +260,7 @@ } amount = num1 + (d1 * num4) + (t1 * num5) + (wait * num7) + yt1 + yt2 + yt3; ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map); serverCarModelWarpper.setAmount(new BigDecimal(amount).multiply(new BigDecimal(0.85)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue()); serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue()); serverCarModelWarpper.setMileage(d); serverCarModelWarpper.setDuration(t); data.add(serverCarModelWarpper); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -278,17 +278,6 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/registration_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html"; TEmail tEmail = new TEmail(); @@ -338,6 +327,7 @@ document1.getElementById("reward").remove(); document1.getElementById("rewardToday").remove(); document1.getElementsByTag("title").get(0).text("司机奖励通知"); Element user_user = document1.getElementById("user_user"); user_user.text("您好 " + driver.getFirstName() + " " + driver.getLastName() + ","); Element user_content = document1.getElementById("user_content"); @@ -353,6 +343,7 @@ document1.getElementById("reward1").remove(); document1.getElementById("rewardToday1").remove(); document1.getElementsByTag("title").get(0).text("Reward-driver notice"); Element user1_user = document1.getElementById("user1_user"); user1_user.text("Hello " + driver.getFirstName() + " " + driver.getLastName() + ","); Element user1_content = document1.getElementById("user1_content"); @@ -368,12 +359,13 @@ document1.getElementById("reward1").remove(); document1.getElementById("rewardToday1").remove(); document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense"); Element user2_user = document1.getElementById("user2_user"); user2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + ","); Element user2_content = document1.getElementById("user2_content"); user2_content.text("Vous avez invité avec succès un utilisateur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier"); } EmailUtil.send(driver.getEmail(), language == 1 ? "邀请奖励" : language == 2 ? "Invite and earn" : "Invitez et récompensez", document1.html()); EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ @@ -388,24 +380,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/invitation_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); tEmail.setName(language == 1 ? "邀请奖励" : language == 2 ? "Invite and earn" : "Invitez et récompensez"); tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; tEmail.setWeek(EmailUtil.getWeek(language,i)); @@ -527,17 +508,6 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); @@ -579,10 +549,339 @@ return ResultUtil.success(loginWarpper); } @Override public synchronized ResultUtil<LoginWarpper> captchaLogin(String phoneOperator, String phone, String code, Integer uid, Integer type, Integer userType, Integer language) throws Exception { ResultUtil<LoginWarpper> resultUtil = this.captchaLogin(phoneOperator, phone, code, null, null, null,uid,type,userType,language); return resultUtil; boolean b = this.checkCaptcha(phone, code); if(!b){ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide"); } UserInfo userInfo = userInfoMapper.queryByPhone(phone); if(null != userInfo){ return ResultUtil.error(language == 1 ? "手机号已被注册" : language == 2 ? "The mobile phone number has been registered" : "Le numéro de téléphone portable a été enregistré"); } if(null == userInfo){ userInfo = new UserInfo(); userInfo.setPhoneOperator(phoneOperator); userInfo.setPhone(phone); userInfo.setPassWord(ShiroKit.md5("", salt)); userInfo.setNickName(this.getDefaultName()); userInfo.setRegistIp(null); userInfo.setIsAuth(1); userInfo.setConsumption(0D); userInfo.setBalance(0D); userInfo.setState(1); //用户所属企业 userInfo.setCompanyId(1); Double money = this.userInfoMapper.queryFreeMOney(); if(money!=null){ userInfo.setFreeMoney(BigDecimal.valueOf(money)); } if(null!=uid){ userInfo.setUid(uid); } if(null!=type){ userInfo.setuType(type); } this.insert(userInfo); if(ToolUtil.isNotEmpty(userInfo.getEmail())){ String path = templatePath + "user/register.html"; Document document = Jsoup.parse(new File(path), "UTF-8"); if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("注册成功"); Element user_chinese = document.getElementById("user_chinese"); user_chinese.text("您好 " + userInfo.getNickName() + ","); } if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); document.getElementsByTag("title").get(0).text("Registered successfully"); Element user_english = document.getElementById("user_english"); user_english.text("Hello " + userInfo.getNickName() + ","); } if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); document.getElementsByTag("title").get(0).text("Enregistré avec succès"); Element user_french = document.getElementById("user_french"); user_french.text("Bonjour " + userInfo.getNickName() + ","); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } FileWriter fileWriter = new FileWriter(file); fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; tEmail.setWeek(EmailUtil.getWeek(language,i)); boolean am = cn.hutool.core.date.DateUtil.isAM(new Date()); if(am){ tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); } emailService.insert(tEmail); } this.addCoupon(userInfo, language);//添加优惠券 if(null != uid){ if(type == 2){//司机分享 Driver driver = driverMapper.selectById(uid); List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId()); BigDecimal bigDecimal = new BigDecimal("0"); for(Map<String, Object> map : query){ if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){ bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money")))); incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money")))); } } driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driverMapper.updateById(driver); if(ToolUtil.isNotEmpty(driver.getEmail())){ String path1 = templatePath + "driver/index.html"; Document document1 = Jsoup.parse(new File(path1), "UTF-8"); if(1 == language){ document1.getElementById("english").remove(); document1.getElementById("french").remove(); document1.getElementById("invite").remove(); document1.getElementById("settle").remove(); document1.getElementById("pass").remove(); document1.getElementById("bill").remove(); document1.getElementById("reward").remove(); document1.getElementById("rewardToday").remove(); document1.getElementsByTag("title").get(0).text("司机奖励通知"); Element user_user = document1.getElementById("user_user"); user_user.text("您好 " + driver.getFirstName() + " " + driver.getLastName() + ","); Element user_content = document1.getElementById("user_content"); user_content.text("您已成功邀请一位用户注册I-GO,获得奖励GHS " + bigDecimal.doubleValue() + ",请查收"); } if(2 == language){ document1.getElementById("chinese").remove(); document1.getElementById("french").remove(); document1.getElementById("invite1").remove(); document1.getElementById("settle1").remove(); document1.getElementById("pass1").remove(); document1.getElementById("bill1").remove(); document1.getElementById("reward1").remove(); document1.getElementById("rewardToday1").remove(); document1.getElementsByTag("title").get(0).text("Reward-driver notice"); Element user1_user = document1.getElementById("user1_user"); user1_user.text("Hello " + driver.getFirstName() + " " + driver.getLastName() + ","); Element user1_content = document1.getElementById("user1_content"); user1_content.text("You have succeeded to invite a rider to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance."); } if(3 == language){ document1.getElementById("chinese").remove(); document1.getElementById("english").remove(); document1.getElementById("invite1").remove(); document1.getElementById("settle1").remove(); document1.getElementById("pass1").remove(); document1.getElementById("bill1").remove(); document1.getElementById("reward1").remove(); document1.getElementById("rewardToday1").remove(); document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense"); Element user2_user = document1.getElementById("user2_user"); user2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + ","); Element user2_content = document1.getElementById("user2_content"); user2_content.text("Vous avez invité avec succès un utilisateur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier"); } EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } FileWriter fileWriter = new FileWriter(file); fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; tEmail.setWeek(EmailUtil.getWeek(language,i)); boolean am = cn.hutool.core.date.DateUtil.isAM(new Date()); if(am){ tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); } emailService.insert(tEmail); } } if(type == 1){//用户分享 UserInfo userInfo1 = userInfoMapper.selectById(uid); List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo1.getCompanyId()); Date date = new Date(); for(Map<String, Object> map : query){ Double lavePrice = Double.valueOf(map.get("lavePrice").toString()); String startTime = ""; String endTime = ""; if(null != map.get("startTime")){ startTime = map.get("startTime").toString(); map.put("startTime", DateUtil.conversionFormat(language, startTime)); startTime = DateUtil.conversionFormat(language, startTime); } if(null != map.get("endTime")){ endTime = map.get("endTime").toString(); map.put("endTime", DateUtil.conversionFormat(language, endTime)); endTime = DateUtil.conversionFormat(language, endTime); } int num = 0; double fullMoney = 0; for(int i = Integer.valueOf(String.valueOf(map.get("totalNum"))); i > 0; i--){ //判断当前优惠券金额是否大于可发放剩余总金额 if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(lavePrice) > 0){ break; } UserCouponRecord userCouponRecord = new UserCouponRecord(); userCouponRecord.setActivityType(3); userCouponRecord.setCouponActivityId(Integer.valueOf(String.valueOf(map.get("id")))); userCouponRecord.setCouponId(Integer.valueOf(String.valueOf(map.get("couponId")))); userCouponRecord.setState(1); Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + Integer.valueOf(String.valueOf(map.get("effective")))); userCouponRecord.setExpirationTime(calendar.getTime()); userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(map.get("couponType")))); userCouponRecord.setCouponUseType(Integer.valueOf(String.valueOf(map.get("couponUseType")))); userCouponRecord.setInsertTime(date); userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(map.get("fullMoney")))); userCouponRecord.setMoney(Double.valueOf(String.valueOf(map.get("money")))); userCouponRecord.setCompanyId(userInfo1.getCompanyId()); userCouponRecord.setUserId(uid); userCouponRecordService.insert(userCouponRecord); //修改剩余可发放总金额 lavePrice -= Double.valueOf(String.valueOf(map.get("money"))); num++; fullMoney = userCouponRecord.getFullMoney(); } UserActivityInvite uai = userActivityInviteMapper.selectById(Integer.valueOf(map.get("id").toString())); uai.setLavePrice(new BigDecimal(lavePrice).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); userActivityInviteMapper.updateById(uai); if(ToolUtil.isNotEmpty(userInfo1.getEmail())){ String path1 = templatePath + "user/coupon.html"; Document document1 = Jsoup.parse(new File(path1), "UTF-8"); if(language == 1){ document1.getElementById("english").remove(); document1.getElementById("french").remove(); document1.getElementsByTag("title").get(0).text("优惠券到账"); Element chinese_user = document1.getElementById("chinese_user"); chinese_user.text("您好 " + userInfo1.getNickName() + ","); Element chinese_number = document1.getElementById("chinese_number"); chinese_number.text("您有" + num + "张优惠券到账"); Element chinese_date = document1.getElementById("chinese_date"); chinese_date.text("此活动有效期在" + startTime + "至" + endTime + ",详情请查看I-GO平台"); Element chinese_remark = document1.getElementById("chinese_remark"); chinese_remark.text("注意:满减活动,每单消费至少GHS " + fullMoney + ",才可享用。"); } if(language == 2){ document1.getElementById("chinese").remove(); document1.getElementById("french").remove(); document1.getElementsByTag("title").get(0).text("Coupon is in"); Element english_user = document1.getElementById("english_user"); english_user.text("Hello " + userInfo1.getNickName() + ","); Element english_number = document1.getElementById("english_number"); english_number.text("You have received " + num + " coupons"); Element english_date = document1.getElementById("english_date"); english_date.text("You could use them from " + startTime + " to " + endTime); Element english_remark = document1.getElementById("english_remark"); english_remark.text("NB! Coupon is valid only for the trip fare not less than GHS " + fullMoney + " per ride."); } if(language == 3){ document1.getElementById("chinese").remove(); document1.getElementById("english").remove(); document1.getElementsByTag("title").get(0).text("Le coupon est arrivé sur le compte"); Element french_user = document1.getElementById("french_user"); french_user.text("Cher(ère) " + userInfo1.getNickName() + ","); Element french_number = document1.getElementById("french_number"); french_number.text("Vous avez reçu " + num + " coupons."); Element french_date = document1.getElementById("french_date"); french_date.text("Vous devriez les utiliser du" + startTime + " au " + endTime + ", voir le détail sur la plate-forme I-GO."); Element french_remark = document1.getElementById("french_remark"); french_remark.text("Remarque! Le coupon n'est valable que pour le tarif d'au moins GHS " + fullMoney + " par trajet."); } EmailUtil.send(userInfo1.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document1.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } String randomString = ToolUtil.getRandomString(10); file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html"); if(!file.exists()){ file.createNewFile(); } FileWriter fileWriter = new FileWriter(file); fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; tEmail.setWeek(EmailUtil.getWeek(language,i)); boolean am = cn.hutool.core.date.DateUtil.isAM(new Date()); if(am){ tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); } emailService.insert(tEmail); } } } } } return ResultUtil.success(); } @@ -748,17 +1047,6 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/registration_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html"; TEmail tEmail = new TEmail(); @@ -907,17 +1195,6 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); @@ -1068,17 +1345,6 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/registration_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html"; TEmail tEmail = new TEmail(); @@ -1224,17 +1490,6 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); @@ -1634,17 +1889,6 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/password_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/password_" + randomString + ".html"; TEmail tEmail = new TEmail(); @@ -1963,17 +2207,6 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); @@ -2049,18 +2282,8 @@ if(null != map){ Integer totalNum = Integer.valueOf(String.valueOf(map.get("totalNum"))); Double lavePrice = Double.valueOf(String.valueOf(map.get("lavePrice"))); String startTime = ""; String endTime = ""; if(null != map.get("startTime")){ startTime = map.get("startTime").toString(); map.put("startTime", DateUtil.conversionFormat(language, startTime)); startTime = DateUtil.conversionFormat(language, startTime); } if(null != map.get("endTime")){ endTime = map.get("endTime").toString(); map.put("endTime", DateUtil.conversionFormat(language, endTime)); endTime = DateUtil.conversionFormat(language, endTime); } String startTime = map.get("startTime").toString(); String endTime = map.get("endTime").toString(); double fullMoney = 0; int num = 0; for(int i = totalNum; i > 0; i--){ @@ -2151,17 +2374,6 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); FileInputStream fileInputStream = new FileInputStream(file); File file1 = new File("/usr/local/nginx/html/files/pdf/"); if(!file1.exists()){ file1.mkdirs(); } file1 = new File("/usr/local/nginx/html/files/pdf/coupon_" + randomString + ".pdf"); if(!file1.exists()){ file1.createNewFile(); } FileOutputStream fileOutputStream = new FileOutputStream(file1); HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html"; TEmail tEmail = new TEmail(); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java
@@ -19,20 +19,20 @@ @ApiModelProperty("内容") private String content; @ApiModelProperty("数量") private Integer number; private Integer number = 0; @ApiModelProperty("总数量") private Integer totalNumber; private Integer totalNumber = 0; @ApiModelProperty("金额") private Double amount; private Double amount = 0D; @ApiModelProperty("时长(分钟)") private Integer minute; private Integer minute = 0; @ApiModelProperty("经度") private Double lon; private Double lon = 0D; @ApiModelProperty("纬度") private Double lat; private Double lat = 0D; @ApiModelProperty("状态") private Integer state; private Integer state = 0; public Integer getState() { return state;