修改查询交易记录接口

1、添加按id排序
2、添加查询所有国家
3、添加接口，更新用户国家、职业信息

src/main/java/com/ai/da/controller/AccountController.java

@@ -341,4 +341,11 @@ public class AccountController {
     public Response<Boolean> unbindGoogle() {
         return Response.success(accountService.unbindGoogle());
     }
+
+    @GetMapping("/updateUserInfo")
+    @ApiOperation(value = "更新用户国家、职业信息")
+    public Response<String> updateUserInfo(@RequestParam(value = "country", required = false) String country, @RequestParam(value = "occupation", required = false) String occupation) {
+        accountService.updateUserInfo(country, occupation);
+        return Response.success();
+    }
 }

src/main/java/com/ai/da/controller/ConvenientInquiryController.java

@@ -202,4 +202,10 @@ public class ConvenientInquiryController {
     public Response<PageBaseResponse<PaymentInfoVO>>  queryTransactionRecords(@Valid @RequestBody QueryPaymentInfoDTO queryPaymentInfoDTO){
         return Response.success(convenientInquiryService.queryTransactionRecords(queryPaymentInfoDTO));
     }
+
+    @ApiOperation("获取所有国家、城市")
+    @GetMapping("/getCities")
+    public Response<Map<String, List<String>>> getCities(){
+        return Response.success(convenientInquiryService.getCities());
+    }
 }

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<PaymentInfo> {
 
@@ -15,10 +16,14 @@ public interface PaymentInfoMapper extends BaseMapper<PaymentInfo> {
 
     List<PaymentInfoVO> 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<Map<String, String>> getCities();
+
+    List<Map<String, String>> getCountries();
 }

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";
 }

src/main/java/com/ai/da/service/AccountService.java

@@ -222,4 +222,6 @@ public interface AccountService extends IService<Account> {
     void updateAccountValidity(Long accountId, Long currentPeriodEnd);
 
     void updateUserRoleAndCredits(Long accountId, String type);
+
+    void updateUserInfo(String country, String occupation);
 }

src/main/java/com/ai/da/service/ConvenientInquiryService.java

@@ -48,4 +48,6 @@ public interface ConvenientInquiryService extends IService<Questionnaire> {
     List<Map<String, Object>> getAllUserIdList();
 
     PageBaseResponse<PaymentInfoVO> queryTransactionRecords(QueryPaymentInfoDTO queryPaymentInfoDTO);
+
+    Map<String, List<String>> getCities();
 }

src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java

@@ -620,11 +620,15 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
     public PageBaseResponse<PaymentInfoVO> 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<PaymentInfoVO> 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<QuestionnaireMappe
         return response;
     }
 
+    public Map<String, List<String>> getCities(){
+        List<Map<String, String>> cities = paymentInfoMapper.getCities();
+        List<Map<String, String>> countries = paymentInfoMapper.getCountries();
+        List<String> cityCollect = cities.stream()
+                .map(cityEntry -> cityEntry.get("city"))
+                .collect(Collectors.toList());
+        List<String> countryCollect = countries.stream()
+                .map(cityEntry -> cityEntry.get("country"))
+                .collect(Collectors.toList());
+
+        return new HashMap<String, List<String>>() {{
+            put("city", cityCollect);
+            put("country", countryCollect);
+        }};
+    }
 
 }

src/main/resources/mapper/primary/PaymentInfoMapper.xml

@@ -91,7 +91,7 @@
             AND create_time BETWEEN #{startTime} AND #{endTime}
         </if>
         ORDER BY
-        id DESC
+        id ${order}
         LIMIT ${limit} OFFSET ${offset}
     </select>
 
@@ -130,5 +130,18 @@
         </if>
     </select>
 
+    <select id="getCities" resultType="java.util.Map">
+        SELECT DISTINCT city
+        FROM t_payment_info
+        WHERE city IS NOT NULL
+          AND TRIM(city) != ''
+    </select>
+
+    <select id="getCountries" resultType="java.util.Map">
+        SELECT DISTINCT country
+        FROM t_payment_info
+        WHERE country IS NOT NULL
+          AND TRIM(country) != ''
+    </select>
 
 </mapper>