Przeglądaj źródła

订单管理/权益订单,下载订单】

lyhzzz 3 lat temu
rodzic
commit
cfa21eb306
44 zmienionych plików z 852 dodań i 345 usunięć
  1. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/AgentController.java
  2. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CameraDetailController.java
  3. 53 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CameraOrderController.java
  4. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CameraOutController.java
  5. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CameraSpaceController.java
  6. 40 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/DownOrderController.java
  7. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/DownloadOrderController.java
  8. 24 5
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/IncrementOrderController.java
  9. 29 11
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/InvoiceController.java
  10. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/InvoiceRegisterController.java
  11. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/OrderController.java
  12. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneCooperationController.java
  13. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneCopyLogController.java
  14. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneDownloadLogController.java
  15. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneProEditController.java
  16. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneResourceCameraController.java
  17. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneResourceCooperationController.java
  18. 0 21
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/UserIncrementController.java
  19. 112 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/entity/OrderItem.java
  20. 1 1
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/generate/AutoGenerate.java
  21. 4 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IDownloadOrderMapper.java
  22. 5 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IIncrementOrderMapper.java
  23. 23 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IOrderItemMapper.java
  24. 4 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IOrderMapper.java
  25. 8 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IDownloadOrderService.java
  26. 5 3
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IExcelService.java
  27. 8 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IIncrementOrderService.java
  28. 20 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IOrderItemService.java
  29. 8 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IOrderService.java
  30. 47 1
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/DownloadOrderServiceImpl.java
  31. 22 26
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/ExcelServiceImpl.java
  32. 47 1
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/IncrementOrderServiceImpl.java
  33. 29 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/OrderItemServiceImpl.java
  34. 47 1
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/OrderServiceImpl.java
  35. 14 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/request/OrderParam.java
  36. 64 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/DownOrderVo.java
  37. 61 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java
  38. 11 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/OrderItemVo.java
  39. 83 0
      4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/OrderVo.java
  40. 2 2
      4dkankan-center-manage/src/main/resources/mapper/manage/CameraMapper.xml
  41. 23 0
      4dkankan-center-manage/src/main/resources/mapper/manage/DownloadOrderMapper.xml
  42. 21 0
      4dkankan-center-manage/src/main/resources/mapper/manage/IncrementOrderMapper.xml
  43. 10 0
      4dkankan-center-manage/src/main/resources/mapper/manage/OrderItemMapper.xml
  44. 27 0
      4dkankan-center-manage/src/main/resources/mapper/manage/OrderMapper.xml

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/AgentController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 代理商表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-05-27
- */
-@RestController
-@RequestMapping("/manage/agent")
-public class AgentController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CameraDetailController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 相机子表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-16
- */
-@RestController
-@RequestMapping("/manage/cameraDetail")
-public class CameraDetailController {
-
-}
-

+ 53 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CameraOrderController.java

@@ -0,0 +1,53 @@
+package com.fdkankan.manage.controller;
+
+
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.service.IOrderItemService;
+import com.fdkankan.manage.service.IOrderService;
+import com.fdkankan.manage.vo.request.OrderParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 订单表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-06-20
+ */
+@RestController
+@RequestMapping("/service/manage/order/camera")
+public class CameraOrderController {
+
+    @Autowired
+    IOrderService orderService;
+    @Autowired
+    IOrderItemService orderItemService;
+
+    @PostMapping("/list")
+    public ResultData list(@RequestBody OrderParam param){
+        return ResultData.ok(orderService.pageList(param));
+    }
+
+    @GetMapping("/item")
+    public ResultData item(@RequestParam (required = false) Long id){
+        if(id == null){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        return ResultData.ok(orderItemService.getByOrderId(id));
+    }
+
+    @GetMapping("/export")
+    public void export(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+        orderService.export(req,resp);
+    }
+
+
+}
+

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CameraOutController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 相机出库表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-16
- */
-@RestController
-@RequestMapping("/manage/cameraOut")
-public class CameraOutController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CameraSpaceController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 相机容量表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-17
- */
-@RestController
-@RequestMapping("/manage/cameraSpace")
-public class CameraSpaceController {
-
-}
-

+ 40 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/DownOrderController.java

@@ -0,0 +1,40 @@
+package com.fdkankan.manage.controller;
+
+
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.service.IDownloadOrderService;
+import com.fdkankan.manage.vo.request.OrderParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 订单表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-06-20
+ */
+@RestController
+@RequestMapping("/service/manage/order/down")
+public class DownOrderController {
+
+    @Autowired
+    IDownloadOrderService downloadOrderService;
+
+    @PostMapping("/list")
+    public ResultData list(@RequestBody OrderParam param){
+        return ResultData.ok(downloadOrderService.pageList(param));
+    }
+
+
+    @GetMapping("/export")
+    public void export(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+        downloadOrderService.export(req,resp);
+    }
+
+}
+

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/DownloadOrderController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 下载次数订单表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-05-31
- */
-@RestController
-@RequestMapping("/manage/downloadOrder")
-public class DownloadOrderController {
-
-}
-

+ 24 - 5
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/IncrementOrderController.java

@@ -1,21 +1,40 @@
 package com.fdkankan.manage.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.service.IIncrementOrderService;
+import com.fdkankan.manage.vo.request.OrderParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
- * 增值权益订单表 前端控制器
+ * 订单表 前端控制器
  * </p>
  *
  * @author 
- * @since 2022-05-31
+ * @since 2022-06-20
  */
 @RestController
-@RequestMapping("/manage/incrementOrder")
+@RequestMapping("/service/manage/order/Increment")
 public class IncrementOrderController {
 
+    @Autowired
+    IIncrementOrderService incrementOrderService;
+
+    @PostMapping("/list")
+    public ResultData list(@RequestBody OrderParam param){
+        return ResultData.ok(incrementOrderService.pageList(param));
+    }
+
+
+    @GetMapping("/export")
+    public void export(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+        incrementOrderService.export(req,resp);
+    }
+
 }
 

+ 29 - 11
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/InvoiceController.java

@@ -1,25 +1,21 @@
 package com.fdkankan.manage.controller;
 
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.controller.BaseController;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.service.IExcelService;
 import com.fdkankan.manage.service.IInvoiceService;
-import com.fdkankan.manage.service.IOrderService;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
 import com.fdkankan.manage.vo.InvoiceVO;
-import java.io.IOException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+
 /**
  * <p>
  * 发票表 前端控制器
@@ -84,8 +80,30 @@ public class InvoiceController extends BaseController {
      * @throws IOException
      */
     @PostMapping("/export")
-    public void export(@RequestBody InvoicePageParamVO param) throws IOException {
-        excelService.exportInvoice(request, response, param);
+    public void export(@RequestBody InvoicePageParamVO param) throws Exception {
+        param.setPageNum(1);
+        param.setPageSize(5000);
+        Page<InvoiceVO> invoiceVOPage = invoiceService.pageInvoice(param);
+
+        ExcelWriter excelWriter = null;
+        try {
+            excelWriter = EasyExcel.write(response.getOutputStream(),InvoiceVO.class).build();
+            for (int pageNum = 1; pageNum <= invoiceVOPage.getPages(); pageNum ++ ) {
+                if(pageNum >1){
+                    param.setPageNum(pageNum);
+                    invoiceVOPage = invoiceService.pageInvoice(param);
+                }
+                excelService.commonExport(request,response,"开票申请数据",invoiceVOPage.getRecords(),excelWriter);
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if(excelWriter != null){
+                excelWriter.finish();
+            }
+        }
+
     }
 }
 

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/InvoiceRegisterController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 开票登记表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-02
- */
-@RestController
-@RequestMapping("/manage/invoiceRegister")
-public class InvoiceRegisterController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/OrderController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 订单表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-20
- */
-@RestController
-@RequestMapping("/manage/order")
-public class OrderController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneCooperationController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-17
- */
-@RestController
-@RequestMapping("/manage/sceneCooperation")
-public class SceneCooperationController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneCopyLogController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-22
- */
-@RestController
-@RequestMapping("/manage/sceneCopyLog")
-public class SceneCopyLogController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneDownloadLogController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-23
- */
-@RestController
-@RequestMapping("/manage/sceneDownloadLog")
-public class SceneDownloadLogController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneProEditController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * pro场景编辑数据表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-23
- */
-@RestController
-@RequestMapping("/manage/sceneProEdit")
-public class SceneProEditController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneResourceCameraController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 场景资源和相机关联表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-17
- */
-@RestController
-@RequestMapping("/manage/sceneResourceCamera")
-public class SceneResourceCameraController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneResourceCooperationController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 场景资源和协作用户关联表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-17
- */
-@RestController
-@RequestMapping("/manage/sceneResourceCooperation")
-public class SceneResourceCooperationController {
-
-}
-

+ 0 - 21
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/UserIncrementController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 用户增值权益表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-06-16
- */
-@RestController
-@RequestMapping("/manage/userIncrement")
-public class UserIncrementController {
-
-}
-

+ 112 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/entity/OrderItem.java

@@ -0,0 +1,112 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 订单项表
+ * </p>
+ *
+ * @author 
+ * @since 2022-06-23
+ */
+@Getter
+@Setter
+@TableName("t_order_item")
+public class OrderItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 商品名称
+     */
+    @TableField("goods_name")
+    private String goodsName;
+
+    /**
+     * 商品价格
+     */
+    @TableField("goods_price")
+    private BigDecimal goodsPrice;
+
+    /**
+     * 商品数量
+     */
+    @TableField("goods_count")
+    private Integer goodsCount;
+
+    /**
+     * 商品编码
+     */
+    @TableField("goods_sn")
+    private String goodsSn;
+
+    /**
+     * sku编号,唯一
+     */
+    @TableField("sku_sn")
+    private String skuSn;
+
+    /**
+     * 商品表t_goods的id
+     */
+    @TableField("goods_id")
+    private Long goodsId;
+
+    /**
+     * 订单表t_order的id
+     */
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 快递公司
+     */
+    @TableField("express_name")
+    private String expressName;
+
+    /**
+     * 快递单号
+     */
+    @TableField("express_num")
+    private String expressNum;
+
+    /**
+     * 配送状态
+     */
+    @TableField("shipping_status")
+    private String shippingStatus;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 记录的状态,A: 生效,I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

+ 1 - 1
4dkankan-center-manage/src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") + "\\4dkankan-center-manage";
 
         generate(path,"manage", getTables(new String[]{
-                "t_scene_download_log"
+                "t_order_item"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

+ 4 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IDownloadOrderMapper.java

@@ -1,7 +1,10 @@
 package com.fdkankan.manage.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.DownloadOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.vo.request.OrderParam;
+import com.fdkankan.manage.vo.response.DownOrderVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IDownloadOrderMapper extends BaseMapper<DownloadOrder> {
 
+    Page<DownOrderVo> pageList(Page<DownOrderVo> page, OrderParam param);
 }

+ 5 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IIncrementOrderMapper.java

@@ -1,7 +1,11 @@
 package com.fdkankan.manage.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.IncrementOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.vo.request.OrderParam;
+import com.fdkankan.manage.vo.response.IncrementOrderVo;
+import com.fdkankan.manage.vo.response.OrderVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IIncrementOrderMapper extends BaseMapper<IncrementOrder> {
 
+    Page<IncrementOrderVo> pageList(Page<OrderVo> page, OrderParam param);
 }

+ 23 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IOrderItemMapper.java

@@ -0,0 +1,23 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.OrderItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.vo.response.OrderItemVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单项表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-06-23
+ */
+@Mapper
+public interface IOrderItemMapper extends BaseMapper<OrderItem> {
+
+    List<OrderItemVo> getByOrderId(@Param("orderId") Long orderId);
+}

+ 4 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IOrderMapper.java

@@ -1,7 +1,10 @@
 package com.fdkankan.manage.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.Order;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.vo.request.OrderParam;
+import com.fdkankan.manage.vo.response.OrderVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IOrderMapper extends BaseMapper<Order> {
 
+    Page<OrderVo> pageList(Page<OrderVo> page, OrderParam param);
 }

+ 8 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IDownloadOrderService.java

@@ -1,7 +1,12 @@
 package com.fdkankan.manage.service;
 
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.DownloadOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.OrderParam;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -13,4 +18,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IDownloadOrderService extends IService<DownloadOrder> {
 
+    PageInfo pageList(OrderParam param);
+
+    void export(HttpServletRequest req, HttpServletResponse resp);
 }

+ 5 - 3
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IExcelService.java

@@ -1,11 +1,12 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.manage.vo.InvoicePageParamVO;
+import com.alibaba.excel.ExcelWriter;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -17,8 +18,9 @@ import java.io.IOException;
  **/
 public interface IExcelService {
 
-    public void exportInvoice(HttpServletRequest request, HttpServletResponse response, InvoicePageParamVO param)
-        throws IOException;
+    void commonExport(HttpServletRequest request, HttpServletResponse response, String name, List<?> result, ExcelWriter excelWriter) throws Exception ;
+
+    void commonExport(HttpServletRequest request, HttpServletResponse response,String name,List<?> result,Class<?> clazz) throws Exception;
 
     Integer uploadExcel(MultipartFile file, Integer type) throws IOException;
 }

+ 8 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IIncrementOrderService.java

@@ -1,7 +1,12 @@
 package com.fdkankan.manage.service;
 
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.IncrementOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.OrderParam;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -13,4 +18,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IIncrementOrderService extends IService<IncrementOrder> {
 
+    PageInfo pageList(OrderParam param);
+
+    void export(HttpServletRequest req, HttpServletResponse resp);
 }

+ 20 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IOrderItemService.java

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.OrderItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.response.OrderItemVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单项表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-06-23
+ */
+public interface IOrderItemService extends IService<OrderItem> {
+
+    List<OrderItemVo> getByOrderId(Long orderId);
+}

+ 8 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IOrderService.java

@@ -1,8 +1,12 @@
 package com.fdkankan.manage.service;
 
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.Order;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.OrderParam;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -16,4 +20,8 @@ import java.util.List;
 public interface IOrderService extends IService<Order> {
 
     List<String> getOrderSn(String content);
+
+    PageInfo pageList(OrderParam param);
+
+    void export(HttpServletRequest req, HttpServletResponse resp) throws Exception;
 }

+ 47 - 1
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/DownloadOrderServiceImpl.java

@@ -1,11 +1,22 @@
 package com.fdkankan.manage.service.impl;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.DownloadOrder;
 import com.fdkankan.manage.mapper.IDownloadOrderMapper;
 import com.fdkankan.manage.service.IDownloadOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.IExcelService;
+import com.fdkankan.manage.vo.request.OrderParam;
+import com.fdkankan.manage.vo.response.DownOrderVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * <p>
  * 下载次数订单表 服务实现类
@@ -17,4 +28,39 @@ import org.springframework.stereotype.Service;
 @Service
 public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper, DownloadOrder> implements IDownloadOrderService {
 
+    @Autowired
+    IExcelService excelService;
+
+    @Override
+    public PageInfo pageList(OrderParam param) {
+        Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        return PageInfo.PageInfo(page);
+    }
+
+    @Override
+    public void export(HttpServletRequest req, HttpServletResponse resp) {
+        OrderParam orderParam = new OrderParam();
+        orderParam.setPageNum(1);
+        orderParam.setPageSize(5000);
+        Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(orderParam.getPageNum(),orderParam.getPageSize()),orderParam);
+
+        ExcelWriter excelWriter = null;
+        try {
+            excelWriter = EasyExcel.write(resp.getOutputStream(),DownOrderVo.class).build();
+            excelService.commonExport(req,resp,"下载订单",page.getRecords(),excelWriter);
+            while (page.hasNext()){
+                orderParam.setPageNum(orderParam.getPageNum()+1);
+                page = this.getBaseMapper().pageList(new Page<>(orderParam.getPageNum(),orderParam.getPageSize()),orderParam);
+                if(page.getRecords().size() >0){
+                    excelService.commonExport(req,resp,"下载订单",page.getRecords(),excelWriter);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if(excelWriter !=null){
+                excelWriter.finish();
+            }
+        }
+    }
 }

+ 22 - 26
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/ExcelServiceImpl.java

@@ -1,21 +1,15 @@
 package com.fdkankan.manage.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.manage.constant.CameraOutTypeEnum;
 import com.fdkankan.manage.entity.Company;
 import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.ICompanyService;
 import com.fdkankan.manage.service.IExcelService;
-import com.fdkankan.manage.service.IInvoiceService;
 import com.fdkankan.manage.util.ExcelUtil;
-import com.fdkankan.manage.vo.InvoicePageParamVO;
-import com.fdkankan.manage.vo.InvoiceVO;
 import com.fdkankan.manage.vo.request.CameraInOutParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,7 +20,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 
@@ -42,34 +35,37 @@ import java.util.List;
 public class ExcelServiceImpl implements IExcelService {
 
     @Autowired
-    private IInvoiceService invoiceService;
-    @Autowired
     ICompanyService companyService;
     @Autowired
     ICameraService cameraService;
 
-    @Override
-    public void exportInvoice(HttpServletRequest request, HttpServletResponse response, InvoicePageParamVO param)
-        throws IOException {
+    public void commonExport(HttpServletRequest request, HttpServletResponse response,String name,List<?> result,ExcelWriter excelWriter) throws Exception {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        String fileName = "开票申请数据" + DateUtil.format(Calendar.getInstance().getTime(), DateExtUtil.dateStyle6) + ".xlsx";
+        String fileName = name  + ".xlsx";
         fileName = URLEncoder.encode(fileName, "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), InvoiceVO.class).build()) {
-            // 这里注意 如果同一个sheet只要创建一次
-            WriteSheet writeSheet = EasyExcel.writerSheet("开票申请数据").build();
-            // 去调用写入,这里我调用了五次,实际使用时根据数据库分页的总的页数来
-            int pageNum = 1;
-            param.setPageSize(5000);
-            Page<InvoiceVO> invoiceVOPage;
-            do {
-                param.setPageNum(pageNum);
-                invoiceVOPage = invoiceService.pageInvoice(param);
-                excelWriter.write(invoiceVOPage.getRecords(), writeSheet);
-                ++pageNum;
+        WriteSheet writeSheet = EasyExcel.writerSheet(name).build();
+        excelWriter.write(result, writeSheet);
+    }
 
-            }while (invoiceVOPage.hasNext());
+    public void commonExport(HttpServletRequest request, HttpServletResponse response,String name,List<?> result,Class<?> clazz) throws Exception {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        String fileName = name  + ".xlsx";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName);
+        ExcelWriter excelWriter = null;
+        try {
+            excelWriter = EasyExcel.write(response.getOutputStream(), clazz).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet(name).build();
+            excelWriter.write(result, writeSheet);
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if(excelWriter != null){
+                excelWriter.finish();
+            }
         }
     }
 

+ 47 - 1
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/IncrementOrderServiceImpl.java

@@ -1,11 +1,22 @@
 package com.fdkankan.manage.service.impl;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.IncrementOrder;
 import com.fdkankan.manage.mapper.IIncrementOrderMapper;
+import com.fdkankan.manage.service.IExcelService;
 import com.fdkankan.manage.service.IIncrementOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.vo.request.OrderParam;
+import com.fdkankan.manage.vo.response.IncrementOrderVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * <p>
  * 增值权益订单表 服务实现类
@@ -17,4 +28,39 @@ import org.springframework.stereotype.Service;
 @Service
 public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper, IncrementOrder> implements IIncrementOrderService {
 
+    @Autowired
+    IExcelService excelService;
+
+    @Override
+    public PageInfo pageList(OrderParam param) {
+        Page<IncrementOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        return PageInfo.PageInfo(page);
+    }
+
+    @Override
+    public void export(HttpServletRequest req, HttpServletResponse resp) {
+        OrderParam orderParam = new OrderParam();
+        orderParam.setPageNum(1);
+        orderParam.setPageSize(5000);
+        Page<IncrementOrderVo> page = this.getBaseMapper().pageList(new Page<>(orderParam.getPageNum(),orderParam.getPageSize()),orderParam);
+
+        ExcelWriter excelWriter = null;
+        try {
+            excelWriter = EasyExcel.write(resp.getOutputStream(),IncrementOrderVo.class).build();
+            excelService.commonExport(req,resp,"权益订单",page.getRecords(),excelWriter);
+            while (page.hasNext()){
+                orderParam.setPageNum(orderParam.getPageNum() +1);
+                page = this.getBaseMapper().pageList(new Page<>(orderParam.getPageNum(),orderParam.getPageSize()),orderParam);
+                if(page.getRecords().size() >0){
+                    excelService.commonExport(req,resp,"权益订单",page.getRecords(),excelWriter);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if(excelWriter !=null){
+                excelWriter.finish();
+            }
+        }
+    }
 }

+ 29 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/OrderItemServiceImpl.java

@@ -0,0 +1,29 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.entity.OrderItem;
+import com.fdkankan.manage.mapper.IOrderItemMapper;
+import com.fdkankan.manage.service.IOrderItemService;
+import com.fdkankan.manage.vo.response.OrderItemVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单项表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-06-23
+ */
+@Service
+public class OrderItemServiceImpl extends ServiceImpl<IOrderItemMapper, OrderItem> implements IOrderItemService {
+
+
+
+    @Override
+    public List<OrderItemVo> getByOrderId(Long orderId) {
+        return this.baseMapper.getByOrderId(orderId);
+    }
+}

+ 47 - 1
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/OrderServiceImpl.java

@@ -1,12 +1,22 @@
 package com.fdkankan.manage.service.impl;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.Order;
 import com.fdkankan.manage.mapper.IOrderMapper;
+import com.fdkankan.manage.service.IExcelService;
 import com.fdkankan.manage.service.IOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.vo.request.OrderParam;
+import com.fdkankan.manage.vo.response.OrderVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -20,6 +30,8 @@ import java.util.stream.Collectors;
  */
 @Service
 public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implements IOrderService {
+    @Autowired
+    IExcelService excelService;
 
     @Override
     public List<String> getOrderSn(String content) {
@@ -27,4 +39,38 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
         wrapper.like(Order::getOrderSn,content);
         return this.list(wrapper).parallelStream().map(Order::getOrderSn).collect(Collectors.toList());
     }
+
+    @Override
+    public PageInfo pageList(OrderParam param) {
+        Page<OrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        return PageInfo.PageInfo(page);
+    }
+
+    @Override
+    public void export(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+        OrderParam param = new OrderParam();
+        param.setPageNum(1);
+        param.setPageSize(5000);
+        Page<OrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+
+        ExcelWriter excelWriter = null;
+        try {
+            excelWriter = EasyExcel.write(resp.getOutputStream(),OrderVo.class).build();
+            excelService.commonExport(req,resp,"相机订单",page.getRecords(),excelWriter);
+            while (page.hasNext()){
+                param.setPageNum(param.getPageNum() +1);
+                page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+                if(page.getRecords().size() > 0){
+                    excelService.commonExport(req,resp,"相机订单",page.getRecords(),excelWriter);
+
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if(excelWriter != null){
+                excelWriter.finish();
+            }
+        }
+    }
 }

+ 14 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/request/OrderParam.java

@@ -0,0 +1,14 @@
+package com.fdkankan.manage.vo.request;
+
+import com.fdkankan.common.request.RequestBase;
+import lombok.Data;
+
+@Data
+public class OrderParam extends RequestBase {
+    private String orderSn;
+    private String userName;
+    private String startTime;
+    private String endTime;
+    private String tradeNum;
+    private String expressNum;
+}

+ 64 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/DownOrderVo.java

@@ -0,0 +1,64 @@
+package com.fdkankan.manage.vo.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class DownOrderVo {
+
+    @ExcelProperty("序号")
+    private Long id;
+
+    @ExcelProperty("下单时间")
+    private String createTime;               //下单时间
+
+    @ExcelProperty("订单号")
+    private String orderSn;                 //订单号
+
+    @ExcelProperty("用户账号")
+    private String userName;                //用户账号
+
+    @ExcelProperty("相机sn码")
+    private String snCode;             //相机sn码
+
+    @ExcelProperty("场景码")
+    private String sceneNum;             //场景码
+
+    @ExcelProperty("订单金额")
+    private BigDecimal amount;              //订单金额
+
+    @ExcelProperty("支付方式")
+    private String payType;               //支付方式 付款方式,0表示微信,1表示支付宝,2表示paypal,3表示其他,4表示货到付款
+
+    @ExcelProperty("交易号")
+    private String number;                //交易号
+
+    @ExcelProperty("付款状态")
+    private String payStatus;           //付款状态(状态,0或-1表示未付款,-2表示已退款,1表示已付款
+
+
+    public String getPayType() {
+        switch (payType){
+            case "0" : return "微信";
+            case "1" : return "支付宝";
+            case "2" : return "paypal";
+            case "3" : return "其他";
+            case "4" : return "货到付款";
+            default: return "";
+        }
+    }
+
+
+    public String getPayStatus() {
+        switch (payStatus){
+            case "-1" :
+            case "0" :
+                return "未付款";
+            case "-2" : return "已退款";
+            case "1" : return "已付款";
+            default: return "";
+        }
+    }
+}

+ 61 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -0,0 +1,61 @@
+package com.fdkankan.manage.vo.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class IncrementOrderVo {
+
+    @ExcelProperty("序号")
+    private Long id;
+
+    @ExcelProperty("下单时间")
+    private String createTime;               //下单时间
+
+    @ExcelProperty("订单号")
+    private String orderSn;                 //订单号
+
+    @ExcelProperty("用户账号")
+    private String userName;                //用户账号
+
+    @ExcelProperty("订单金额")
+    private BigDecimal amount;              //订单金额
+
+    @ExcelProperty("数量")
+    private BigDecimal count;             //数量
+
+    @ExcelProperty("支付方式")
+    private String payType;               //支付方式 付款方式,0表示微信,1表示支付宝,2表示paypal,3表示其他,4表示货到付款
+
+    @ExcelProperty("交易号")
+    private String number;                //交易号
+
+    @ExcelProperty("付款状态")
+    private String payStatus;           //付款状态(状态,0或-1表示未付款,-2表示已退款,1表示已付款
+
+
+    public String getPayType() {
+        switch (payType){
+            case "0" : return "微信";
+            case "1" : return "支付宝";
+            case "2" : return "paypal";
+            case "3" : return "其他";
+            case "4" : return "货到付款";
+            default: return "";
+        }
+    }
+
+
+    public String getPayStatus() {
+        switch (payStatus){
+            case "-1" :
+            case "0" :
+                return "未付款";
+            case "-2" : return "已退款";
+            case "1" : return "已付款";
+            default: return "";
+        }
+    }
+}

+ 11 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/OrderItemVo.java

@@ -0,0 +1,11 @@
+package com.fdkankan.manage.vo.response;
+
+import lombok.Data;
+
+@Data
+public class OrderItemVo {
+    private String goodsName;
+    private String goodsPrice;
+    private String goodsCount;
+    private String goodsPic;
+}

+ 83 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/OrderVo.java

@@ -0,0 +1,83 @@
+package com.fdkankan.manage.vo.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OrderVo {
+
+    @ExcelProperty("序号")
+    private Long id;
+
+    @ExcelProperty("下单时间")
+    private String orderTime;               //下单时间
+
+    @ExcelProperty("订单号")
+    private String orderSn;                 //订单号
+
+    @ExcelProperty("用户账号")
+    private String userName;                //用户账号
+
+    @ExcelProperty("订单金额")
+    private BigDecimal goodsAmount;         //订单金额
+
+    @ExcelProperty("支付方式")
+    private String paymentTypeName;        //支付方式 付款方式,0表示微信,1表示支付宝,2表示paypal,3表示其他,4表示货到付款
+
+    @ExcelProperty("交易号")
+    private String tradeNum;                //交易号
+
+    @ExcelProperty("订单状态")
+    private String orderStatus;             // 订单状态(未处理unprocessed、已确认processed、已完成completed、已取消invalid、过期expire)
+
+    @ExcelProperty("付款状态")
+    private String paymentStatus;           //付款状态(未付款unpaid、已付款paid、已取消cancel, 部分支付partPayment, 部分退款partRefund, 全额退款refunded)
+
+    @ExcelProperty("收货地区")
+    private String shipAreaPath;
+
+    @ExcelProperty("收货详细地址")
+    private String shipAddress;
+
+    @ExcelProperty("收货手机号码")
+    private String shipMobile;
+
+    @ExcelProperty("收货名称")
+    private String shipName;
+
+    public String getPaymentTypeName() {
+        switch (paymentTypeName){
+            case "0" : return "微信";
+            case "1" : return "支付宝";
+            case "2" : return "paypal";
+            case "3" : return "其他";
+            case "4" : return "货到付款";
+            default: return "";
+        }
+    }
+
+    public String getOrderStatus() {
+        switch (orderStatus){
+            case "unprocessed" : return "未处理";
+            case "processed" : return "已确认";
+            case "completed" : return "已完成";
+            case "invalid" : return "已取消";
+            case "expire" : return "过期";
+            default: return "";
+        }
+    }
+
+    public String getPaymentStatus() {
+        switch (paymentStatus){
+            case "unpaid" : return "未付款";
+            case "paid" : return "已付款";
+            case "cancel" : return "已取消";
+            case "partPayment" : return "部分支付";
+            case "partRefund" : return "部分退款";
+            case "refunded" : return "全额退款";
+            default: return "";
+        }
+    }
+}

+ 2 - 2
4dkankan-center-manage/src/main/resources/mapper/manage/CameraMapper.xml

@@ -28,10 +28,10 @@
             and u.user_name like  concat('%',#{param.userName},'%')
         </if>
         <if test="param.activatedStartTime !=null and param.activatedStartTime != '' ">
-            and c.activated_time $gt;= #{param.activatedStartTime}
+            and c.activated_time &gt;= #{param.activatedStartTime}
         </if>
         <if test="param.activatedEndTime !=null and param.activatedEndTime != '' ">
-            and c.activated_time $lt;= #{param.activatedEndTime}
+            and c.activated_time &lt;= #{param.activatedEndTime}
         </if>
         order by c.activated_time desc
     </select>

+ 23 - 0
4dkankan-center-manage/src/main/resources/mapper/manage/DownloadOrderMapper.xml

@@ -2,4 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.IDownloadOrderMapper">
 
+    <select id="pageList" resultType="com.fdkankan.manage.vo.response.DownOrderVo">
+        select o.* ,u.user_name ,c.sn_code from  t_download_order o
+        left join t_user u on o.user_id = u.id
+        left join t_scene_pro s on o.scene_num = s.num
+        left join t_camera c on s.camera_id = c.id
+        WHERE o.rec_status = 'A'
+        <if test="param.orderSn !=null and param.orderSn !='' ">
+            and o.order_sn like concat ('%',#{param.orderSn},'%')
+        </if>
+        <if test="param.userName !=null and param.userName!='' ">
+            and u.user_name like concat ('%',#{param.userName},'%')
+        </if>
+        <if test="param.tradeNum!=null and param.tradeNum != '' ">
+            and o.number like concat ('%',#{param.tradeNum},'%')
+        </if>
+        <if test="param.startTime != null and param.startTime !='' ">
+            and o.create_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime != null and param.endTime !='' ">
+            and o.create_time &lt;= #{param.endTime}
+        </if>
+        order by o.create_time desc
+    </select>
 </mapper>

+ 21 - 0
4dkankan-center-manage/src/main/resources/mapper/manage/IncrementOrderMapper.xml

@@ -2,4 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.IIncrementOrderMapper">
 
+    <select id="pageList" resultType="com.fdkankan.manage.vo.response.IncrementOrderVo">
+        select o.* ,u.user_name from  t_increment_order o
+        left join t_user u on o.user_id = u.id
+        WHERE o.rec_status = 'A'
+        <if test="param.orderSn !=null and param.orderSn !='' ">
+            and o.order_sn like concat ('%',#{param.orderSn},'%')
+        </if>
+        <if test="param.userName !=null and param.userName!='' ">
+            and u.user_name like concat ('%',#{param.userName},'%')
+        </if>
+        <if test="param.tradeNum!=null and param.tradeNum != '' ">
+            and o.number like concat ('%',#{param.tradeNum},'%')
+        </if>
+        <if test="param.startTime != null and param.startTime !='' ">
+            and o.create_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime != null and param.endTime !='' ">
+            and o.create_time &lt;= #{param.endTime}
+        </if>
+        order by o.create_time desc
+    </select>
 </mapper>

+ 10 - 0
4dkankan-center-manage/src/main/resources/mapper/manage/OrderItemMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IOrderItemMapper">
+
+    <select id="getByOrderId" resultType="com.fdkankan.manage.vo.response.OrderItemVo">
+        SELECT item.goods_name,item.goods_price,item.goods_count,g.pic as goodsPic
+        from t_order_item item  LEFT JOIN t_goods g on item.goods_id = g.id
+        WHERE order_id = #{orderId}
+    </select>
+</mapper>

+ 27 - 0
4dkankan-center-manage/src/main/resources/mapper/manage/OrderMapper.xml

@@ -2,4 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.IOrderMapper">
 
+    <select id="pageList" resultType="com.fdkankan.manage.vo.response.OrderVo">
+        SELECT distinct o.id,o.order_time ,o.order_sn ,u.user_name ,o.goods_amount,o.payment_type_name,o.trade_num,o.order_status,o.payment_status,
+        o.ship_address,o.ship_area_path,o.ship_mobile,o.ship_name
+        FROM t_order o
+        LEFT JOIN t_user u on o.user_id = u.id
+        LEFT JOIN t_order_item item on o.id = item.order_id
+        WHERE o.rec_status = 'A' and o.payment_status != 'unpaid'
+        <if test="param.orderSn !=null and param.orderSn !='' ">
+            and o.order_sn like concat ('%',#{param.orderSn},'%')
+        </if>
+        <if test="param.userName !=null and param.userName!='' ">
+            and u.user_name like concat ('%',#{param.userName},'%')
+        </if>
+        <if test="param.tradeNum!=null and param.tradeNum != '' ">
+            and o.trade_num like concat ('%',#{param.tradeNum},'%')
+        </if>
+        <if test="param.expressNum !=null and param.expressNum != ''">
+            and item.express_num like concat ('%',#{param.expressNum},'%')
+        </if>
+        <if test="param.startTime != null and param.startTime !='' ">
+            and o.order_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime != null and param.endTime !='' ">
+            and o.order_time &lt;= #{param.endTime}
+        </if>
+        order by o.order_time desc
+    </select>
 </mapper>