虚拟订单 接口业务移植

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

@@ -1,8 +1,12 @@
 package com.fdkankan.order.mapper;
 
-import com.fdkankan.order.entity.ExpansionOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.order.entity.ExpansionOrder;
+import com.fdkankan.order.vo.ResponseExpansionOrder;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +19,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IExpansionOrderMapper extends BaseMapper<ExpansionOrder> {
 
+    List<ResponseExpansionOrder> getExpansionListByParam(@Param("userId")Long userId, @Param("childName")String childName,
+                                                         @Param("cameraId")Long cameraId, @Param("start")Integer start,
+                                                         @Param("pageSize")Integer pageSize, @Param("orderBy")String orderBy);
+    Integer getExpansionCountByParam(@Param("userId")Long userId,@Param("childName")String childName,
+                                  @Param("cameraId")Long cameraId);
+
 }

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

@@ -20,7 +20,8 @@ import java.util.List;
 public interface IVirtualOrderMapper extends BaseMapper<VirtualOrder> {
 
     List<ResponseVirtualOrder> getChargeListByParam(@Param("userId")Long userId,@Param("status")String status,@Param("childName")String childName,
-                                                    @Param("cameraId")Long cameraId,@Param("start")Integer start,@Param("pageSize")Integer pageSize);
+                                                    @Param("cameraId")Long cameraId,@Param("start")Integer start,
+                                                    @Param("pageSize")Integer pageSize,@Param("orderBy")String orderBy);
     Integer getChargeCountByParam(@Param("userId")Long userId,@Param("status")String status,@Param("childName")String childName,
-                                                    @Param("cameraId")Long cameraId,@Param("start")Integer start,@Param("pageSize")Integer pageSize);
+                                                    @Param("cameraId")Long cameraId);
 }

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

@@ -1,7 +1,9 @@
 package com.fdkankan.order.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.order.entity.DownloadOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.user.request.RequestDownloadOrder;
 import com.fdkankan.user.request.RequestIncrementOrder;
 import com.fdkankan.user.vo.ResponseDownloadOrder;
 
@@ -18,4 +20,6 @@ import java.math.BigDecimal;
 public interface IDownloadOrderService extends IService<DownloadOrder> {
 
     ResponseDownloadOrder saveByOrderParam(Long userId, RequestIncrementOrder order, BigDecimal price);
+
+    Page<ResponseDownloadOrder> getPageByParam(Long userId, RequestDownloadOrder param);
 }

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

@@ -1,8 +1,10 @@
 package com.fdkankan.order.service;
 
-import com.fdkankan.order.entity.ExpansionOrder;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.order.entity.ExpansionOrder;
 import com.fdkankan.order.vo.ResponseExpansionOrder;
+import com.fdkankan.user.request.RequestCamera;
 import com.fdkankan.user.request.RequestExpansionOrder;
 
 import java.math.BigDecimal;
@@ -18,4 +20,6 @@ import java.math.BigDecimal;
 public interface IExpansionOrderService extends IService<ExpansionOrder> {
 
     ResponseExpansionOrder saveByOrderParam(Long userId, RequestExpansionOrder order, BigDecimal bigDecimal, String unit, int unitSize, int month, int delay);
+
+    Page<ResponseExpansionOrder> getExpansionListByParam(RequestCamera param);
 }

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

@@ -1,5 +1,6 @@
 package com.fdkankan.order.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.order.entity.IncrementOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.user.request.RequestIncrementOrder;
@@ -18,4 +19,6 @@ import java.math.BigDecimal;
 public interface IIncrementOrderService extends IService<IncrementOrder> {
 
     ResponseIncrementOrder saveByOrderParam(Long userId, RequestIncrementOrder order, BigDecimal price);
+
+    Page<ResponseIncrementOrder> getPageByParam(Long id, RequestIncrementOrder param);
 }

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

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.agent.vo.AgentVo;
 import com.fdkankan.agent.vo.ResponseAgentCamera;
 import com.fdkankan.order.entity.VirtualOrder;
+import com.fdkankan.order.vo.ResponseExpansionOrder;
 import com.fdkankan.user.request.RequestCamera;
 import com.fdkankan.user.request.RequestDownloadOrder;
 import com.fdkankan.user.request.RequestIncrementOrder;
 import com.fdkankan.user.request.RequestVirtualOrder;
+import com.fdkankan.user.vo.ResponseDownloadOrder;
+import com.fdkankan.user.vo.ResponseIncrementOrder;
 import com.fdkankan.user.vo.ResponseVirtualOrder;
 
 /**
@@ -31,9 +34,9 @@ public interface IVirtualOrderService extends IService<VirtualOrder> {
 
     Page<ResponseVirtualOrder> chargeList(RequestVirtualOrder param, String token);
 
-    String expansionList(RequestCamera param, String token);
+    Page<ResponseExpansionOrder> expansionList(RequestCamera param, String token);
 
-    String incrementOrderList(RequestIncrementOrder param, String token);
+    Page<ResponseIncrementOrder> incrementOrderList(RequestIncrementOrder param, String token);
 
-    String downloadOrderList(RequestDownloadOrder param, String token);
+    Page<ResponseDownloadOrder> downloadOrderList(RequestDownloadOrder param, String token);
 }

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

@@ -1,18 +1,30 @@
 package com.fdkankan.order.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.NumberUtils;
+import com.fdkankan.goods.common.SkuCache;
+import com.fdkankan.goods.service.IGoodsSkuService;
+import com.fdkankan.goods.vo.ResponseGoodsSku;
 import com.fdkankan.order.entity.DownloadOrder;
+import com.fdkankan.order.entity.Invoice;
 import com.fdkankan.order.mapper.IDownloadOrderMapper;
 import com.fdkankan.order.service.IDownloadOrderService;
+import com.fdkankan.order.service.IInvoiceService;
+import com.fdkankan.user.request.RequestDownloadOrder;
 import com.fdkankan.user.request.RequestIncrementOrder;
 import com.fdkankan.user.vo.ResponseDownloadOrder;
+import com.fdkankan.user.vo.ResponseInvoice;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -25,6 +37,11 @@ import java.math.BigDecimal;
 @Service
 public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper, DownloadOrder> implements IDownloadOrderService {
 
+    @Autowired
+    private IGoodsSkuService goodsSkuService;
+    @Autowired
+    private IInvoiceService invoiceService;
+
     @Override
     public ResponseDownloadOrder saveByOrderParam(Long userId, RequestIncrementOrder order, BigDecimal price) {
         BigDecimal total = price.multiply(new BigDecimal(order.getCount()));
@@ -47,4 +64,50 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
         BeanUtils.copyProperties(downloadOrderEntity, downloadOrder);
         return downloadOrder;
     }
+
+    @Override
+    public Page<ResponseDownloadOrder> getPageByParam(Long userId, RequestDownloadOrder param) {
+        QueryWrapper<DownloadOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(DownloadOrder::getUserId,userId);
+        queryWrapper.lambda().eq(DownloadOrder::getPayStatus,1);
+        queryWrapper.lambda().orderByDesc(DownloadOrder::getTradeTime);
+        Page<DownloadOrder> entityPage = new Page<>(param.getPageNum(),param.getPageSize());
+        Page<DownloadOrder> page = this.page(entityPage, queryWrapper);
+
+        ResponseGoodsSku sku = goodsSkuService.getVoBySkuSn(SkuCache.skusMap.get("6"));
+
+        List<ResponseDownloadOrder> responseList = this.convert(page.getRecords(), sku.getDescription());
+        Page<ResponseDownloadOrder> voPage = new Page<ResponseDownloadOrder>(param.getPageNum(), param.getPageSize());
+        voPage.setTotal(page.getTotal());
+        voPage.setRecords(responseList);
+
+        ResponseInvoice responseInvoice = null;
+        QueryWrapper<Invoice> invoiceQueryWrapper= null;
+        for (ResponseDownloadOrder responseDownloadOrder : voPage.getRecords()) {
+            invoiceQueryWrapper = new QueryWrapper<>();
+            invoiceQueryWrapper.lambda().eq(Invoice::getDownloadOrderId,responseDownloadOrder.getId());
+            List<Invoice> list = invoiceService.list(invoiceQueryWrapper);
+            if(list.size() > 0){
+                Invoice invoiceEntity = list.get(0);
+                if(invoiceEntity != null){
+                    responseInvoice = new ResponseInvoice();
+                    BeanUtils.copyProperties(invoiceEntity, responseInvoice);
+                    responseDownloadOrder.setInvoice(responseInvoice);
+                }
+            }
+        }
+        return voPage;
+    }
+
+    private List<ResponseDownloadOrder> convert(List<DownloadOrder> records, String description) {
+        List<ResponseDownloadOrder> result = new ArrayList<>();
+        ResponseDownloadOrder responseDownloadOrder = null;
+        for (DownloadOrder downloadOrderEntity : records) {
+            responseDownloadOrder = new ResponseDownloadOrder();
+            BeanUtils.copyProperties(downloadOrderEntity, responseDownloadOrder);
+//            responseDownloadOrder.setName(name);
+            result.add(responseDownloadOrder);
+        }
+        return result;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.fdkankan.order.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
@@ -8,11 +9,14 @@ import com.fdkankan.order.entity.ExpansionOrder;
 import com.fdkankan.order.mapper.IExpansionOrderMapper;
 import com.fdkankan.order.service.IExpansionOrderService;
 import com.fdkankan.order.vo.ResponseExpansionOrder;
+import com.fdkankan.user.request.RequestCamera;
 import com.fdkankan.user.request.RequestExpansionOrder;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -25,6 +29,9 @@ import java.math.BigDecimal;
 @Service
 public class ExpansionOrderServiceImpl extends ServiceImpl<IExpansionOrderMapper, ExpansionOrder> implements IExpansionOrderService {
 
+    @Resource
+    private IExpansionOrderMapper expansionOrderMapper;
+
     @Override
     public ResponseExpansionOrder saveByOrderParam(Long userId, RequestExpansionOrder order, BigDecimal price, String unit, int unitSize, int month, int delay) {
         BigDecimal total = price.multiply(new BigDecimal(order.getUnitSize())).multiply(new BigDecimal(order.getYears()));
@@ -49,4 +56,19 @@ public class ExpansionOrderServiceImpl extends ServiceImpl<IExpansionOrderMapper
         BeanUtils.copyProperties(expansionOrderEntity, expansionOrder);
         return expansionOrder;
     }
+
+    @Override
+    public Page<ResponseExpansionOrder> getExpansionListByParam(RequestCamera param) {
+        Page<ResponseExpansionOrder> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
+        Integer start = (param.getPageNum() -1 ) * param.getPageSize();
+        Integer count = this.expansionOrderMapper.getExpansionCountByParam(param.getUserId(), param.getChildName(), param.getCameraId());
+        if(count<=0){
+            return pageVo;
+        }
+        String orderBy = " o.trade_time desc";
+        List<ResponseExpansionOrder> list = this.expansionOrderMapper.getExpansionListByParam(param.getUserId(), param.getChildName(), param.getCameraId(), start, param.getPageSize(),orderBy);
+        pageVo.setTotal(count);
+        pageVo.setRecords(list);
+        return pageVo;
+    }
 }

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

@@ -1,18 +1,29 @@
 package com.fdkankan.order.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.NumberUtils;
+import com.fdkankan.goods.common.SkuCache;
+import com.fdkankan.goods.service.IGoodsSkuService;
+import com.fdkankan.goods.vo.ResponseGoodsSku;
 import com.fdkankan.order.entity.IncrementOrder;
+import com.fdkankan.order.entity.Invoice;
 import com.fdkankan.order.mapper.IIncrementOrderMapper;
 import com.fdkankan.order.service.IIncrementOrderService;
+import com.fdkankan.order.service.IInvoiceService;
 import com.fdkankan.user.request.RequestIncrementOrder;
 import com.fdkankan.user.vo.ResponseIncrementOrder;
+import com.fdkankan.user.vo.ResponseInvoice;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -25,6 +36,11 @@ import java.math.BigDecimal;
 @Service
 public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper, IncrementOrder> implements IIncrementOrderService {
 
+    @Autowired
+    private IGoodsSkuService goodsSkuService;
+    @Autowired
+    private IInvoiceService invoiceService;
+
     @Override
     public ResponseIncrementOrder saveByOrderParam(Long userId, RequestIncrementOrder order, BigDecimal price) {
         BigDecimal total = price.multiply(new BigDecimal(order.getCount()));
@@ -46,4 +62,51 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         BeanUtils.copyProperties(incrementOrderEntity, incrementOrder);
         return incrementOrder;
     }
+
+    @Override
+    public Page<ResponseIncrementOrder> getPageByParam(Long userId, RequestIncrementOrder param) {
+        QueryWrapper<IncrementOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(IncrementOrder::getUserId,userId);
+        queryWrapper.lambda().eq(IncrementOrder::getPayStatus,1);
+        queryWrapper.lambda().orderByDesc(IncrementOrder::getTradeTime);
+        Page<IncrementOrder> entityPage = new Page<>(param.getPageNum(),param.getPageSize());
+        Page<IncrementOrder> page = this.page(entityPage, queryWrapper);
+
+        ResponseGoodsSku sku = goodsSkuService.getVoBySkuSn(SkuCache.skusMap.get("5"));
+
+        List<ResponseIncrementOrder> responseList = this.convert(page.getRecords(), sku.getDescription());
+        Page<ResponseIncrementOrder> voPage = new Page<ResponseIncrementOrder>(param.getPageNum(), param.getPageSize());
+        voPage.setTotal(page.getTotal());
+        voPage.setRecords(responseList);
+
+        ResponseInvoice responseInvoice = null;
+        QueryWrapper<Invoice> invoiceQueryWrapper= null;
+        for (ResponseIncrementOrder responseIncrementOrder : voPage.getRecords()) {
+            invoiceQueryWrapper = new QueryWrapper<>();
+            invoiceQueryWrapper.lambda().eq(Invoice::getIncrementOrderId,responseIncrementOrder.getId());
+            List<Invoice> list = invoiceService.list(invoiceQueryWrapper);
+            if(list.size() > 0){
+                Invoice invoiceEntity = list.get(0);
+                if(invoiceEntity != null){
+                    responseInvoice = new ResponseInvoice();
+                    BeanUtils.copyProperties(invoiceEntity, responseInvoice);
+                    responseIncrementOrder.setInvoice(responseInvoice);
+                }
+            }
+        }
+        return voPage;
+
+    }
+
+    private List<ResponseIncrementOrder> convert(List<IncrementOrder> list, String name){
+        List<ResponseIncrementOrder> result = new ArrayList<>();
+        ResponseIncrementOrder responseIncrementOrder = null;
+        for (IncrementOrder incrementOrderEntity : list) {
+            responseIncrementOrder = new ResponseIncrementOrder();
+            BeanUtils.copyProperties(incrementOrderEntity, responseIncrementOrder);
+            responseIncrementOrder.setName(name);
+            result.add(responseIncrementOrder);
+        }
+        return result;
+    }
 }

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

@@ -9,16 +9,22 @@ import com.fdkankan.agent.vo.ResponseAgentCamera;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.order.entity.VirtualOrder;
 import com.fdkankan.order.mapper.IVirtualOrderMapper;
+import com.fdkankan.order.service.IDownloadOrderService;
+import com.fdkankan.order.service.IExpansionOrderService;
+import com.fdkankan.order.service.IIncrementOrderService;
 import com.fdkankan.order.service.IVirtualOrderService;
-import com.fdkankan.common.user.SSOUser;
+import com.fdkankan.order.vo.ResponseExpansionOrder;
 import com.fdkankan.user.request.RequestCamera;
 import com.fdkankan.user.request.RequestDownloadOrder;
 import com.fdkankan.user.request.RequestIncrementOrder;
 import com.fdkankan.user.request.RequestVirtualOrder;
 import com.fdkankan.user.service.IUserService;
+import com.fdkankan.user.vo.ResponseDownloadOrder;
+import com.fdkankan.user.vo.ResponseIncrementOrder;
 import com.fdkankan.user.vo.ResponseVirtualOrder;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -45,6 +51,12 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
     private IVirtualOrderMapper virtualOrderMapper;
     @Autowired
     private IUserService userService;
+    @Autowired
+    private IExpansionOrderService expansionOrderService;
+    @Autowired
+    private IIncrementOrderService incrementOrderService;
+    @Autowired
+    private IDownloadOrderService downloadOrderService;
 
     @Override
     public void saveVirtualOrderByAgent(Long cameraId) {
@@ -229,29 +241,40 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
     @Override
     public Page<ResponseVirtualOrder> chargeList(RequestVirtualOrder param, String token) {
         SSOUser ssouser = userService.getSSOUserByToken(token);
+        Page<ResponseVirtualOrder> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
         param.setUserId(ssouser.getId());
         Integer start = (param.getPageNum() -1) * param.getPageSize();
-        List<ResponseVirtualOrder> orders =  virtualOrderMapper.getChargeListByParam(param.getUserId(),param.getStatus(),param.getChildName(),param.getCameraId(),start,param.getPageSize());
-        Integer count =  virtualOrderMapper.getChargeCountByParam(param.getUserId(),param.getStatus(),param.getChildName(),param.getCameraId(),start,param.getPageSize());
+        Integer count =  virtualOrderMapper.getChargeCountByParam(param.getUserId(),param.getStatus(),param.getChildName(),param.getCameraId());
+        if(count<=0){
+            return pageVo;
+        }
+        String orderBy = "o.trade_time desc";
+        List<ResponseVirtualOrder> orders =  virtualOrderMapper.getChargeListByParam(param.getUserId(),param.getStatus(),param.getChildName(),param.getCameraId(),start,param.getPageSize(),orderBy);
 
-        Page<ResponseVirtualOrder> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
         pageVo.setTotal(count);
         pageVo.setRecords(orders);
         return pageVo;
     }
 
     @Override
-    public String expansionList(RequestCamera param, String token) {
-        return null;
+    public Page<ResponseExpansionOrder> expansionList(RequestCamera param, String token) {
+        SSOUser ssouser = userService.getSSOUserByToken(token);
+        param.setUserId(ssouser.getId());
+        return expansionOrderService.getExpansionListByParam(param);
     }
 
     @Override
-    public String incrementOrderList(RequestIncrementOrder param, String token) {
-        return null;
+    public Page<ResponseIncrementOrder> incrementOrderList(RequestIncrementOrder param, String token) {
+        SSOUser ssouser = userService.getSSOUserByToken(token);
+        //查询该用户已支付的增值权益
+        return incrementOrderService.getPageByParam(ssouser.getId(),param);
+
     }
 
     @Override
-    public String downloadOrderList(RequestDownloadOrder param, String token) {
-        return null;
+    public Page<ResponseDownloadOrder> downloadOrderList(RequestDownloadOrder param, String token) {
+        SSOUser ssouser = userService.getSSOUserByToken(token);
+        //查询该用户已支付的增值权益
+        return  downloadOrderService.getPageByParam(ssouser.getId(),param);
     }
 }

4dkankan-center-platform/src/main/java/com/fdkankan/user/controller/api/UserVirtualOrderController.java

@@ -2,10 +2,13 @@ package com.fdkankan.user.controller.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.order.service.IVirtualOrderService;
+import com.fdkankan.order.vo.ResponseExpansionOrder;
 import com.fdkankan.user.request.RequestCamera;
 import com.fdkankan.user.request.RequestDownloadOrder;
 import com.fdkankan.user.request.RequestIncrementOrder;
 import com.fdkankan.user.request.RequestVirtualOrder;
+import com.fdkankan.user.vo.ResponseDownloadOrder;
+import com.fdkankan.user.vo.ResponseIncrementOrder;
 import com.fdkankan.user.vo.ResponseVirtualOrder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +32,6 @@ public class UserVirtualOrderController {
      * 获取用户充值记录
      * status     状态，-1表示支出，1表示充值，0表示系统赠送，-2表示系统退充值
      * childName     设备id
-     * @return
      */
     @RequestMapping(value = "/chargeList", method = RequestMethod.POST)
     public Page<ResponseVirtualOrder> chargeList(@RequestBody RequestVirtualOrder param, @RequestHeader String token) throws Exception {
@@ -40,7 +42,7 @@ public class UserVirtualOrderController {
      * childName     设备id
      */
     @RequestMapping(value = "/expansionList", method = RequestMethod.POST)
-    public String expansionList(@RequestBody RequestCamera param, @RequestHeader String token) throws Exception {
+    public Page<ResponseExpansionOrder> expansionList(@RequestBody RequestCamera param, @RequestHeader String token) throws Exception {
         return virtualOrderService.expansionList(param,token);
     }
     /**
@@ -48,7 +50,7 @@ public class UserVirtualOrderController {
      * snCode     相机sn编码
      */
     @RequestMapping(value = "/incrementOrderList", method = RequestMethod.POST)
-    public String incrementOrderList(@RequestBody RequestIncrementOrder param, @RequestHeader String token) throws Exception {
+    public Page<ResponseIncrementOrder> incrementOrderList(@RequestBody RequestIncrementOrder param, @RequestHeader String token) throws Exception {
         return virtualOrderService.incrementOrderList(param,token);
     }
     /**
@@ -56,7 +58,7 @@ public class UserVirtualOrderController {
      * snCode     相机sn编码
      */
     @RequestMapping(value = "/downloadOrderList", method = RequestMethod.POST)
-    public String downloadOrderList(@RequestBody RequestDownloadOrder param, @RequestHeader String token) throws Exception {
+    public Page<ResponseDownloadOrder> downloadOrderList(@RequestBody RequestDownloadOrder param, @RequestHeader String token) throws Exception {
         return virtualOrderService.downloadOrderList(param,token);
     }
 

4dkankan-center-platform/src/main/resources/mapper/order/ExpansionOrderMapper.xml

@@ -2,4 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.order.mapper.IExpansionOrderMapper">
 
+    <select id="getExpansionListByParam" resultType="com.fdkankan.order.vo.ResponseExpansionOrder">
+        select o.id, t.child_name, o.unit, o.unit_size, c.space, o.pay_type, c.space_start_time, c.space_end_time, o.trade_time, o.pay_status, o.amount, o.order_sn, o.status, o.month from t_expansion_order o
+        LEFT JOIN t_camera_space c on o.order_sn = c.order_sn
+        LEFT JOIN t_camera t on o.camera_id = t.id
+        WHERE o.pay_status = 1 AND o.rec_status = 'A'
+        <if test=" userId != null and userId !='' " >
+            and o.user_id = ${userId}
+        </if>
+        <if test=" childName != null and childName !='' " >
+            and c.child_name like concat('%',#{childName},'%')
+        </if>
+        <if test=" cameraId != null and cameraId !='' " >
+            and o.camera_id = ${cameraId}
+        </if>
+        <if test="orderBy != null">
+            order by ${orderBy}
+        </if>
+        limit ${start}, ${pageSize}
+    </select>
+
+    <select id="getExpansionCountByParam" resultType="integer">
+        select count (*) from t_expansion_order o
+        WHERE o.pay_status = 1 AND o.rec_status = 'A'
+        <if test=" userId != null and userId !='' " >
+            and o.user_id = ${userId}
+        </if>
+        <if test=" childName != null and childName !='' " >
+            and c.child_name like concat('%',#{childName},'%')
+        </if>
+        <if test=" cameraId != null and cameraId !='' " >
+            and o.camera_id = ${cameraId}
+        </if>
+    </select>
+
 </mapper>

4dkankan-center-platform/src/main/resources/mapper/order/VirtualOrderMapper.xml

@@ -17,12 +17,14 @@
         <if test=" cameraId != null and cameraId !='' " >
             and o.camera_id = ${cameraId}
         </if>
+        <if test="orderBy != null">
+            order by ${orderBy}
+        </if>
         limit ${start}, ${pageSize}
     </select>
 
     <select id="getChargeCountByParam" resultType="integer">
-        SELECT count (*) from t_virtual_order o
-        LEFT JOIN t_camera c on o.camera_id = c.id  WHERE o.rec_status = 'A' and o.pay_status = 1   and o.pay_type = 0
+        SELECT count (*) from t_virtual_order o WHERE o.rec_status = 'A' and o.pay_status = 1   and o.pay_type = 0
         <if test=" userId != null and userId !='' " >
             and o.user_id = ${userId}
         </if>