From 44a2de414e7178be91011617c07ec9238da790b8 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期四, 25 一月 2024 17:52:09 +0800 Subject: [PATCH] 用户充值记录 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java index bd8e967..9ba10c6 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java @@ -15,6 +15,7 @@ import com.stylefeng.guns.modular.system.util.*; import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils; import com.stylefeng.guns.modular.system.warpper.*; +import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -22,6 +23,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 +37,7 @@ import javax.servlet.http.HttpSession; import java.io.*; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -72,6 +75,8 @@ @Autowired private TEmailService emailService; + @Autowired + private ITransactionDetailsService transactionDetailsService; @@ -280,9 +285,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 +636,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(); @@ -1224,6 +1240,30 @@ } /** + * 用户查询充值记录 + * @param request + * @return + */ + @ResponseBody + @PostMapping("/api/user/queryRechargeRecord") + @ApiOperation(value = "用户查询充值记录", tags = {"用户端-个人中心"}, notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") + }) + public ResultUtil queryRechargeRecord(HttpServletRequest request){ + try { + Integer uid = userInfoService.getUserIdFormRedis(request); + if(null == uid){ + return ResultUtil.tokenErr(); + } + return ResultUtil.success(transactionDetailsService.queryRechargeRecord(uid)); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + /** * 下载pdf * @param orderId * @param orderType -- Gitblit v1.7.1