商家查询优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/CurrencyRecordClient.java

@@ -23,7 +23,7 @@ public interface CurrencyRecordClient {
      * @return 收益流水记录列表
      */
     @GetMapping("/currencyRecord/listCurrencyRecord")
-    List<CurrencyRecordDTO> listCurrencyRecord(@RequestParam("type") Integer type, LocalDate date);
+    List<CurrencyRecordDTO> listCurrencyRecord(@RequestParam("type") Integer type, Long date);
 
     /**
      * 获取用户得总收益、本周收益、本月收益、可提现金额

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/CurrencyRecordController.java

@@ -30,7 +30,7 @@ public class CurrencyRecordController {
      * @return 收益流水记录列表
      */
     @GetMapping("/currencyRecord/listCurrencyRecord")
-    public List<CurrencyRecordDTO> listCurrencyRecord(@RequestParam("type") Integer type, LocalDate date) {
+    public List<CurrencyRecordDTO> listCurrencyRecord(@RequestParam("type") Integer type, Long date) {
         return currencyRecordService.listCurrencyRecord(type,date);
     }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/CurrencyRecordService.java

@@ -36,7 +36,7 @@ public interface CurrencyRecordService extends IService<CurrencyRecord> {
      * 收益流水记录
      * @return 收益流水记录列表
      */
-    List<CurrencyRecordDTO> listCurrencyRecord(Integer type, LocalDate date);
+    List<CurrencyRecordDTO> listCurrencyRecord(Integer type, Long date);
 
     /**
      * 获取用户得总收益、本周收益、本月收益、可提现金额

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CurrencyRecordServiceImpl.java

@@ -20,6 +20,7 @@ import java.math.BigDecimal;
 import java.text.Format;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,15 +37,16 @@ public class CurrencyRecordServiceImpl extends ServiceImpl<CurrencyRecordMapper,
     private final AssetService assetService;
 
      @Override
-     public List<CurrencyRecordDTO> listCurrencyRecord(Integer type, LocalDate date){
-      Long userId = SessionContextHolder.getId();
+     public List<CurrencyRecordDTO> listCurrencyRecord(Integer type, Long date){
+         Date localDate = new Date(date);
+         Long userId = SessionContextHolder.getId();
          List<CurrencyRecord> currencyRecords = this.lambdaQuery()
                  .eq(CurrencyRecord::getUserId,userId)
                  .eq(CurrencyRecord::getType, type)
                  .list();
          List<CurrencyRecordDTO> list = CurrencyRecordCopier.INSTANCE.copying(currencyRecords);
          List<CurrencyRecordDTO> filteredPeople = list.stream()
-                 .filter(item -> !DateUtils.format(item.getCreateTime()).equals(DateUtils.format(date)))
+                 .filter(item -> !DateUtils.format(item.getCreateTime()).equals(DateUtils.format(localDate)))
                  .collect(Collectors.toList());
          return filteredPeople;
      }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/HelpServiceImpl.java

@@ -107,7 +107,7 @@ public class HelpServiceImpl extends ServiceImpl<HelpMapper, Help> implements
     @Override
     public void deleteHelpById(@NonNull Long id) {
         Help help = AssertUtils.nonnull(this.getById(id), "该问题帮助不存在");
-        this.deleteHelpById(id);
+        this.removeById(id);
     }
 
     @Override

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -60,7 +60,7 @@
             <if test="offset != null">
                 mt.id > #{offset}
             </if>
-            mt.region = #{region} and mt.status = 'ONLINE'
+            mt.region between #{code} and #{boundary} and mt.status = 'ONLINE'
             <if test="keyword != null and !keyword.isEmpty()">
                 and mt.name like concat('%', #{keyword}, '%')
             </if>