Merge remote-tracking branch 'origin/master'

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/mapper/ICameraDetailMapper.java

@@ -35,10 +35,10 @@ public interface ICameraDetailMapper extends BaseMapper<CameraDetail> {
     @Select(" SELECT sum(balance) FROM t_camera_detail WHERE user_id = #{userId} AND REC_STATUS = 'A' ")
     long getSumBalanceByUserId(@Param("userId") Long userId);
 
-    List<ResponseCamera> queryListByParams(Page<ResponseCamera> page, @Param("param")RequestCamera param);
+    Page<ResponseCamera> queryListByParams(Page<ResponseCamera> page, @Param("param")RequestCamera param);
 
-    List<ResponseCamera> queryCompanyCameraListByParams(Page<ResponseCamera> page, @Param("param")RequestCamera param);
+    Page<ResponseCamera> queryCompanyCameraListByParams(Page<ResponseCamera> page, @Param("param")RequestCamera param);
 
 
-    List<ResponseCamera> cameraList(Page<ResponseCamera> page, @Param("param")RequestCamera param);
+    Page<ResponseCamera> cameraList(Page<ResponseCamera> page, @Param("param")RequestCamera param);
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraDetailServiceImpl.java

@@ -439,27 +439,21 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     public Page<ResponseCamera> queryListByParams(RequestCamera param) {
         Page<ResponseCamera> pageVo = new Page<ResponseCamera>(param.getPageNum(), param.getPageSize());
         param.setOrderBy("t.id desc");
-        List<ResponseCamera> result = cameraDetailMapper.queryListByParams(pageVo,param);
-        pageVo.setRecords(result);
-        return pageVo;
+        return cameraDetailMapper.queryListByParams(pageVo,param);
     }
 
     @Override
     public Page<ResponseCamera>  queryCompanyCameraListByParams(RequestCamera param) {
         Page<ResponseCamera> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
         param.setOrderBy("a.create_time desc");
-        List<ResponseCamera> result = cameraDetailMapper.queryCompanyCameraListByParams(pageVo,param);
-        pageVo.setRecords(result);
-        return pageVo;
+        return cameraDetailMapper.queryCompanyCameraListByParams(pageVo,param);
     }
 
     @Override
     public Page<ResponseCamera> cameraList(RequestCamera param) {
         Page<ResponseCamera> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
         param.setOrderBy("a.create_time desc");
-        List<ResponseCamera> result = cameraDetailMapper.cameraList(pageVo,param);
-        pageVo.setRecords(result);
-        return pageVo;
+        return cameraDetailMapper.cameraList(pageVo,param);
     }
 
     @Override

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/mapper/IExpansionOrderMapper.java

@@ -8,8 +8,6 @@ import com.fdkankan.platform.user.request.RequestCamera;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * <p>
  * 扩容订单表（八目相机） Mapper 接口
@@ -21,6 +19,6 @@ import java.util.List;
 @Mapper
 public interface IExpansionOrderMapper extends BaseMapper<ExpansionOrder> {
 
-    List<ResponseExpansionOrder> getExpansionListByParam(Page<ResponseExpansionOrder>page, @Param("param") RequestCamera param);
+    Page<ResponseExpansionOrder> getExpansionListByParam(Page<ResponseExpansionOrder>page, @Param("param") RequestCamera param);
 
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/mapper/IOrderMapper.java

@@ -51,5 +51,5 @@ public interface IOrderMapper extends BaseMapper<Order> {
     List<ResponseOrder> queryTrendOrder();
 
 
-    List<ResponseOrder> getListByParam(Page<ResponseOrder> page, @Param("param") RequestOrder param);
+    Page<ResponseOrder> getListByParam(Page<ResponseOrder> page, @Param("param") RequestOrder param);
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/mapper/IVirtualOrderMapper.java

@@ -25,7 +25,7 @@ import java.util.List;
 @Mapper
 public interface IVirtualOrderMapper extends BaseMapper<VirtualOrder> {
 
-    List<ResponseVirtualOrder> getChargeListByParam(Page<ResponseVirtualOrder> page,@Param("param") RequestVirtualOrder param);
+    Page<ResponseVirtualOrder> getChargeListByParam(Page<ResponseVirtualOrder> page,@Param("param") RequestVirtualOrder param);
 
     List<VirtualOrder> getAllByParam(@Param("param")RequestCamera param);
 
@@ -54,5 +54,5 @@ public interface IVirtualOrderMapper extends BaseMapper<VirtualOrder> {
     @Select(" SELECT trade_time as tradeTime, count(id) as orderCount FROM t_virtual_order WHERE (DATE_SUB(CURDATE(), INTERVAL 12 DAY) <=date(trade_time)) AND REC_STATUS = 'A' AND pay_status = 1 AND status = #{status} group by day(create_time) ")
     List<ResponseVirtualOrder> queryTrendRechargeOrder(@Param("status")int status);
 
-    List<ResponseVirtualOrder> getListByParam(Page<ResponseVirtualOrder> page, @Param("param")RequestTrade param);
+    Page<ResponseVirtualOrder> getListByParam(Page<ResponseVirtualOrder> page, @Param("param")RequestTrade param);
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/ExpansionOrderServiceImpl.java

@@ -65,9 +65,7 @@ public class ExpansionOrderServiceImpl extends ServiceImpl<IExpansionOrderMapper
     public Page<ResponseExpansionOrder> getExpansionListByParam(RequestCamera param) {
         Page<ResponseExpansionOrder> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
         param.setOrderBy(" o.trade_time desc");
-        List<ResponseExpansionOrder> list = this.expansionOrderMapper.getExpansionListByParam(pageVo,param);
-        pageVo.setRecords(list);
-        return pageVo;
+        return this.expansionOrderMapper.getExpansionListByParam(pageVo,param);
     }
 
     @Override

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/OrderServiceImpl.java

@@ -533,9 +533,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     public Page<ResponseOrder> getPageVoByParam(RequestOrder param) {
         Page<ResponseOrder> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
         param.setOrderBy("order_time desc");
-        List<ResponseOrder> result = orderMapper.getListByParam(pageVo,param);
-        pageVo.setRecords(result);
-        return pageVo;
+        return  orderMapper.getListByParam(pageVo,param);
     }
 
     @Override

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/VirtualOrderServiceImpl.java

@@ -251,9 +251,7 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
         }
         Page<ResponseVirtualOrder> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
         param.setOrderBy( "o.trade_time desc");
-        List<ResponseVirtualOrder> orders =  virtualOrderMapper.getChargeListByParam(pageVo,param);
-        pageVo.setRecords(orders);
-        return pageVo;
+        return   virtualOrderMapper.getChargeListByParam(pageVo,param);
     }
 
     @Override
@@ -442,8 +440,6 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
     public Page<ResponseVirtualOrder> getPageVoByParam(RequestTrade param) {
         Page<ResponseVirtualOrder> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
         param.setOrderBy("trade_time desc");
-        List<ResponseVirtualOrder> result = virtualOrderMapper.getListByParam(pageVo,param);
-        pageVo.setRecords(result);
-        return pageVo;
+        return virtualOrderMapper.getListByParam(pageVo,param);
     }
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/test/TestSendController.java

@@ -1,10 +1,13 @@
 package com.fdkankan.platform.test;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.platform.agent.entity.Agent;
 import com.fdkankan.platform.agent.service.IAgentService;
+import com.fdkankan.platform.goods.service.ICameraDetailService;
 import com.fdkankan.platform.order.service.IInvoiceService;
-import com.fdkankan.platform.user.request.RequestTrade;
+import com.fdkankan.platform.user.request.RequestCamera;
+import com.fdkankan.platform.user.vo.ResponseCamera;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,6 +23,8 @@ public class TestSendController {
 
     @Autowired
     private IInvoiceService invoiceService;
+    @Autowired
+    private ICameraDetailService cameraDetailService;
 
     @RequestMapping("/test")
     private void sentTest(){
@@ -29,7 +34,7 @@ public class TestSendController {
         agentService.updateById(cameraEntity);
     }
     @RequestMapping("/test1")
-    private void sentTest1(){
-        invoiceService.getListByParam(new RequestTrade());
+    private Page<ResponseCamera> sentTest1(){
+        return cameraDetailService.cameraList(new RequestCamera());
     }
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/mapper/IUserMapper.java

@@ -1,15 +1,13 @@
 package com.fdkankan.platform.user.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.platform.user.entity.User;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fdkankan.platform.user.request.RequestUser;
 import com.fdkankan.platform.user.vo.ResponseUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * <p>
  * 用户信息表 Mapper 接口
@@ -22,5 +20,5 @@ import java.util.List;
 public interface IUserMapper extends BaseMapper<User> {
 
 
-    List<ResponseUser> getListByParam(Page<ResponseUser> page, @Param("param")RequestUser param);
+    Page<ResponseUser> getListByParam(Page<ResponseUser> page, @Param("param")RequestUser param);
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/UserServiceImpl.java

@@ -511,9 +511,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     public Page<ResponseUser> getPageByParam(RequestUser param) {
         Page<ResponseUser> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
         param.setOrderBy("u.register_time desc");
-        List<ResponseUser> result = userMapper.getListByParam( pageVo,param);
-        pageVo.setRecords(result);
-        return pageVo;
+        return userMapper.getListByParam( pageVo,param);
     }
 
     @Override