派生自 java/IgoTravel
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
@@ -43,10 +43,10 @@ } @PostConstruct void started() { TimeZone.setDefault(TimeZone.getTimeZone("GMT+0")); } // @PostConstruct // void started() { // TimeZone.setDefault(TimeZone.getTimeZone("GMT+0")); // } /** UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -117,12 +117,15 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<List<OrderStatusWarpper>> queryServingOrder(HttpServletRequest request){ public ResultUtil<List<OrderStatusWarpper>> queryServingOrder(Integer language, HttpServletRequest request){ try { Integer uid = userInfoService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } UserInfo userInfo = userInfoService.selectById(uid); userInfo.setLanguage(language); userInfoService.updateById(userInfo); List<OrderStatusWarpper> data = new ArrayList<>(); List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.queryOrder(uid, 1, 2, 3, 4, 5, 6, 7, 11, 12); for(OrderPrivateCar orderPrivateCar : orderPrivateCars){ UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -22,6 +22,7 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; @@ -35,6 +36,7 @@ import javax.servlet.http.HttpSession; import java.io.*; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; /** @@ -280,9 +282,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -631,13 +633,24 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<?> getEmailList(HttpServletRequest request){ public ResultUtil<List<EmailWarpper>> getEmailList(Integer language, HttpServletRequest request){ try { Integer uid = userInfoService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } return ResultUtil.success(emailService.selectList(new EntityWrapper<TEmail>().eq("userId",uid).eq("type",1).orderBy("createTime",false))); List<TEmail> tEmails = emailService.selectList(new EntityWrapper<TEmail>().eq("userId", uid).eq("type", 1).orderBy("createTime", false)); List<EmailWarpper> list = new ArrayList<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); for (TEmail tEmail : tEmails) { EmailWarpper warpper = new EmailWarpper(); BeanUtils.copyProperties(tEmail, warpper); warpper.setCreateTime(DateUtil.conversionFormat(language, sdf.format(tEmail.getCreateTime()))); int i = cn.hutool.core.date.DateUtil.dayOfWeek(tEmail.getCreateTime())-1; warpper.setWeek(EmailUtil.getWeek(language,i)); list.add(warpper); } return ResultUtil.success(list); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -1064,7 +1064,7 @@ Element xj_chinese = document.getElementById("xj_chinese"); xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney()); Element pay_type_chinese = document.getElementById("pay_type_chinese"); pay_type_chinese.text("余额"); pay_type_chinese.text("余额支付"); Element pay_money_chinese = document.getElementById("pay_money_chinese"); pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney()); Element pdf_chinese = document.getElementById("pdf_chinese"); @@ -1109,7 +1109,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("I-GO Wallet"); Element pay_money_english = document.getElementById("pay_money_english"); pay_money_english.text("GHS " + orderPrivateCar.getPayMoney()); Element pdf_english = document.getElementById("pdf_english"); @@ -1154,7 +1154,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("Le solde"); pay_type_french.text("Portefeuille I-GO"); Element pay_money_french = document.getElementById("pay_money_french"); pay_money_french.text("GHS " + orderPrivateCar.getPayMoney()); Element pdf_french = document.getElementById("pdf_french"); @@ -1232,9 +1232,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); @@ -1470,7 +1470,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("En 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"); @@ -1548,9 +1548,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); @@ -1719,9 +1719,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); @@ -1884,7 +1884,7 @@ Element xj_chinese = document.getElementById("xj_chinese"); xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney()); Element pay_type_chinese = document.getElementById("pay_type_chinese"); pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机" : "银行卡"); pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : "银行卡支付"); Element pay_money_chinese = document.getElementById("pay_money_chinese"); pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney()); Element pdf_chinese = document.getElementById("pdf_chinese"); @@ -1929,7 +1929,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(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Bank card"); pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile money" : "Bank card"); Element pay_money_english = document.getElementById("pay_money_english"); pay_money_english.text("GHS " + orderPrivateCar.getPayMoney()); Element pdf_english = document.getElementById("pdf_english"); @@ -1974,7 +1974,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(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Carte bancaire"); pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Argent mobile" : "Carte bancaire"); Element pay_money_french = document.getElementById("pay_money_french"); pay_money_french.text("GHS " + orderPrivateCar.getPayMoney()); Element pdf_french = document.getElementById("pdf_french"); @@ -2054,9 +2054,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail);
@@ -71,6 +71,6 @@ left join t_sys_coupon_record e on (a.intercityCouponId = e.id) left join t_user_activity f on (a.userActivityId = f.id) where a.`enable` = 2 and f.status = 3 and now() between a.startTime and a.endTime and a.money <= #{money} and b.companyId = #{companyId} and c.companyId = #{companyId} and d.companyId = #{companyId} and e.companyId = #{companyId} and (b.companyId = #{companyId} and c.companyId = #{companyId} and d.companyId = #{companyId} and e.companyId = #{companyId}) </select> </mapper> UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java
@@ -128,9 +128,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail);
@@ -133,9 +133,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReportLossServiceImpl.java
@@ -150,9 +150,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -290,9 +290,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -392,9 +392,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -520,9 +520,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -640,9 +640,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -742,9 +742,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -870,9 +870,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -1059,9 +1059,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -1207,9 +1207,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -1357,9 +1357,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -1502,9 +1502,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -1901,9 +1901,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -2219,9 +2219,9 @@ 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"); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } @@ -2385,9 +2385,9 @@ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; boolean am = cn.hutool.core.date.DateUtil.isAM(new Date()); if(am){ tEmail.setAmOrPm(language==1?"上午":language==2?"Morning":""); tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin"); }else { tEmail.setAmOrPm(language==1?"下午":language==2?"Afternoon":""); tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi"); } emailService.insert(tEmail); } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/EmailUtil.java
@@ -155,25 +155,25 @@ }else { switch (i) { case 1: week = "lundi"; week = "Lundi"; break; case 2: week = "Mardi mardi "; week = "Mardi"; break; case 3: week = "mercredi"; week = "Mercredi"; break; case 4: week = "jeudi"; week = "Jeudi"; break; case 5: week = "vendredi"; week = "Vendredi"; break; case 6: week = "Samedi samedi"; week = "Samedi"; break; case 7: week = "dimanche"; week = "Dimanche"; break; } } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java
@@ -211,6 +211,10 @@ context.shutdown(); DistanceMatrixElement elements = distanceMatrix.rows[0].elements[0]; DistanceMatrixElementStatus status = elements.status; if(status.compareTo(DistanceMatrixElementStatus.OK) != 0){ return null; } DistancematrixVo vo = new DistancematrixVo(); vo.setDistance(elements.distance.inMeters); vo.setDuration(elements.duration.inSeconds); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java
@@ -297,9 +297,10 @@ execute.close(); JSONObject jsonObject = JSON.parseObject(body); Integer status = jsonObject.getInteger("status"); if(1701 == status){ if(null != status && 1701 == status){ return true; }else{ System.err.println("短信发送失败：" + jsonObject.toJSONString()); return false; } } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/EmailWarpper.java
New file @@ -0,0 +1,41 @@ package com.stylefeng.guns.modular.system.warpper; import lombok.Data; /** * <p> * * </p> * * @author administrator * @since 2023-09-01 */ @Data public class EmailWarpper { private static final long serialVersionUID=1L; private Integer id; /** * 用户id */ private Integer userId; /** * 1用户2司机 */ private Integer type; /** * html 链接 */ private String link; private Integer orderId; private String createTime; private String week; private String amOrPm; private String name; }
