派生自 java/IgoTravel
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java
@@ -76,13 +76,13 @@ @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<List<ProblemWarpper>> queryProblems(Integer pageNum, Integer size, HttpServletRequest request){ public ResultUtil<List<ProblemWarpper>> queryProblems(Integer pageNum, Integer size, Integer languag, HttpServletRequest request){ try { Integer uid = userInfoService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } List<Map<String, Object>> maps = problemService.queryProblems(pageNum, size, uid); List<Map<String, Object>> maps = problemService.queryProblems(pageNum, size, uid, languag); return ResultUtil.success(ProblemWarpper.getProblemWarpper(maps)); }catch (Exception e){ e.printStackTrace(); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -299,8 +299,8 @@ //添加消息 systemNoticeService.addSystemNotice(1, language == 1 ? "您的市内包裹订单已下单成功，我们正在为您指派司机，请稍后！" : language == 2 ? "Your parcel order has been successfully placed, we are assigning a driver for you, please wait!" : "Votre commande de colis a bien été passée, nous vous assignons un chauffeur, veuillez patienter!", orderLogistics.getUserId(), 1); language == 2 ? "You've placed the package order successfully, we are assigning you a driver, please wait." : "Vous avez passé la commande de colis avec succès, nous vous attribuons un chauffeur, veuillez patienter.", orderLogistics.getUserId(), 1); BaseWarpper baseWarpper = new BaseWarpper(); baseWarpper.setId(orderLogistics.getId()); @@ -431,6 +431,7 @@ PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0); //获取空闲司机 List<Driver> list = driverService.queryIdleDriver(orderLogistics.getType(), null, orderLogistics.getStartLon(), orderLogistics.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机 System.err.println("【" + orderLogistics.getId() + "】空闲司机：" + JSON.toJSONString(list)); if(list.size() > 0){ double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数 int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取） @@ -569,175 +570,9 @@ } }).start(); if(ToolUtil.isNotEmpty(userInfo.getEmail())){ new Thread(new Runnable() { @Override public void run() { try { String path = templatePath + "user/receiptLogistics.html"; Document document = Jsoup.parse(new File(path), "UTF-8"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Driver driver = driverService.selectById(orderLogistics.getDriverId()); if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney()); Element xcf_chinese = document.getElementById("xcf_chinese"); xcf_chinese.text("GHS " + orderLogistics.getOrderMoney()); Element xj_chinese = document.getElementById("xj_chinese"); xj_chinese.text("GHS " + orderLogistics.getOrderMoney()); Element pay_type_chinese = document.getElementById("pay_type_chinese"); pay_type_chinese.text("现金"); Element pay_money_chinese = document.getElementById("pay_money_chinese"); pay_money_chinese.text("GHS " + orderLogistics.getPayMoney()); Element pdf_chinese = document.getElementById("pdf_chinese"); pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_chinese = document.getElementById("lost_item_chinese"); lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_chinese = document.getElementById("track_chinese"); // track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_chinese = document.getElementsByClass("driver_chinese"); for (int i = 0; i < driver_chinese.size(); i++) { Element element = driver_chinese.get(i); element.text(driver.getFirstName() + "." + driver.getLastName()); } Element start_address_chinese = document.getElementById("start_address_chinese"); start_address_chinese.text(orderLogistics.getStartAddress()); Element end_address_chinese = document.getElementById("end_address_chinese"); end_address_chinese.text(orderLogistics.getEndAddress()); Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId())); Element server_tel_chinese = document.getElementById("server_tel_chinese"); server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); 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 xcf_english = document.getElementById("xcf_english"); xcf_english.text("GHS " + orderLogistics.getOrderMoney()); Element xj_english = document.getElementById("xj_english"); xj_english.text("GHS " + orderLogistics.getOrderMoney()); Element pay_type_english = document.getElementById("pay_type_english"); pay_type_english.text("cash"); Element pay_money_english = document.getElementById("pay_money_english"); pay_money_english.text("GHS " + orderLogistics.getPayMoney()); Element pdf_english = document.getElementById("pdf_english"); pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_english = document.getElementById("lost_item_english"); lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_english = document.getElementById("track_english"); // track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_english = document.getElementsByClass("driver_english"); for (int i = 0; i < driver_english.size(); i++) { Element element = driver_english.get(i); element.text(driver.getFirstName() + "." + driver.getLastName()); } Element start_address_english = document.getElementById("start_address_english"); start_address_english.text(orderLogistics.getStartAddress()); Element end_address_english = document.getElementById("end_address_english"); end_address_english.text(orderLogistics.getEndAddress()); Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId())); Element server_tel_english = document.getElementById("server_tel_english"); server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); Element title_french = document.getElementById("title_french"); title_french.text("Le " + DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + ", vous avez dépensé GHS " + orderLogistics.getPayMoney() + " sur le voyage"); Element xcf_french = document.getElementById("xcf_french"); xcf_french.text("GHS " + orderLogistics.getOrderMoney()); Element xj_french = document.getElementById("xj_french"); xj_french.text("GHS " + orderLogistics.getOrderMoney()); Element pay_type_french = document.getElementById("pay_type_french"); pay_type_french.text("espèces"); Element pay_money_french = document.getElementById("pay_money_french"); pay_money_french.text("GHS " + orderLogistics.getPayMoney()); Element pdf_french = document.getElementById("pdf_french"); pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_french = document.getElementById("lost_item_french"); lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_french = document.getElementById("track_french"); // track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_french = document.getElementsByClass("driver_french"); for (int i = 0; i < driver_french.size(); i++) { Element element = driver_french.get(i); element.text(driver.getFirstName() + "." + driver.getLastName()); } Element start_address_french = document.getElementById("start_address_french"); start_address_french.text(orderLogistics.getStartAddress()); Element end_address_french = document.getElementById("end_address_french"); end_address_french.text(orderLogistics.getEndAddress()); Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId())); 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 ? "Parcel receipt" : "Réception de colis", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html"); if(!file.exists()){ file.createNewFile(); } FileWriter fileWriter = new FileWriter(file); 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/parcel_receipt_" + 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/parcel_receipt_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis"); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; String week = EmailUtil.getWeek(language, i); tEmail.setWeek(week); 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); }catch (Exception e){ e.printStackTrace(); } } }).start(); } systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付，谢谢使用！" : language == 2 ? "You have successfully completed the parcel order payment, thank you for using!" : "Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", uid, 1); ? "You've paid for the package order successfully, thank you for using I-GO" : "Vous avez payé la commande de colis avec succès, merci d’utiliser I-GO", uid, 1); this.pushOrder(orderLogistics);//推单 } @@ -754,173 +589,6 @@ orderLogistics.setPayType(4); orderLogistics.setPayMoney(orderMoney); if(ToolUtil.isNotEmpty(userInfo.getEmail())){ new Thread(new Runnable() { @Override public void run() { try { String path = templatePath + "user/receiptLogistics.html"; Document document = Jsoup.parse(new File(path), "UTF-8"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Driver driver = driverService.selectById(orderLogistics.getDriverId()); if(1 == language){ document.getElementById("english").remove(); document.getElementById("french").remove(); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney()); Element xcf_chinese = document.getElementById("xcf_chinese"); xcf_chinese.text("GHS " + orderLogistics.getOrderMoney()); Element xj_chinese = document.getElementById("xj_chinese"); xj_chinese.text("GHS " + orderLogistics.getOrderMoney()); Element pay_type_chinese = document.getElementById("pay_type_chinese"); pay_type_chinese.text("现金"); Element pay_money_chinese = document.getElementById("pay_money_chinese"); pay_money_chinese.text("GHS " + orderLogistics.getPayMoney()); Element pdf_chinese = document.getElementById("pdf_chinese"); pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_chinese = document.getElementById("lost_item_chinese"); lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_chinese = document.getElementById("track_chinese"); // track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_chinese = document.getElementsByClass("driver_chinese"); for (int i = 0; i < driver_chinese.size(); i++) { Element element = driver_chinese.get(i); element.text(driver.getFirstName() + "." + driver.getLastName()); } Element start_address_chinese = document.getElementById("start_address_chinese"); start_address_chinese.text(orderLogistics.getStartAddress()); Element end_address_chinese = document.getElementById("end_address_chinese"); end_address_chinese.text(orderLogistics.getEndAddress()); Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId())); Element server_tel_chinese = document.getElementById("server_tel_chinese"); server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } if(2 == language){ document.getElementById("chinese").remove(); document.getElementById("french").remove(); 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 xcf_english = document.getElementById("xcf_english"); xcf_english.text("GHS " + orderLogistics.getOrderMoney()); Element xj_english = document.getElementById("xj_english"); xj_english.text("GHS " + orderLogistics.getOrderMoney()); Element pay_type_english = document.getElementById("pay_type_english"); pay_type_english.text("cash"); Element pay_money_english = document.getElementById("pay_money_english"); pay_money_english.text("GHS " + orderLogistics.getPayMoney()); Element pdf_english = document.getElementById("pdf_english"); pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_english = document.getElementById("lost_item_english"); lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_english = document.getElementById("track_english"); // track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_english = document.getElementsByClass("driver_english"); for (int i = 0; i < driver_english.size(); i++) { Element element = driver_english.get(i); element.text(driver.getFirstName() + "." + driver.getLastName()); } Element start_address_english = document.getElementById("start_address_english"); start_address_english.text(orderLogistics.getStartAddress()); Element end_address_english = document.getElementById("end_address_english"); end_address_english.text(orderLogistics.getEndAddress()); Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId())); Element server_tel_english = document.getElementById("server_tel_english"); server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } if(3 == language){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); Element title_french = document.getElementById("title_french"); title_french.text("Le " + DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + ", vous avez dépensé GHS " + orderLogistics.getPayMoney() + " sur le voyage" ); Element xcf_french = document.getElementById("xcf_french"); xcf_french.text("GHS " + orderLogistics.getOrderMoney()); Element xj_french = document.getElementById("xj_french"); xj_french.text("GHS " + orderLogistics.getOrderMoney()); Element pay_type_french = document.getElementById("pay_type_french"); pay_type_french.text("espèces"); Element pay_money_french = document.getElementById("pay_money_french"); pay_money_french.text("GHS " + orderLogistics.getPayMoney()); Element pdf_french = document.getElementById("pdf_french"); pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4"); Element lost_item_french = document.getElementById("lost_item_french"); lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4"); // Element track_french = document.getElementById("track_french"); // track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html"); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime()))); Elements driver_french = document.getElementsByClass("driver_french"); for (int i = 0; i < driver_french.size(); i++) { Element element = driver_french.get(i); element.text(driver.getFirstName() + "." + driver.getLastName()); } Element start_address_french = document.getElementById("start_address_french"); start_address_french.text(orderLogistics.getStartAddress()); Element end_address_french = document.getElementById("end_address_french"); end_address_french.text(orderLogistics.getEndAddress()); Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId())); 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 ? "Parcel receipt" : "Réception de colis", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ file.mkdirs(); } file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html"); if(!file.exists()){ file.createNewFile(); } FileWriter fileWriter = new FileWriter(file); 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/parcel_receipt_" + 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/parcel_receipt_" + orderId + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis"); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; String week = EmailUtil.getWeek(language, i); tEmail.setWeek(week); 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); }catch (Exception e){ e.printStackTrace(); } } }).start(); } // TODO: 2020/5/24 这里需要给司机和用户推送订单状态 new Thread(new Runnable() { @Override @@ -931,8 +599,8 @@ }).start(); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付，谢谢使用！" : language == 2 ? "You have successfully completed the parcel order payment, thank you for using!" : "Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", uid, 1); ? "You've paid for the package order successfully, thank you for using I-GO" : "Vous avez payé la commande de colis avec succès, merci d’utiliser I-GO", uid, 1); this.pushOrder(orderLogistics);//推单 } @@ -1056,8 +724,8 @@ }).start(); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付，谢谢使用！" : language == 2 ? "You have successfully completed the difference payment of parcel order, thank you for using!" : "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", uid, 1); ? "You've paid for the difference of package order successfully, thank you for using I-GO" : "Vous avez payé la différence de commande de colis avec succès, merci d’utiliser I-GO", uid, 1); } if(payType == 4){//现金支付 @@ -1113,8 +781,8 @@ }).start(); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付，谢谢使用！" : language == 2 ? "You have successfully completed the difference payment of parcel order, thank you for using!" : "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", uid, 1); ? "You've paid for the difference of package order successfully, thank you for using I-GO" : "Vous avez payé la différence de commande de colis avec succès, merci d’utiliser I-GO", uid, 1); } @@ -1155,8 +823,8 @@ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付，谢谢使用！" : language == 2 ? "You have successfully completed the parcel order payment, thank you for using!" : "Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1); ? "You've paid for the package order successfully, thank you for using I-GO" : "Vous avez payé la commande de colis avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1); this.pushOrder(orderLogistics);//推单 }else{ @@ -1230,8 +898,8 @@ }).start(); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付，谢谢使用！" : language == 2 ? "You have successfully completed the difference payment of parcel order, thank you for using!" : "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1); ? "You've paid for the difference of package order successfully, thank you for using I-GO" : "Vous avez payé la différence de commande de colis avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1); }else{ System.err.println("预支付数据异常（orderId = " + id + ")"); } @@ -1447,8 +1115,8 @@ } //添加消息 systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You have successfully cancelled your parcel order, thank you for using!" : "Vous avez annulé avec succès votre commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You've cancelled the package order successfully, thank you for using I-GO " : "Vous avez annulé la commande de colis avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1); Map<String, Object> map = new HashMap<>(); map.put("id", integer); return ResultUtil.success(map); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -447,8 +447,8 @@ //添加消息 systemNoticeService.addSystemNotice(1, language == 1 ? "您的打车订单已下单成功，我们正在为您指派司机，请稍后！" : language == 2 ? "Your ride order has been successfully placed, we are assigning a driver for you, please wait!" : "Votre commande a bien été passée, nous vous assignons un chauffeur, veuillez patienter!", orderPrivateCar.getUserId(), 1); language == 2 ? "You've placed the ride order successfully, we are assigning you a driver, please wait." : "Vous avez passé la commande de course avec succès, nous vous attribuons un chauffeur, veuillez patienter.", orderPrivateCar.getUserId(), 1); BaseWarpper baseWarpper = new BaseWarpper(); baseWarpper.setState(orderPrivateCar.getState()); @@ -599,7 +599,7 @@ } //添加消息 systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消出行订单，谢谢使用！" : language == 2 ? "You have successfully canceled the travel order, thank you for using" : "Vous avez annulé avec succès la commande de voyage, merci d'utiliser", orderPrivateCar.getUserId(), 1); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消出行订单，谢谢使用！" : language == 2 ? "You've cancelled the ride order successfully, thank you for using I-GO " : "Vous avez annulé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1); Map<String, Object> map = new HashMap<>(); map.put("id", integer); return ResultUtil.success(map); @@ -724,8 +724,8 @@ //添加消息 systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2 ? "You have successfully paid the cancellation fee, thank you for using!" : "Vous avez payé avec succès les frais d’annulation de commande, merci d’utiliser!", orderPrivateCar.getUserId(), 1); ? "You've paid for cancellation fee with the balance successfully, thank you for using I-GO" : "Vous avez utilisé avec succès votre solde pour payer les frais d’annulation, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1); } } return resultUtil; @@ -1085,7 +1085,7 @@ Element xj_english = document.getElementById("xj_english"); xj_english.text("GHS " + orderPrivateCar.getOrderMoney()); Element pay_type_english = document.getElementById("pay_type_english"); pay_type_english.text("balance"); pay_type_english.text("Balance"); Element pay_money_english = document.getElementById("pay_money_english"); pay_money_english.text("GHS " + orderPrivateCar.getPayMoney()); Element pdf_english = document.getElementById("pdf_english"); @@ -1163,7 +1163,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 Ride", 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/"); @@ -1195,7 +1195,7 @@ TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride"); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course"); tEmail.setType(1); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); @@ -1230,8 +1230,8 @@ }).start(); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2 ? "You have successfully completed the travel order payment, thank you for using!" : "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1); ? "You've paid for the ride order successfully, thank you for using I-GO" : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1); } @@ -1438,7 +1438,7 @@ Element xj_french = document.getElementById("xj_french"); xj_french.text("GHS " + orderPrivateCar.getOrderMoney()); Element pay_type_french = document.getElementById("pay_type_french"); pay_type_french.text("espèces"); pay_type_french.text("Espèces"); Element pay_money_french = document.getElementById("pay_money_french"); pay_money_french.text("GHS " + orderPrivateCar.getPayMoney()); Element pdf_french = document.getElementById("pdf_french"); @@ -1473,7 +1473,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", 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/"); @@ -1503,7 +1503,7 @@ TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride"); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course"); tEmail.setType(1); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); @@ -1538,8 +1538,8 @@ }).start(); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2 ? "You have successfully completed the travel order payment, thank you for using!" : "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1); ? "You've paid for the ride order successfully, thank you for using I-GO" : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1); } this.updateAllColumnById(orderPrivateCar); @@ -1652,7 +1652,7 @@ 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."); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Red envelope activity" : "Activité de l’enveloppe rouge", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ @@ -1683,7 +1683,7 @@ tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); tEmail.setType(1); tEmail.setName( language == 1 ? "红包活动" : language == 2 ? "Red envelope activity" : "Activité de l’enveloppe rouge"); tEmail.setName(language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus"); tEmail.setOrderId(orderId); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; @@ -1759,8 +1759,8 @@ //添加消息 systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2 ? "You have successfully paid the cancellation fee, thank you for using!" : "Vous avez payé avec succès les frais d’annulation de commande, merci d’utiliser!", orderPrivateCar.getUserId(), 1); ? "You've paid for cancellation fee with the balance successfully, thank you for using I-GO" : "Vous avez utilisé avec succès votre solde pour payer les frais d’annulation, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1); }else{ System.err.println("预支付数据异常（orderId = " + id + ")"); } @@ -1977,7 +1977,7 @@ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : "")); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", 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/"); @@ -2008,7 +2008,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 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride"); tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course"); tEmail.setUserId(userInfo.getId()); tEmail.setType(1); tEmail.setOrderId(id); @@ -2041,8 +2041,8 @@ }).start(); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2 ? "You have successfully completed the travel order payment, thank you for using!" : "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1); ? "You've paid for the ride order successfully, thank you for using I-GO" : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1); }else{ System.err.println("预支付数据异常（orderId = " + id + ")"); } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -264,11 +264,11 @@ and serverCarModelId = #{serverCarModelId} </if> ) ) as aa where aa.id not in ( ) as aa <!--where aa.id not in ( select driverId from t_order_private_car where isDelete = 1 and driverPay = 1 and state in (7, 8, 9) union all select driverId from t_order_logistics where isDelete = 1 and driverPay = 1 and state != 10 ) )--> </select>
@@ -18,7 +18,7 @@ <select id="queryProblems" resultType="map"> select id as id, DATE_FORMAT(insertTime, '%Y.%m.%d %H:%i') as insertTime, DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as insertTime, content as content, answer as answer from t_problem where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size} UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/WithdrawalMapper.xml
@@ -24,7 +24,7 @@ <select id="queryWithdrawal" resultType="map"> select id as id, DATE_FORMAT(insertTime, '%Y.%m.%d') as insertTime, DATE_FORMAT(insertTime, '%Y-%m-%d') as insertTime, money as money, ('银行卡提现') as name, code, UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IProblemService.java
@@ -28,5 +28,5 @@ * @return * @throws Exception */ List<Map<String, Object>> queryProblems(Integer pageNum, Integer size, Integer uid) throws Exception; List<Map<String, Object>> queryProblems(Integer pageNum, Integer size, Integer uid, Integer languag) throws Exception; } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java
@@ -99,7 +99,7 @@ Element french_user = document.getElementById("french_user"); french_user.text("Bonjour " + userInfo.getNickName() + "，"); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "投诉司机" : language == 2 ? "Complain Driver" : "Se plaindre du conducteur", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "投诉司机" : language == 2 ? "Complain against driver" : "Porter plainte contre le chauffeur", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ @@ -131,7 +131,7 @@ tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "投诉司机" : language == 2 ? "Complain Driver" : "Se plaindre du conducteur"); tEmail.setName(language == 1 ? "投诉司机" : language == 2 ? "Complain against driver" : "Porter plainte contre le chauffeur"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; tEmail.setWeek(EmailUtil.getWeek(language,i)); @@ -144,6 +144,6 @@ emailService.insert(tEmail); } systemNoticeService.addSystemNotice(1, language == 1 ? "您的投诉已提交成功，我们会尽快处理！" : language == 2 ? "Your complaint has been submitted successfully and we will deal with it as soon as possible" : "Votre plainte a été soumise avec succès et nous la traiterons dès que possible", uid, 1); systemNoticeService.addSystemNotice(1, language == 1 ? "您的投诉已提交成功，我们会尽快处理！" : language == 2 ? "Your complaints were submitted successfully, we shall handle it as soon as possible." : "Vos réclamations ont été déposées avec succès, nous les traiterons dans les plus brefs délais.", uid, 1); } } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
@@ -102,7 +102,7 @@ Element user_french = document.getElementById("user_french"); user_french.text("Bonjour " + userInfo.getNickName() + "，"); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "反馈意见" : language == 2 ? "Feedback" : "Retour", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "反馈意见" : language == 2 ? "Feedback" : "Rétroaction", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -135,7 +135,7 @@ tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "反馈意见" : language == 2 ? "Feedback" : "Retour"); tEmail.setName(language == 1 ? "反馈意见" : language == 2 ? "Feedback" : "Rétroaction"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; tEmail.setWeek(EmailUtil.getWeek(language,i)); @@ -148,8 +148,8 @@ emailService.insert(tEmail); } systemNoticeService.addSystemNotice(1, language == 1 ? "您的反馈已提交成功，我们会尽快处理！" : language == 2 ? "Your feedback has been submitted successfully, we will deal with it as soon as possible" : "Vos commentaires ont été soumis avec succès, nous les traiterons dès que possible", uid, 1); systemNoticeService.addSystemNotice(1, language == 1 ? "您的反馈已提交成功，我们会尽快处理！" : language == 2 ? "Your feedback was submitted successfully, we shall handle it as soon as possible." : "Vos avis ont été soumis avec succès, nous les traiterons dans les plus brefs délais.", uid, 1); return ResultUtil.success(); } } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
@@ -99,7 +99,7 @@ orderEvaluate.setUserId(uid); this.insert(orderEvaluate); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功添加订单评价，谢谢使用！" : language == 2 ? "You have successfully added the order evaluation, thank you for using!" : "Vous avez ajouté une évaluation de commande avec succès. Merci d’utiliser!", uid, 1); systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功添加订单评价，谢谢使用！" : language == 2 ? "You've added the rating successfully, thank you for using I-GO" : "Vous avez ajouté l’évaluation avec succès, merci d’utiliser I-GO", uid, 1); return ResultUtil.success(orderEvaluate.getId()); }
@@ -8,6 +8,7 @@ import com.stylefeng.guns.modular.system.model.SensitiveWords; import com.stylefeng.guns.modular.system.service.IProblemService; import com.stylefeng.guns.modular.system.service.IUserInfoService; import com.stylefeng.guns.modular.system.util.DateUtil; import com.stylefeng.guns.modular.system.util.ResultUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -71,8 +72,15 @@ * @throws Exception */ @Override public List<Map<String, Object>> queryProblems(Integer pageNum, Integer size, Integer uid) throws Exception { public List<Map<String, Object>> queryProblems(Integer pageNum, Integer size, Integer uid, Integer languag) throws Exception { pageNum = (pageNum - 1) * size; return problemMapper.queryProblems(pageNum, size, uid); List<Map<String, Object>> list = problemMapper.queryProblems(pageNum, size, uid); for (Map<String, Object> map : list) { if(null != map.get("insertTime")){ String insertTime = map.get("insertTime").toString(); map.put("insertTime", DateUtil.conversionFormat(languag, insertTime)); } } return list; } } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReportLossServiceImpl.java
@@ -104,14 +104,14 @@ document.getElementById("french").remove(); Element english_user = document.getElementById("english_user"); english_user.text("Hello " + userInfo.getNickName() + "，"); EmailUtil.send(userInfo.getEmail(), "Report loss of goods", document.html()); EmailUtil.send(userInfo.getEmail(), "Report items lost", document.html()); } if(language == 3){ document.getElementById("chinese").remove(); document.getElementById("english").remove(); Element english_user = document.getElementById("french_user"); english_user.text("Bonjour! " + userInfo.getNickName() + "，"); EmailUtil.send(userInfo.getEmail(), "Signaler une perte de marchandises", document.html()); EmailUtil.send(userInfo.getEmail(), "Signaler l'objet perdu", document.html()); } } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -148,10 +148,10 @@ sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！"; break; case 2: sms = "Your verification code is: " + authCode + ", the verification code is valid within 5 minutes, do not leak to others!"; sms = "Your verification code is " + authCode + "，it is valid within 5 minutes, please do not reveal it to others."; break; case 3: sms = "Votre code de vérification est: " + authCode + ". Ce code est valide pendant 5 minutes. Ne le divulguez pas aux autres!"; sms = "Votre code de validation est " + authCode + "et il est valide pendant 5 minutes. Veuillez ne pas le révéler à d’autres personnes."; break; } smsUtil.sendCellulantMessage(phone, sms); @@ -259,7 +259,7 @@ Element user_french = document.getElementById("user_french"); user_french.text("Bonjour " + userInfo.getNickName() + "，"); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie", document.html()); 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()){ @@ -291,7 +291,7 @@ tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie"); 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)); @@ -370,7 +370,7 @@ 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 ? "invitation bonus" : "prime d'invitation", document1.html()); EmailUtil.send(driver.getEmail(), language == 1 ? "邀请奖励" : language == 2 ? "Invite and earn" : "Invitez et récompensez", document1.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ @@ -402,7 +402,7 @@ tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "邀请奖励" : language == 2 ? "invitation bonus" : "prime d'invitation"); tEmail.setName(language == 1 ? "邀请奖励" : language == 2 ? "Invite and earn" : "Invitez et récompensez"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; tEmail.setWeek(EmailUtil.getWeek(language,i)); @@ -498,7 +498,7 @@ Element french_date = document1.getElementById("french_date"); french_date.text("Cette promotion est valide du" + startTime + "au" + endTime); } EmailUtil.send(userInfo1.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document1.html()); 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()){ @@ -530,7 +530,7 @@ tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive"); 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)); @@ -718,7 +718,7 @@ Element user_french = document.getElementById("user_french"); user_french.text("Bonjour " + userInfo.getNickName() + "，"); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie", document.html()); 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()){ @@ -750,7 +750,7 @@ tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie"); 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)); @@ -855,7 +855,7 @@ Element french_date = document.getElementById("french_date"); french_date.text("Cette promotion est valide du" + startTime + "au" + endTime); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ @@ -887,7 +887,7 @@ tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive"); 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)); @@ -1013,7 +1013,7 @@ Element user_french = document.getElementById("user_french"); user_french.text("Bonjour " + userInfo.getNickName() + "，"); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie", document.html()); 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()){ @@ -1045,7 +1045,7 @@ tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "Successful registration" : "Inscription réussie"); 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)); @@ -1148,7 +1148,7 @@ Element french_date = document.getElementById("french_date"); french_date.text("Cette promotion est valide du" + startTime + "au" + endTime); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ @@ -1180,7 +1180,7 @@ tEmail.setLink(link); tEmail.setUserId(uid); tEmail.setType(1); tEmail.setName( language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive"); 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)); @@ -1867,7 +1867,7 @@ Element french_date = document.getElementById("french_date"); french_date.text("Cette promotion est valide du" + startTime + "au" + endTime); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ @@ -1899,7 +1899,7 @@ tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); tEmail.setType(1); tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive"); 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)); @@ -2034,7 +2034,7 @@ Element french_date = document.getElementById("french_date"); french_date.text("Cette promotion est valide du" + startTime + "au" + endTime); } EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive", document.html()); EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte", document.html()); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); if(!file.exists()){ @@ -2066,7 +2066,7 @@ tEmail.setLink(link); tEmail.setUserId(userInfo.getId()); tEmail.setType(1); tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon arrives" : "Le coupon arrive"); 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; boolean am = cn.hutool.core.date.DateUtil.isAM(new Date()); @@ -2080,7 +2080,7 @@ } } //添加系统消息 systemNoticeService.addSystemNotice(1, "您已获得" + num + "张优惠券，点击查看", userInfo.getId(), 2); systemNoticeService.addSystemNotice(1, language == 1 ? "您已获得" + num + "张优惠券，点击查看" : language == 2 ? "You've got " + num + " coupon, click to view" : "Vous avez reçu " + num + " coupon, cliquez pour voir", userInfo.getId(), 2); }
@@ -7,6 +7,7 @@ import com.stylefeng.guns.modular.system.model.Withdrawal; import com.stylefeng.guns.modular.system.service.IUserInfoService; import com.stylefeng.guns.modular.system.service.IWithdrawalService; import com.stylefeng.guns.modular.system.util.DateUtil; import com.stylefeng.guns.modular.system.util.ResultUtil; import com.stylefeng.guns.modular.system.util.Tingg.TinggPayoutUtil; import com.stylefeng.guns.modular.system.util.Tingg.model.AuthStatus; @@ -97,6 +98,10 @@ List<Map<String, Object>> list = withdrawalMapper.queryWithdrawal(uid, 1, pageNum, size); for (Map<String, Object> map : list) { map.put("name", name + map.get("code")); if(null != map.get("insertTime")){ String insertTime = map.get("insertTime").toString(); map.put("insertTime", DateUtil.conversionFormat(language, insertTime)); } } return list; }
