发票管理列表

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

@@ -0,0 +1,21 @@
+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 {
+
+}
+

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

@@ -0,0 +1,21 @@
+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/incrementOrder")
+public class IncrementOrderController {
+
+}
+

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

@@ -0,0 +1,48 @@
+package com.fdkankan.manage.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.service.IInvoiceService;
+import com.fdkankan.manage.vo.InvoicePageParamVO;
+import com.fdkankan.manage.vo.InvoiceVO;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
+
+/**
+ * <p>
+ * 发票表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+@RestController
+@RequestMapping("/service/manage/invoice")
+public class InvoiceController {
+
+    @Autowired
+    private IInvoiceService invoiceService;
+
+    /**
+     * <p>
+            发票管理列表
+     * </p>
+     * @author dengsixing
+     * @date 2022/6/1
+     * @param param
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.fdkankan.manage.vo.InvoiceVO>
+     **/
+    @PostMapping("/pageInvoice")
+    public Page<InvoiceVO> pageInvoice(@RequestBody InvoicePageParamVO param){
+        return invoiceService.pageInvoice(param);
+    }
+
+
+
+}
+

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

@@ -0,0 +1,21 @@
+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/order")
+public class OrderController {
+
+}
+

4dkankan-center-manage/src/main/java/com/fdkankan/manage/entity/Agent.java

@@ -3,6 +3,7 @@ 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.util.Date;
@@ -97,6 +98,7 @@ public class Agent implements Serializable {
      * 记录的状态，A: 生效，I: 禁用
      */
     @TableField("rec_status")
+    @TableLogic
     private String recStatus;
 
 

4dkankan-center-manage/src/main/java/com/fdkankan/manage/entity/DownloadOrder.java

@@ -0,0 +1,124 @@
+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-05-31
+ */
+@Getter
+@Setter
+@TableName("t_download_order")
+public class DownloadOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @TableField("order_sn")
+    private String orderSn;
+
+    /**
+     * 金额
+     */
+    @TableField("amount")
+    private BigDecimal amount;
+
+    /**
+     * 支付宝的交易号或者微信支付订单号
+     */
+    @TableField("number")
+    private String number;
+
+    /**
+     * 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他
+     */
+    @TableField("pay_type")
+    private Integer payType;
+
+    /**
+     * 状态，0或-1表示未付款，-2表示已退款,1表示已付款
+     */
+    @TableField("pay_status")
+    private Integer payStatus;
+
+    /**
+     * 状态，1增加下载次数
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 交易时间
+     */
+    @TableField("trade_time")
+    private Date tradeTime;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 购买数量
+     */
+    @TableField("count")
+    private Integer count;
+
+    /**
+     * 0表示国内订单，1表示国外订单
+     */
+    @TableField("abroad")
+    private Integer abroad;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableLogic
+    @TableField("rec_status")
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 场景码
+     */
+    @TableField("scene_num")
+    private String sceneNum;
+
+    /**
+     * 场景名
+     */
+    @TableField("scene_name")
+    private String sceneName;
+
+
+}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/entity/IncrementOrder.java

@@ -0,0 +1,118 @@
+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-05-31
+ */
+@Getter
+@Setter
+@TableName("t_increment_order")
+public class IncrementOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @TableField("order_sn")
+    private String orderSn;
+
+    /**
+     * 金额
+     */
+    @TableField("amount")
+    private BigDecimal amount;
+
+    /**
+     * 支付宝的交易号或者微信支付订单号
+     */
+    @TableField("number")
+    private String number;
+
+    /**
+     * 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他
+     */
+    @TableField("pay_type")
+    private Integer payType;
+
+    /**
+     * 状态，0或-1表示未付款，-2表示已退款,1表示已付款
+     */
+    @TableField("pay_status")
+    private Integer payStatus;
+
+    /**
+     * 状态，1表示新增值权益，2表示续费增值权益  3表示增值权益1月
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 交易时间
+     */
+    @TableField("trade_time")
+    private Date tradeTime;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 增值权益表t_user_increment的id,status为2时才有
+     */
+    @TableField("increment_id")
+    private Long incrementId;
+
+    /**
+     * 购买数量
+     */
+    @TableField("count")
+    private Integer count;
+
+    /**
+     * 0表示国内订单，1表示国外订单
+     */
+    @TableField("abroad")
+    private Integer abroad;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableLogic
+    @TableField("rec_status")
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/entity/Invoice.java

@@ -0,0 +1,232 @@
+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-05-31
+ */
+@Getter
+@Setter
+@TableName("t_invoice")
+public class Invoice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 订单表t_order的id
+     */
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 订单表t_virtual_order的id  消费
+     */
+    @TableField("virtual_order_id")
+    private Long virtualOrderId;
+
+    /**
+     * 订单表t_increment_order的id  权益
+     */
+    @TableField("increment_order_id")
+    private Long incrementOrderId;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 发票类型，1表示不需要发票，2表示增值税普通发票，3表示增值税专用发票
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 发票抬头(个人还是公司)
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 税号
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 公司名称
+     */
+    @TableField("organized_name")
+    private String organizedName;
+
+    /**
+     * 公司地址
+     */
+    @TableField("organized_address")
+    private String organizedAddress;
+
+    /**
+     * 注册电话
+     */
+    @TableField("register_phone")
+    private String registerPhone;
+
+    /**
+     * 开户银行
+     */
+    @TableField("bank_name")
+    private String bankName;
+
+    /**
+     * 银行账户
+     */
+    @TableField("bank_account")
+    private String bankAccount;
+
+    /**
+     * 0表示购买相机，1表示充值，2会员权益, 3下载订单
+     */
+    @TableField("consume_type")
+    private Integer consumeType;
+
+    /**
+     * 开票金额
+     */
+    @TableField("money")
+    private BigDecimal money;
+
+    /**
+     * 相机主表t_camera的id
+     */
+    @TableField("camera_id")
+    private Long cameraId;
+
+    /**
+     * 0：发票未开，1：发票已开,2:已发出
+     */
+    @TableField("finish")
+    private Integer finish;
+
+    /**
+     * 电子发票收件邮箱
+     */
+    @TableField("email_address")
+    private String emailAddress;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableLogic
+    @TableField("rec_status")
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 收货地址
+     */
+    @TableField("ship_address")
+    private String shipAddress;
+
+    /**
+     * 收货地区
+     */
+    @TableField("ship_area")
+    private String shipArea;
+
+    /**
+     * 收货地区路径
+     */
+    @TableField("ship_area_path")
+    private String shipAreaPath;
+
+    /**
+     * 收货手机
+     */
+    @TableField("ship_mobile")
+    private String shipMobile;
+
+    /**
+     * 收货人姓名
+     */
+    @TableField("ship_name")
+    private String shipName;
+
+    /**
+     * 收货电话
+     */
+    @TableField("ship_phone")
+    private String shipPhone;
+
+    /**
+     * 收货邮编
+     */
+    @TableField("ship_zip_code")
+    private String shipZipCode;
+
+    /**
+     * 发送状态：0未发送，1快递发送，2邮箱发送
+     */
+    @TableField("send")
+    private Integer send;
+
+    /**
+     * 快递公司
+     */
+    @TableField("express_company")
+    private String expressCompany;
+
+    /**
+     * 快递单号
+     */
+    @TableField("express_number")
+    private String expressNumber;
+
+    /**
+     * 电子发票存放url
+     */
+    @TableField("e_invoice")
+    private String eInvoice;
+
+    /**
+     * 备注
+     */
+    @TableField("remarks")
+    private String remarks;
+
+    /**
+     * 订单表t_download_order的id  权益
+     */
+    @TableField("download_order_id")
+    private Long downloadOrderId;
+
+
+}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/entity/Order.java

@@ -0,0 +1,202 @@
+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-05-31
+ */
+@Getter
+@Setter
+@TableName("t_order")
+public class Order implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @TableField("order_sn")
+    private String orderSn;
+
+    /**
+     * 下单时间
+     */
+    @TableField("order_time")
+    private Date orderTime;
+
+    /**
+     * 交易号
+     */
+    @TableField("trade_num")
+    private String tradeNum;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 商品总数
+     */
+    @TableField("goods_total_count")
+    private Integer goodsTotalCount;
+
+    /**
+     * 商品总额
+     */
+    @TableField("goods_amount")
+    private BigDecimal goodsAmount;
+
+    /**
+     * 订单总额
+     */
+    @TableField("total_amount")
+    private BigDecimal totalAmount;
+
+    /**
+     * 订单状态（未处理unprocessed、已确认processed、已完成completed、已取消invalid、过期expire）
+     */
+    @TableField("order_status")
+    private String orderStatus;
+
+    /**
+     * 付款状态（未付款unpaid、已付款paid、已取消cancel, 部分支付partPayment, 部分退款partRefund, 全额退款refunded）
+     */
+    @TableField("payment_status")
+    private String paymentStatus;
+
+    /**
+     * 配送状态（未发货unshipped、部分发货partShipped、已发货shipped、部分退货partReshiped、已退货reshiped、已收货received）
+     */
+    @TableField("shipping_status")
+    private String shippingStatus;
+
+    /**
+     * 已付金额
+     */
+    @TableField("paid_amount")
+    private BigDecimal paidAmount;
+
+    /**
+     * 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他，4表示货到付款
+     */
+    @TableField("payment_type_name")
+    private Integer paymentTypeName;
+
+    /**
+     * 快递费
+     */
+    @TableField("express_amount")
+    private BigDecimal expressAmount;
+
+    /**
+     * 配送方式：快递运输、自提、同城速递
+     */
+    @TableField("delivery_type_name")
+    private String deliveryTypeName;
+
+    /**
+     * 收货地址
+     */
+    @TableField("ship_address")
+    private String shipAddress;
+
+    /**
+     * 收货地区
+     */
+    @TableField("ship_area")
+    private String shipArea;
+
+    /**
+     * 收货地区路径
+     */
+    @TableField("ship_area_path")
+    private String shipAreaPath;
+
+    /**
+     * 收货手机
+     */
+    @TableField("ship_mobile")
+    private String shipMobile;
+
+    /**
+     * 收货人姓名
+     */
+    @TableField("ship_name")
+    private String shipName;
+
+    /**
+     * 收货电话
+     */
+    @TableField("ship_phone")
+    private String shipPhone;
+
+    /**
+     * 收货邮编
+     */
+    @TableField("ship_zip_code")
+    private String shipZipCode;
+
+    /**
+     * 完成时间
+     */
+    @TableField("finish_time")
+    private Date finishTime;
+
+    /**
+     * 买家附言
+     */
+    @TableField("memo")
+    private String memo;
+
+    /**
+     * 商家备注
+     */
+    @TableField("comment")
+    private String comment;
+
+    /**
+     * 0表示国内订单，1表示国外订单
+     */
+    @TableField("abroad")
+    private Integer abroad;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableLogic
+    @TableField("rec_status")
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

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

@@ -17,7 +17,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") + "\\4dkankan-center-manage";
 
         generate(path,"manage", getTables(new String[]{
-                "t_agent",
+                "t_invoice","t_order","t_increment_order","t_download_order",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

4dkankan-center-manage/src/main/java/com/fdkankan/manage/interceptor/VisitLogInterceptor.java

@@ -1,183 +1,184 @@
-package com.fdkankan.manage.interceptor;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.servlet.ServletUtil;
-import cn.hutool.http.ContentType;
-import cn.hutool.http.useragent.UserAgent;
-import cn.hutool.http.useragent.UserAgentUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.manage.bean.MenuBean;
-import com.fdkankan.manage.entity.OperLog;
-import com.fdkankan.redis.constant.RedisKey;
-import com.fdkankan.redis.util.RedisUtil;
-import io.jsonwebtoken.Claims;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.multipart.MultipartFile;
-
-@Component
-@Aspect
-@Slf4j
-public class VisitLogInterceptor {
-
-	@Autowired
-	private RedisUtil redisUtil;
-
-	@Autowired
-	private MongoTemplate mongoTemplate;
-
-	@Value("${server.servlet.context-path:null}")
-	private String contextPath;
-
-	// 切入点表达式
-	@Pointcut("execution(public * com.fdkankan.manage.controller..*.*(..))")
-	public void privilege() {
-	}
-
-	@Around("privilege()")
-	public Object around(ProceedingJoinPoint pjp) throws Throwable {
-
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-
-		//获取客户端ip
-		String clientIP = ServletUtil.getClientIP(request);
-
-		//获取uri
-		String uri = request.getRequestURI();
-		if(StrUtil.isNotEmpty(contextPath)){
-			uri = uri.replaceFirst(contextPath, "");
-		}
-
-		//获取请求方式
-		String method = request.getMethod();
-
-		//获取浏览器信息
-		String browser = this.getBrowser(request);
-
-		//获取参数
-		String params = this.getParams(pjp, request);
-
-		//获取操作路径
-		String requestPath = this.getRequestPath(uri);
-
-        //放行
-		Object result = pjp.proceed();
-
-		//获取用户信息 如果已登录，从token中获取用户信息，如果是登录接口，查询数据库获取用户信息
-		Map<String, Object> userInfo = this.getUserInfo(request, uri, result);
-		Long userId = (Long)userInfo.get("userId");
-		String userName = (String)userInfo.get("userName");
-		String nickName = (String)userInfo.get("nickName");
-
-		//写入mongodb
-		OperLog operLog = new OperLog();
-		operLog.setUserId(userId);
-		operLog.setUserName(userName);
-		operLog.setNickName(nickName);
-		operLog.setRequestPath(requestPath);
-		operLog.setUri(uri);
-		operLog.setMethod(method);
-		operLog.setParams(params);
-		operLog.setIp(clientIP);
-		operLog.setBrowser(browser);
-		operLog.setCreateTime(Calendar.getInstance().getTime());
-		mongoTemplate.insert(operLog);
-
-		return result;
-	}
-
-	private String getRequestPath(String uri){
-		String hget = redisUtil.hget(RedisKey.MANAGE_MENU, uri);
-		MenuBean menuBean = JSON.parseObject(hget, MenuBean.class);
-		LinkedList<String> menuList = new LinkedList<>();
-		this.getRequestPathHandler(menuList, menuBean);
-		StringBuilder sb = new StringBuilder();
-		menuList.stream().forEach(str->sb.append("->").append(str));
-		return sb.substring(2);
-	}
-
-	private void getRequestPathHandler(LinkedList list, MenuBean menuBean){
-		list.addFirst("[" + menuBean.getName() + "]");
-		if(Objects.isNull(menuBean.getParent())){
-			return;
-		}
-		this.getRequestPathHandler(list, menuBean.getParent());
-	}
-
-	private Map<String, Object> getUserInfo(HttpServletRequest request, String uri, Object result){
-		String token = null;
-		boolean isLogin = uri.endsWith("login");
-		if(isLogin){
-			String resultStr = JSON.toJSONString(result);
-			JSONObject jsonObject = JSON.parseObject(resultStr);
-			JSONObject data = jsonObject.getJSONObject("data");
-			token = data.getString("token");
-		}else{
-			token = request.getHeader("token");
-		}
-		Claims claims = JwtUtil.parseJWT(token);
-		Integer userId = (Integer) claims.get("userId");
-		String userName = (String)claims.get("userName");
-		String nickName = (String)claims.get("nickName");
-		Map<String, Object> userInfo = new HashMap<>();
-		userInfo.put("userId", Long.valueOf(userId));
-		userInfo.put("userName", userName);
-		userInfo.put("nickName", nickName);
-		return userInfo;
-	}
-
-	private String getParams(JoinPoint pjp, HttpServletRequest request){
-
-		// 获取参数名称
-		String[] parameterNamesArgs = ((MethodSignature) pjp.getSignature()).getParameterNames();
-		//获取请求参数值
-		Object[] args = pjp.getArgs();
-
-		Map<String, Object> paramMap = new HashMap<>();
-		String contentType = request.getContentType();
-		if(ContentType.JSON.getValue().equals(contentType)){
-			return JSON.toJSONString(args[0]);
-		}else{
-			for (int i = 0; i < args.length; i++) {
-				if(args[i] instanceof MultipartFile){
-					paramMap.put(parameterNamesArgs[i], ((MultipartFile) args[i]).getOriginalFilename());
-					continue;
-				}
-				paramMap.put(parameterNamesArgs[i], args[i]);
-			}
-		}
-		return JSON.toJSONString(paramMap);
-	}
-
-	private String getBrowser(HttpServletRequest request){
-		String userAgentStr = request.getHeader("User-Agent");
-		UserAgent userAgent = UserAgentUtil.parse(userAgentStr);
-		String browserType = userAgent.getBrowser().toString();
-		String browserVersion = userAgent.getVersion();
-		String browserFormat = "%s(版本%s)";
-		return  String.format(browserFormat, browserType, browserVersion);
-	}
-
-}
-
+//package com.fdkankan.manage.interceptor;
+//
+//import cn.hutool.core.util.StrUtil;
+//import cn.hutool.extra.servlet.ServletUtil;
+//import cn.hutool.http.ContentType;
+//import cn.hutool.http.useragent.UserAgent;
+//import cn.hutool.http.useragent.UserAgentUtil;
+//import cn.hutool.poi.excel.ExcelUtil;
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.fdkankan.common.util.JwtUtil;
+//import com.fdkankan.manage.bean.MenuBean;
+//import com.fdkankan.manage.entity.OperLog;
+//import com.fdkankan.redis.constant.RedisKey;
+//import com.fdkankan.redis.util.RedisUtil;
+//import io.jsonwebtoken.Claims;
+//import java.util.Arrays;
+//import java.util.Calendar;
+//import java.util.Date;
+//import java.util.HashMap;
+//import java.util.LinkedList;
+//import java.util.Map;
+//import java.util.Objects;
+//import javax.servlet.http.HttpServletRequest;
+//import lombok.extern.slf4j.Slf4j;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.ProceedingJoinPoint;
+//import org.aspectj.lang.annotation.Around;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.aspectj.lang.reflect.MethodSignature;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.data.mongodb.core.MongoTemplate;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.context.request.RequestContextHolder;
+//import org.springframework.web.context.request.ServletRequestAttributes;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//@Component
+//@Aspect
+//@Slf4j
+//public class VisitLogInterceptor {
+//
+//	@Autowired
+//	private RedisUtil redisUtil;
+//
+//	@Autowired
+//	private MongoTemplate mongoTemplate;
+//
+//	@Value("${server.servlet.context-path:null}")
+//	private String contextPath;
+//
+//	// 切入点表达式
+//	@Pointcut("execution(public * com.fdkankan.manage.controller..*.*(..))")
+//	public void privilege() {
+//	}
+//
+//	@Around("privilege()")
+//	public Object around(ProceedingJoinPoint pjp) throws Throwable {
+//
+//		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+//
+//		//获取客户端ip
+//		String clientIP = ServletUtil.getClientIP(request);
+//
+//		//获取uri
+//		String uri = request.getRequestURI();
+//		if(StrUtil.isNotEmpty(contextPath)){
+//			uri = uri.replaceFirst(contextPath, "");
+//		}
+//
+//		//获取请求方式
+//		String method = request.getMethod();
+//
+//		//获取浏览器信息
+//		String browser = this.getBrowser(request);
+//
+//		//获取参数
+//		String params = this.getParams(pjp, request);
+//
+//		//获取操作路径
+//		String requestPath = this.getRequestPath(uri);
+//
+//        //放行
+//		Object result = pjp.proceed();
+//
+//		//获取用户信息 如果已登录，从token中获取用户信息，如果是登录接口，查询数据库获取用户信息
+//		Map<String, Object> userInfo = this.getUserInfo(request, uri, result);
+//		Long userId = (Long)userInfo.get("userId");
+//		String userName = (String)userInfo.get("userName");
+//		String nickName = (String)userInfo.get("nickName");
+//
+//		//写入mongodb
+//		OperLog operLog = new OperLog();
+//		operLog.setUserId(userId);
+//		operLog.setUserName(userName);
+//		operLog.setNickName(nickName);
+//		operLog.setRequestPath(requestPath);
+//		operLog.setUri(uri);
+//		operLog.setMethod(method);
+//		operLog.setParams(params);
+//		operLog.setIp(clientIP);
+//		operLog.setBrowser(browser);
+//		operLog.setCreateTime(Calendar.getInstance().getTime());
+//		mongoTemplate.insert(operLog);
+//
+//		return result;
+//	}
+//
+//	private String getRequestPath(String uri){
+//		String hget = redisUtil.hget(RedisKey.MANAGE_MENU, uri);
+//		MenuBean menuBean = JSON.parseObject(hget, MenuBean.class);
+//		LinkedList<String> menuList = new LinkedList<>();
+//		this.getRequestPathHandler(menuList, menuBean);
+//		StringBuilder sb = new StringBuilder();
+//		menuList.stream().forEach(str->sb.append("->").append(str));
+//		return sb.substring(2);
+//	}
+//
+//	private void getRequestPathHandler(LinkedList list, MenuBean menuBean){
+//		list.addFirst("[" + menuBean.getName() + "]");
+//		if(Objects.isNull(menuBean.getParent())){
+//			return;
+//		}
+//		this.getRequestPathHandler(list, menuBean.getParent());
+//	}
+//
+//	private Map<String, Object> getUserInfo(HttpServletRequest request, String uri, Object result){
+//		String token = null;
+//		boolean isLogin = uri.endsWith("login");
+//		if(isLogin){
+//			String resultStr = JSON.toJSONString(result);
+//			JSONObject jsonObject = JSON.parseObject(resultStr);
+//			JSONObject data = jsonObject.getJSONObject("data");
+//			token = data.getString("token");
+//		}else{
+//			token = request.getHeader("token");
+//		}
+//		Claims claims = JwtUtil.parseJWT(token);
+//		Integer userId = (Integer) claims.get("userId");
+//		String userName = (String)claims.get("userName");
+//		String nickName = (String)claims.get("nickName");
+//		Map<String, Object> userInfo = new HashMap<>();
+//		userInfo.put("userId", Long.valueOf(userId));
+//		userInfo.put("userName", userName);
+//		userInfo.put("nickName", nickName);
+//		return userInfo;
+//	}
+//
+//	private String getParams(JoinPoint pjp, HttpServletRequest request){
+//
+//		// 获取参数名称
+//		String[] parameterNamesArgs = ((MethodSignature) pjp.getSignature()).getParameterNames();
+//		//获取请求参数值
+//		Object[] args = pjp.getArgs();
+//
+//		Map<String, Object> paramMap = new HashMap<>();
+//		String contentType = request.getContentType();
+//		if(ContentType.JSON.getValue().equals(contentType)){
+//			return JSON.toJSONString(args[0]);
+//		}else{
+//			for (int i = 0; i < args.length; i++) {
+//				if(args[i] instanceof MultipartFile){
+//					paramMap.put(parameterNamesArgs[i], ((MultipartFile) args[i]).getOriginalFilename());
+//					continue;
+//				}
+//				paramMap.put(parameterNamesArgs[i], args[i]);
+//			}
+//		}
+//		return JSON.toJSONString(paramMap);
+//	}
+//
+//	private String getBrowser(HttpServletRequest request){
+//		String userAgentStr = request.getHeader("User-Agent");
+//		UserAgent userAgent = UserAgentUtil.parse(userAgentStr);
+//		String browserType = userAgent.getBrowser().toString();
+//		String browserVersion = userAgent.getVersion();
+//		String browserFormat = "%s(版本%s)";
+//		return  String.format(browserFormat, browserType, browserVersion);
+//	}
+//
+//}
+//

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

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.DownloadOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 下载次数订单表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+@Mapper
+public interface IDownloadOrderMapper extends BaseMapper<DownloadOrder> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.IncrementOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 增值权益订单表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+@Mapper
+public interface IIncrementOrderMapper extends BaseMapper<IncrementOrder> {
+
+}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IInvoiceMapper.java

@@ -0,0 +1,23 @@
+package com.fdkankan.manage.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.entity.Invoice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.vo.InvoicePageParamVO;
+import com.fdkankan.manage.vo.InvoiceVO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 发票表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+@Mapper
+public interface IInvoiceMapper extends BaseMapper<Invoice> {
+
+    Page<InvoiceVO> pageInvoice(Page page, InvoicePageParamVO param);
+
+}

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

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.Order;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 订单表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+@Mapper
+public interface IOrderMapper extends BaseMapper<Order> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.DownloadOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 下载次数订单表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+public interface IDownloadOrderService extends IService<DownloadOrder> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.IncrementOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 增值权益订单表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+public interface IIncrementOrderService extends IService<IncrementOrder> {
+
+}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IInvoiceService.java

@@ -0,0 +1,23 @@
+package com.fdkankan.manage.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.entity.Invoice;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.InvoicePageParamVO;
+import com.fdkankan.manage.vo.InvoiceVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * <p>
+ * 发票表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+public interface IInvoiceService extends IService<Invoice> {
+
+    Page<InvoiceVO> pageInvoice(@RequestBody InvoicePageParamVO param);
+
+}

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

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.Order;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 订单表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+public interface IOrderService extends IService<Order> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+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 org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 下载次数订单表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+@Service
+public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper, DownloadOrder> implements IDownloadOrderService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.IncrementOrder;
+import com.fdkankan.manage.mapper.IIncrementOrderMapper;
+import com.fdkankan.manage.service.IIncrementOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 增值权益订单表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+@Service
+public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper, IncrementOrder> implements IIncrementOrderService {
+
+}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java

@@ -0,0 +1,28 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.entity.Invoice;
+import com.fdkankan.manage.mapper.IInvoiceMapper;
+import com.fdkankan.manage.service.IInvoiceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.vo.InvoicePageParamVO;
+import com.fdkankan.manage.vo.InvoiceVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 发票表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+@Service
+public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> implements IInvoiceService {
+
+    @Override
+    public Page<InvoiceVO> pageInvoice(InvoicePageParamVO param) {
+        return baseMapper.pageInvoice(new Page(param.getPageNum(), param.getPageSize()), param);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.Order;
+import com.fdkankan.manage.mapper.IOrderMapper;
+import com.fdkankan.manage.service.IOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 订单表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-31
+ */
+@Service
+public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implements IOrderService {
+
+}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/InvoicePageParamVO.java

@@ -0,0 +1,35 @@
+package com.fdkankan.manage.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.mongodb.base.BaseRequestMongo;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/5/31
+ **/
+@Data
+public class InvoicePageParamVO extends RequestBase {
+
+    private String orderSn;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date invoiceTimeStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date invoiceTimeEnd;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date payTimeStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date payTimeEnd;
+
+}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/InvoiceVO.java

@@ -0,0 +1,96 @@
+package com.fdkankan.manage.vo;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/6/1
+ **/
+@Data
+public class InvoiceVO {
+
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String orderSn;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+
+    /**
+     * 开票时间
+     */
+    private Date invoiceTime;
+
+    /**
+     * 开票金额
+     */
+    private Double money;
+
+    /**
+     * 发票类型 2-普通发票， 3-专用发票
+     */
+    private Integer type;
+
+    /**
+     * 发票抬头
+     */
+    private String title;
+
+    /**
+     * 纳税人识别号
+     */
+    private String code;
+
+    /**
+     * 注册地址
+     */
+    private String organizedAddress;
+
+    /**
+     * 注册电话
+     */
+    private String registerPhone;
+
+    /**
+     * 开户银行
+     */
+    private String bankName;
+
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+
+    /**
+     * 收件人姓名
+     */
+    private String shipName;
+
+    /**
+     * 收件人手机号码
+     */
+    private String shipMobile;
+
+    /**
+     * 收货地址
+     */
+    private String shipAddress;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+
+
+}

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

@@ -0,0 +1,5 @@
+<?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.IDownloadOrderMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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.IIncrementOrderMapper">
+
+</mapper>

4dkankan-center-manage/src/main/resources/mapper/manage/InvoiceMapper.xml

@@ -0,0 +1,127 @@
+<?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.IInvoiceMapper">
+
+
+  <select id="pageInvoice" resultType="com.fdkankan.manage.vo.InvoiceVO">
+    select * from(
+      /*配件订单发票*/
+      SELECT
+      i.`id`,
+      o.`order_sn`,
+      o.`finish_time` AS payTime,
+      i.`create_time` AS invoiceTime,
+      i.`money`,
+      i.`type`,
+      i.`title`,
+      i.`code`,
+      i.`organized_address` as organizedAddress,
+      i.`register_phone` as registerPhone,
+      i.`bank_name` as bankName,
+      i.`bank_account` as bankAccount,
+      i.`ship_name` as shipName,
+      i.`ship_mobile` as shipMobile,
+      i.`ship_address` as shipAddress,
+      i.`email_address` AS email
+      FROM t_invoice i
+      LEFT JOIN t_order o ON i.`order_id` = o.`id`
+      WHERE i.`consume_type` = 0 AND i.`rec_status` = 'A' AND o.`rec_status` = 'A' AND i.`type` != 1
+      <if test="param.orderSn != null and param.orderSn != ''">
+        and o.`order_sn` like  concat('%', #{param.orderSn}, '%')
+      </if>
+      <if test="param.invoiceTimeStart != null">
+        and i.`create_time` >=  #{param.invoiceTimeStart}
+      </if>
+      <if test="param.invoiceTimeEnd != null">
+        and i.`create_time` <![CDATA[ <= ]]>  #{param.invoiceTimeEnd}
+      </if>
+      <if test="param.payTimeStart != null">
+        and o.`finish_time` >=  #{param.payTimeStart}
+      </if>
+      <if test="param.payTimeEnd != null">
+        and o.`finish_time` <![CDATA[ <= ]]>  #{param.payTimeEnd}
+      </if>
+
+      UNION
+
+      /*会员权益订单发票*/
+      SELECT
+      i.`id`,
+      o.`order_sn`,
+      o.`trade_time` AS payTime,
+      i.`create_time` AS invoiceTime,
+      i.`money`,
+      i.`type`,
+      i.`title`,
+      i.`code`,
+      i.`organized_address` AS organizedAddress,
+      i.`register_phone` AS registerPhone,
+      i.`bank_name` AS bankName,
+      i.`bank_account` AS bankAccount,
+      i.`ship_name` AS shipName,
+      i.`ship_mobile` AS shipMobile,
+      i.`ship_address` AS shipAddress,
+      i.`email_address` AS email
+      FROM t_invoice i
+      LEFT JOIN t_increment_order o ON i.`increment_order_id` = o.`id`
+      WHERE i.`consume_type` = 2 AND i.`rec_status` = 'A' AND o.`rec_status` = 'A' AND i.`type` != 1
+      <if test="param.orderSn != null and param.orderSn != ''">
+        and o.`order_sn` like  concat('%', #{param.orderSn}, '%')
+      </if>
+      <if test="param.invoiceTimeStart != null">
+        and i.`create_time` >=  #{param.invoiceTimeStart}
+      </if>
+      <if test="param.invoiceTimeEnd != null">
+        and i.`create_time` <![CDATA[ <= ]]>  #{param.invoiceTimeEnd}
+      </if>
+      <if test="param.payTimeStart != null">
+        and o.`trade_time` >=  #{param.payTimeStart}
+      </if>
+      <if test="param.payTimeEnd != null">
+        and o.`trade_time` <![CDATA[ <= ]]>  #{param.payTimeEnd}
+      </if>
+
+      UNION
+
+      /*下载订单发票*/
+      SELECT
+      i.`id`,
+      o.`order_sn`,
+      o.`trade_time` AS payTime,
+      i.`create_time` AS invoiceTime,
+      i.`money`,
+      i.`type`,
+      i.`title`,
+      i.`code`,
+      i.`organized_address` AS organizedAddress,
+      i.`register_phone` AS registerPhone,
+      i.`bank_name` AS bankName,
+      i.`bank_account` AS bankAccount,
+      i.`ship_name` AS shipName,
+      i.`ship_mobile` AS shipMobile,
+      i.`ship_address` AS shipAddress,
+      i.`email_address` AS email
+      FROM t_invoice i
+      LEFT JOIN t_download_order o ON i.`download_order_id` = o.`id`
+      WHERE i.`consume_type` = 3 AND i.`rec_status` = 'A' AND o.`rec_status` = 'A' AND i.`type` != 1
+      <if test="param.orderSn != null and param.orderSn != ''">
+        and o.`order_sn` like  concat('%', #{param.orderSn}, '%')
+      </if>
+      <if test="param.invoiceTimeStart != null">
+        and i.`create_time` >=  #{param.invoiceTimeStart}
+      </if>
+      <if test="param.invoiceTimeEnd != null">
+        and i.`create_time` <![CDATA[ <= ]]>  #{param.invoiceTimeEnd}
+      </if>
+      <if test="param.payTimeStart != null">
+        and o.`trade_time` >=  #{param.payTimeStart}
+      </if>
+      <if test="param.payTimeEnd != null">
+        and o.`trade_time` <![CDATA[ <= ]]>  #{param.payTimeEnd}
+      </if>
+    ) t
+    order by ${param.orderBy} ${param.sortBy}
+  </select>
+
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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.IOrderMapper">
+
+</mapper>