Merge branch 'test_zxm_salary' into test

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiSalaryController.java

@@ -187,8 +187,8 @@ public class ApiSalaryController implements ApiSalaryFeignClient {
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result<List<ApiSalaryBrokerListResponse>> brokerList() {
-        return apiSalaryService.brokerList();
+    public Result<List<ApiSalaryBrokerListResponse>> brokerList(String name) {
+        return apiSalaryService.brokerList(name);
     }
     }
 
 
 
 

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiSalaryService.java

@@ -42,5 +42,5 @@ public interface ApiSalaryService {
 
 
     Result<BigDecimal> calculateTotalAmount(ApiSalaryCalculateTotalAmountRequest request);
     Result<BigDecimal> calculateTotalAmount(ApiSalaryCalculateTotalAmountRequest request);
 
 
-    Result<List<ApiSalaryBrokerListResponse>> brokerList();
+    Result<List<ApiSalaryBrokerListResponse>> brokerList(String name);
 }
 }

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalaryServiceImpl.java

@@ -411,10 +411,11 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result<List<ApiSalaryBrokerListResponse>> brokerList() {
+    public Result<List<ApiSalaryBrokerListResponse>> brokerList(String name) {
         // 构造查询条件：状态为“完成出账”(2) 且 未删除
         // 构造查询条件：状态为“完成出账”(2) 且 未删除
         QueryWrapper<FortuneAccount> wrapper = new QueryWrapper<>();
         QueryWrapper<FortuneAccount> wrapper = new QueryWrapper<>();
         wrapper.eq("status", FortuneAccountStatusEnum.SENT.getItemValue())
         wrapper.eq("status", FortuneAccountStatusEnum.SENT.getItemValue())
+                .like(StringUtils.isNotBlank(name),"broker",name)
                 .eq("is_deleted", 0);
                 .eq("is_deleted", 0);
 
 
         // 查询所有符合条件的出账记录
         // 查询所有符合条件的出账记录

yd-csf-feign/src/main/java/com/yd/csf/feign/client/salary/ApiSalaryFeignClient.java

@@ -144,5 +144,5 @@ public interface ApiSalaryFeignClient {
      * @return
      * @return
      */
      */
     @GetMapping("/broker/list")
     @GetMapping("/broker/list")
-    Result<List<ApiSalaryBrokerListResponse>> brokerList();
+    Result<List<ApiSalaryBrokerListResponse>> brokerList(@RequestParam(value = "name",required = false) String name);
 }
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/salary/ApiSalaryFeignFallbackFactory.java

@@ -98,7 +98,7 @@ public class ApiSalaryFeignFallbackFactory implements FallbackFactory<ApiSalaryF
             }
             }
 
 
             @Override
             @Override
-            public Result<List<ApiSalaryBrokerListResponse>> brokerList() {
+            public Result<List<ApiSalaryBrokerListResponse>> brokerList(String name) {
                 return null;
                 return null;
             }
             }
         };
         };