From ef705981802711bf3760d6c6c3096ded711c796f Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 10 Jan 2025 16:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3=201=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89id=E6=8E=92=E5=BA=8F=202=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6=203=E3=80=81=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E3=80=81=E8=81=8C=E4=B8=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/controller/AccountController.java | 7 +++++++ .../ConvenientInquiryController.java | 6 ++++++ .../da/mapper/primary/PaymentInfoMapper.java | 7 ++++++- .../ai/da/model/dto/QueryPaymentInfoDTO.java | 3 ++- .../com/ai/da/service/AccountService.java | 2 ++ .../da/service/ConvenientInquiryService.java | 2 ++ .../impl/ConvenientInquiryServiceImpl.java | 21 ++++++++++++++++++- .../mapper/primary/PaymentInfoMapper.xml | 15 ++++++++++++- 8 files changed, 59 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index 56b2f2f4..7a4f4d84 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -341,4 +341,11 @@ public class AccountController { public Response unbindGoogle() { return Response.success(accountService.unbindGoogle()); } + + @GetMapping("/updateUserInfo") + @ApiOperation(value = "更新用户国家、职业信息") + public Response updateUserInfo(@RequestParam(value = "country", required = false) String country, @RequestParam(value = "occupation", required = false) String occupation) { + accountService.updateUserInfo(country, occupation); + return Response.success(); + } } diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java index 42f87ad2..0f8547d5 100644 --- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java +++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java @@ -202,4 +202,10 @@ public class ConvenientInquiryController { public Response> queryTransactionRecords(@Valid @RequestBody QueryPaymentInfoDTO queryPaymentInfoDTO){ return Response.success(convenientInquiryService.queryTransactionRecords(queryPaymentInfoDTO)); } + + @ApiOperation("获取所有国家、城市") + @GetMapping("/getCities") + public Response>> getCities(){ + return Response.success(convenientInquiryService.getCities()); + } } diff --git a/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java index b0a82f21..1d2cf84d 100644 --- a/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java @@ -6,6 +6,7 @@ import com.ai.da.model.vo.PaymentInfoVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; +import java.util.Map; public interface PaymentInfoMapper extends BaseMapper { @@ -15,10 +16,14 @@ public interface PaymentInfoMapper extends BaseMapper { List queryPaymentInfo(String paymentType,String payerTotal, String type, String status, String country, String city, String startTime, String endTime, - int limit, int offset + int limit, int offset, String order ); Long queryPaymentInfoCount(String paymentType,String payerTotal, String type, String status, String country, String city, String startTime, String endTime ); + + List> getCities(); + + List> getCountries(); } diff --git a/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java b/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java index 28f7ac06..fa61e724 100644 --- a/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java @@ -23,5 +23,6 @@ public class QueryPaymentInfoDTO extends QueryPageByTimeDTO { private String country; @ApiModelProperty("付款人所在城市") private String city; - + @ApiModelProperty("按id排序 DESC || ASC") + private String order = "DESC"; } diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index 2374234e..770143f0 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -222,4 +222,6 @@ public interface AccountService extends IService { void updateAccountValidity(Long accountId, Long currentPeriodEnd); void updateUserRoleAndCredits(Long accountId, String type); + + void updateUserInfo(String country, String occupation); } diff --git a/src/main/java/com/ai/da/service/ConvenientInquiryService.java b/src/main/java/com/ai/da/service/ConvenientInquiryService.java index 3e71d645..bb44b6b7 100644 --- a/src/main/java/com/ai/da/service/ConvenientInquiryService.java +++ b/src/main/java/com/ai/da/service/ConvenientInquiryService.java @@ -48,4 +48,6 @@ public interface ConvenientInquiryService extends IService { List> getAllUserIdList(); PageBaseResponse queryTransactionRecords(QueryPaymentInfoDTO queryPaymentInfoDTO); + + Map> getCities(); } diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java index 0bd9a40c..20b97125 100644 --- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java @@ -620,11 +620,15 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl queryTransactionRecords(QueryPaymentInfoDTO queryPaymentInfoDTO) { Integer size = queryPaymentInfoDTO.getSize(); int offset = (queryPaymentInfoDTO.getPage() - 1) * size; + String order = "DESC"; + if (!StringUtil.isNullOrEmpty(queryPaymentInfoDTO.getOrder()) && queryPaymentInfoDTO.getOrder().equals("ASC")) { + order = "ASC"; + } List paymentInfoVOS = paymentInfoMapper.queryPaymentInfo(queryPaymentInfoDTO.getPlatform(), queryPaymentInfoDTO.getPayerTotal(), queryPaymentInfoDTO.getType(), queryPaymentInfoDTO.getStatus(), queryPaymentInfoDTO.getCountry(), queryPaymentInfoDTO.getCity(), queryPaymentInfoDTO.getStartTime(), queryPaymentInfoDTO.getEndTime(), - size, offset); + size, offset, order); // 查询数据总量 Long total = paymentInfoMapper.queryPaymentInfoCount(queryPaymentInfoDTO.getPlatform(), queryPaymentInfoDTO.getPayerTotal(), queryPaymentInfoDTO.getType(), queryPaymentInfoDTO.getStatus(), @@ -643,5 +647,20 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl> getCities(){ + List> cities = paymentInfoMapper.getCities(); + List> countries = paymentInfoMapper.getCountries(); + List cityCollect = cities.stream() + .map(cityEntry -> cityEntry.get("city")) + .collect(Collectors.toList()); + List countryCollect = countries.stream() + .map(cityEntry -> cityEntry.get("country")) + .collect(Collectors.toList()); + + return new HashMap>() {{ + put("city", cityCollect); + put("country", countryCollect); + }}; + } } diff --git a/src/main/resources/mapper/primary/PaymentInfoMapper.xml b/src/main/resources/mapper/primary/PaymentInfoMapper.xml index 1d798ac7..0343fd2a 100644 --- a/src/main/resources/mapper/primary/PaymentInfoMapper.xml +++ b/src/main/resources/mapper/primary/PaymentInfoMapper.xml @@ -91,7 +91,7 @@ AND create_time BETWEEN #{startTime} AND #{endTime} ORDER BY - id DESC + id ${order} LIMIT ${limit} OFFSET ${offset} @@ -130,5 +130,18 @@ + + +