Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java

@@ -68,10 +68,6 @@ public interface BusMainDepositFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusMainDepositListVo>> listPage(@RequestBody PagerQuery<BusMainDepositQuery> pq);
 
-    @ApiOperation("根据条件查询所有数据列表")
-    @PostMapping("/listAll")
-    public ResultBean<List<BusMainDepositVo>> listAll(@RequestBody BusMainDepositQuery query);
-
     @ApiOperation("保存虚拟订单（订金）")
     @PostMapping("/saveDeposit")
     public ResultBean saveOrUpdateDeposit(@Valid @RequestBody BusDepositDto dto);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java

@@ -60,11 +60,11 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign {
         return rb.setMsg("接口anrui-buscenter/busmaindeposit/listPage无法访问");
     }
 
-    @Override
+   /* @Override
     public ResultBean<List<BusMainDepositVo>> listAll(BusMainDepositQuery query) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-buscenter/busmaindeposit/listAll无法访问");
-    }
+    }*/
 
     @Override
     public ResultBean saveOrUpdateDeposit(BusDepositDto dto) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java

@@ -79,13 +79,6 @@ public class BusMainDepositRest implements BusMainDepositFeign {
         return rb.success().setData(pv);
     }
 
-    @Override
-    public ResultBean<List<BusMainDepositVo>> listAll(BusMainDepositQuery query) {
-        ResultBean rb = ResultBean.fireFail();
-        List<BusMainDepositVo> list = busMainDepositService.listAllVo(query);
-        return rb.success().setData(list);
-    }
-
     @Override
     public ResultBean saveOrUpdateDeposit(BusDepositDto dto) {
         if (dto.getPaymentProofList() != null && dto.getPaymentProofList().size() > 1) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -186,21 +186,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     @Autowired
     private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
 
-
-    public PagerVo<BusMainDeposit> listPage(PagerQuery<BusMainDepositQuery> pq) {
-        BusMainDepositQuery query = pq.getParams();
-        QueryWrapper<BusMainDeposit> qw = createQueryWrapper(query);
-        IPage<BusMainDeposit> page = PagerUtil.queryToPage(pq);
-        IPage<BusMainDeposit> pagging = baseMapper.selectPage(page, qw);
-        PagerVo<BusMainDeposit> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public List<BusMainDeposit> listAll(BusMainDepositQuery query) {
-        QueryWrapper<BusMainDeposit> qw = createQueryWrapper(query);
-        return baseMapper.selectList(qw);
-    }
-
     private QueryWrapper<BusMainDeposit> createQueryWrapper(BusMainDepositQuery query) {
         QueryWrapper<BusMainDeposit> qw = new QueryWrapper<>();
 
@@ -265,11 +250,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return p;
     }
 
-    public List<BusMainDepositVo> listAllVo(BusMainDepositQuery query) {
-        QueryWrapper<BusMainDeposit> qw = createQueryWrapper(query);
-        return baseMapper.selectListAllVo(qw);
-    }
-
     /**
      * 保存虚拟订单（订金）
      *