Browse Source

订单发票

he2802 3 năm trước cách đây
mục cha
commit
9611cc4c40
20 tập tin đã thay đổi với 1191 bổ sung1 xóa
  1. 112 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderInvoiceController.java
  2. 2 1
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java
  3. 82 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceAddBo.java
  4. 102 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceEditBo.java
  5. 27 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceOrderAddBo.java
  6. 33 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceOrderEditBo.java
  7. 45 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceOrderQueryBo.java
  8. 95 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceQueryBo.java
  9. 71 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInvoice.java
  10. 33 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInvoiceOrder.java
  11. 20 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderInvoiceMapper.java
  12. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderInvoiceOrderMapper.java
  13. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderInvoiceOrderService.java
  14. 54 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderInvoiceService.java
  15. 97 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceOrderServiceImpl.java
  16. 121 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java
  17. 35 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInvoiceOrderVo.java
  18. 102 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInvoiceVo.java
  19. 80 0
      zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceMapper.xml
  20. 14 0
      zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceOrderMapper.xml

+ 112 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderInvoiceController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.order;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.order.bo.OrderInvoiceAddBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceEditBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceQueryBo;
+import com.zhongzheng.modules.order.service.IOrderInvoiceService;
+import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 订单发票Controller
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Api(value = "订单发票控制器", tags = {"订单发票管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/order/invoice")
+public class OrderInvoiceController extends BaseController {
+
+    private final IOrderInvoiceService iOrderInvoiceService;
+
+    /**
+     * 查询订单发票列表
+     */
+    @ApiOperation("查询订单发票列表")
+    @PreAuthorize("@ss.hasPermi('system:invoice:list')")
+    @GetMapping("/list")
+    public TableDataInfo<OrderInvoiceVo> list(OrderInvoiceQueryBo bo) {
+        startPage();
+        List<OrderInvoiceVo> list = iOrderInvoiceService.selectList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单发票列表
+     */
+   /* @ApiOperation("导出订单发票列表")
+    @PreAuthorize("@ss.hasPermi('system:invoice:export')")
+    @Log(title = "订单发票", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<OrderInvoiceVo> export(OrderInvoiceQueryBo bo) {
+        List<OrderInvoiceVo> list = iOrderInvoiceService.queryList(bo);
+        ExcelUtil<OrderInvoiceVo> util = new ExcelUtil<OrderInvoiceVo>(OrderInvoiceVo.class);
+        return util.exportExcel(list, "订单发票");
+    }*/
+
+    /**
+     * 获取订单发票详细信息
+     */
+    @ApiOperation("获取订单发票详细信息")
+    @PreAuthorize("@ss.hasPermi('system:invoice:query')")
+    @GetMapping("/{invoiceId}")
+    public AjaxResult<OrderInvoiceVo> getInfo(@PathVariable("invoiceId" ) Long invoiceId) {
+        return AjaxResult.success(iOrderInvoiceService.queryById(invoiceId));
+    }
+
+    /**
+     * 新增订单发票
+     */
+    @ApiOperation("新增订单发票")
+    @PreAuthorize("@ss.hasPermi('system:invoice:add')")
+    @Log(title = "订单发票", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody OrderInvoiceAddBo bo) {
+        return toAjax(iOrderInvoiceService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改订单发票
+     */
+    @ApiOperation("修改订单发票")
+    @PreAuthorize("@ss.hasPermi('system:invoice:edit')")
+    @Log(title = "订单发票", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody OrderInvoiceEditBo bo) {
+        return toAjax(iOrderInvoiceService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除订单发票
+     */
+   /* @ApiOperation("删除订单发票")
+    @PreAuthorize("@ss.hasPermi('system:invoice:remove')")
+    @Log(title = "订单发票" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{invoiceIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] invoiceIds) {
+        return toAjax(iOrderInvoiceService.deleteWithValidByIds(Arrays.asList(invoiceIds), true) ? 1 : 0);
+    }*/
+}

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -346,9 +346,10 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             throw new CustomException("非审核中状态无法打回操作");
         }
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long upId = bo.getIds().get(0);
         //查询此人学时审核是否有权限
         if(!loginUser.getUser().isAdmin()){
-            if (baseMapper.selectCountConfirmPeriod(loginUser.getUser().getUserId(),bo.getId()) < 1){
+            if (baseMapper.selectCountConfirmPeriod(loginUser.getUser().getUserId(),upId) < 1){
                 throw new CustomException("您没有确认审核权限");
             }
         }

+ 82 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceAddBo.java

@@ -0,0 +1,82 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 订单发票添加对象 order_invoice
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@ApiModel("订单发票添加对象")
+public class OrderInvoiceAddBo {
+
+    /** 类型 1普通发票 2 增值税专用发票 */
+    @ApiModelProperty("类型 1普通发票 2 增值税专用发票")
+    private Integer type;
+    /** 发票抬头 */
+    @ApiModelProperty("发票抬头")
+    private String invoiceTitle;
+    /** 手机号码 */
+    @ApiModelProperty("手机号码")
+    private String telphone;
+    /** 邮箱 */
+    @ApiModelProperty("邮箱")
+    private String email;
+    /** 审核状态 1待审核 2驳回 3通过 */
+    @ApiModelProperty("审核状态 1待审核 2驳回 3通过")
+    private Integer periodStatus;
+    /** 主体 1个人 2企业 */
+    @ApiModelProperty("主体 1个人 2企业")
+    private Integer subject;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 纳税登记号 */
+    @ApiModelProperty("纳税登记号")
+    private String taxRegistryNumber;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+    /** 发票状态 1未开票 2已开票 -1 已退票 */
+    @ApiModelProperty("发票状态 1未开票 2已开票 -1 已退票")
+    private Integer invoiceStatus;
+    /** 发票金额 */
+    @ApiModelProperty("发票金额")
+    private BigDecimal amount;
+    /** 发票代码/发票号码 */
+    @ApiModelProperty("发票代码/发票号码")
+    private String invoiceCode;
+    /** 是否上传发票 0否 1是 */
+    @ApiModelProperty("是否上传发票 0否 1是")
+    private Integer uploadInvoice;
+    /** 是否邮寄发票 0否 1是 */
+    @ApiModelProperty("是否邮寄发票 0否 1是")
+    private Integer sendInvoice;
+    /** 快递单号 */
+    @ApiModelProperty("快递单号")
+    private String trackingNum;
+    /** 开票时间 */
+    @ApiModelProperty("开票时间")
+    private Long makeOutTime;
+    /** 申请时间 */
+    @ApiModelProperty("申请时间")
+    private Long applyTime;
+    /** 审核原因 */
+    @ApiModelProperty("审核原因")
+    private String periodReason;
+}

+ 102 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceEditBo.java

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单发票编辑对象 order_invoice
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@ApiModel("订单发票编辑对象")
+public class OrderInvoiceEditBo {
+
+    /** 发票ID */
+    @ApiModelProperty("发票ID")
+    private Long invoiceId;
+
+    /** 类型 1普通发票 2 增值税专用发票 */
+    @ApiModelProperty("类型 1普通发票 2 增值税专用发票")
+    private Integer type;
+
+    /** 发票抬头 */
+    @ApiModelProperty("发票抬头")
+    private String invoiceTitle;
+
+    /** 手机号码 */
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    /** 邮箱 */
+    @ApiModelProperty("邮箱")
+    private String email;
+
+
+    /** 审核状态 1待审核 2驳回 3通过 */
+    @ApiModelProperty("审核状态 1待审核 2驳回 3通过")
+    private Integer periodStatus;
+
+    /** 主体 1个人 2企业 */
+    @ApiModelProperty("主体 1个人 2企业")
+    private Integer subject;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /** 纳税登记号 */
+    @ApiModelProperty("纳税登记号")
+    private String taxRegistryNumber;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+
+    /** 发票状态 1未开票 2已开票 -1 已退票 */
+    @ApiModelProperty("发票状态 1未开票 2已开票 -1 已退票")
+    private Integer invoiceStatus;
+
+    /** 发票金额 */
+    @ApiModelProperty("发票金额")
+    private BigDecimal amount;
+
+    /** 发票代码/发票号码 */
+    @ApiModelProperty("发票代码/发票号码")
+    private String invoiceCode;
+
+    /** 是否上传发票 0否 1是 */
+    @ApiModelProperty("是否上传发票 0否 1是")
+    private Integer uploadInvoice;
+
+    /** 是否邮寄发票 0否 1是 */
+    @ApiModelProperty("是否邮寄发票 0否 1是")
+    private Integer sendInvoice;
+
+    /** 快递单号 */
+    @ApiModelProperty("快递单号")
+    private String trackingNum;
+
+    /** 开票时间 */
+    @ApiModelProperty("开票时间")
+    private Long makeOutTime;
+
+    /** 申请时间 */
+    @ApiModelProperty("申请时间")
+    private Long applyTime;
+
+    /** 审核原因 */
+    @ApiModelProperty("审核原因")
+    private String periodReason;
+
+}

+ 27 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceOrderAddBo.java

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 订单发票关系添加对象 order_invoice_order
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@ApiModel("订单发票关系添加对象")
+public class OrderInvoiceOrderAddBo {
+
+    /** 发票ID */
+    @ApiModelProperty("发票ID")
+    private Long invoiceId;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+}

+ 33 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceOrderEditBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 订单发票关系编辑对象 order_invoice_order
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@ApiModel("订单发票关系编辑对象")
+public class OrderInvoiceOrderEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 发票ID */
+    @ApiModelProperty("发票ID")
+    private Long invoiceId;
+
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
+
+}

+ 45 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceOrderQueryBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 订单发票关系分页查询对象 order_invoice_order
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单发票关系分页查询对象")
+public class OrderInvoiceOrderQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 发票ID */
+	@ApiModelProperty("发票ID")
+	private Long invoiceId;
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+}

+ 95 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceQueryBo.java

@@ -0,0 +1,95 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 订单发票分页查询对象 order_invoice
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单发票分页查询对象")
+public class OrderInvoiceQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 类型 1普通发票 2 增值税专用发票 */
+	@ApiModelProperty("类型 1普通发票 2 增值税专用发票")
+	private Integer type;
+	/** 发票抬头 */
+	@ApiModelProperty("发票抬头")
+	private String invoiceTitle;
+	/** 手机号码 */
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 邮箱 */
+	@ApiModelProperty("邮箱")
+	private String email;
+	/** 审核状态 1待审核 2驳回 3通过 */
+	@ApiModelProperty("审核状态 1待审核 2驳回 3通过")
+	private Integer periodStatus;
+	/** 主体 1个人 2企业 */
+	@ApiModelProperty("主体 1个人 2企业")
+	private Integer subject;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 纳税登记号 */
+	@ApiModelProperty("纳税登记号")
+	private String taxRegistryNumber;
+	/** 状态 1有效 0无效 */
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+	/** 发票状态 1未开票 2已开票 -1 已退票 */
+	@ApiModelProperty("发票状态 1未开票 2已开票 -1 已退票")
+	private Integer invoiceStatus;
+	/** 发票金额 */
+	@ApiModelProperty("发票金额")
+	private BigDecimal amount;
+	/** 发票代码/发票号码 */
+	@ApiModelProperty("发票代码/发票号码")
+	private String invoiceCode;
+	/** 是否上传发票 0否 1是 */
+	@ApiModelProperty("是否上传发票 0否 1是")
+	private Integer uploadInvoice;
+	/** 是否邮寄发票 0否 1是 */
+	@ApiModelProperty("是否邮寄发票 0否 1是")
+	private Integer sendInvoice;
+	/** 快递单号 */
+	@ApiModelProperty("快递单号")
+	private String trackingNum;
+	/** 开票时间 */
+	@ApiModelProperty("开票时间")
+	private Long makeOutTime;
+	/** 申请时间 */
+	@ApiModelProperty("申请时间")
+	private Long applyTime;
+	/** 审核原因 */
+	@ApiModelProperty("审核原因")
+	private String periodReason;
+
+}

+ 71 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInvoice.java

@@ -0,0 +1,71 @@
+package com.zhongzheng.modules.order.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 订单发票对象 order_invoice
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_invoice")
+public class OrderInvoice implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 发票ID */
+    @TableId(value = "invoice_id")
+    private Long invoiceId;
+    /** 类型 1普通发票 2 增值税专用发票 */
+    private Integer type;
+    /** 发票抬头 */
+    private String invoiceTitle;
+    /** 手机号码 */
+    private String telphone;
+    /** 邮箱 */
+    private String email;
+    /** 审核状态 1待审核 2驳回 3通过 */
+    private Integer periodStatus;
+    /** 主体 1个人 2企业 */
+    private Integer subject;
+    /** 用户ID */
+    private Long userId;
+    /** 纳税登记号 */
+    private String taxRegistryNumber;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1有效 0无效 */
+    private Integer status;
+    /** 发票状态 1未开票 2已开票 -1 已退票 */
+    private Integer invoiceStatus;
+    /** 发票金额 */
+    private BigDecimal amount;
+    /** 发票代码/发票号码 */
+    private String invoiceCode;
+    /** 是否上传发票 0否 1是 */
+    private Integer uploadInvoice;
+    /** 是否邮寄发票 0否 1是 */
+    private Integer sendInvoice;
+    /** 快递单号 */
+    private String trackingNum;
+    /** 开票时间 */
+    private Long makeOutTime;
+    /** 申请时间 */
+    private Long applyTime;
+    /** 审核原因 */
+    private String periodReason;
+}

+ 33 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInvoiceOrder.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.order.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 订单发票关系对象 order_invoice_order
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_invoice_order")
+public class OrderInvoiceOrder implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 发票ID */
+    private Long invoiceId;
+    /** 订单商品ID */
+    private Long orderGoodsId;
+}

+ 20 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderInvoiceMapper.java

@@ -0,0 +1,20 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceQueryBo;
+import com.zhongzheng.modules.order.domain.OrderInvoice;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
+
+import java.util.List;
+
+/**
+ * 订单发票Mapper接口
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+public interface OrderInvoiceMapper extends BaseMapper<OrderInvoice> {
+    List<OrderInvoiceVo> selectList(OrderInvoiceQueryBo bo);
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderInvoiceOrderMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.OrderInvoiceOrder;
+
+/**
+ * 订单发票关系Mapper接口
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+public interface OrderInvoiceOrderMapper extends BaseMapper<OrderInvoiceOrder> {
+
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderInvoiceOrderService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderInvoiceOrderAddBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceOrderEditBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceOrderQueryBo;
+import com.zhongzheng.modules.order.domain.OrderInvoiceOrder;
+import com.zhongzheng.modules.order.vo.OrderInvoiceOrderVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单发票关系Service接口
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+public interface IOrderInvoiceOrderService extends IService<OrderInvoiceOrder> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderInvoiceOrderVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderInvoiceOrderVo> queryList(OrderInvoiceOrderQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单发票关系
+	 * @param bo 订单发票关系新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderInvoiceOrderAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单发票关系
+	 * @param bo 订单发票关系编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderInvoiceOrderEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 54 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderInvoiceService.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderInvoiceAddBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceEditBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceQueryBo;
+import com.zhongzheng.modules.order.domain.OrderInvoice;
+import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单发票Service接口
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+public interface IOrderInvoiceService extends IService<OrderInvoice> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderInvoiceVo queryById(Long invoiceId);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderInvoiceVo> queryList(OrderInvoiceQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单发票
+	 * @param bo 订单发票新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderInvoiceAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单发票
+	 * @param bo 订单发票编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderInvoiceEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<OrderInvoiceVo> selectList(OrderInvoiceQueryBo bo);
+}

+ 97 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceOrderServiceImpl.java

@@ -0,0 +1,97 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.order.bo.OrderInvoiceOrderAddBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceOrderEditBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceOrderQueryBo;
+import com.zhongzheng.modules.order.domain.OrderInvoiceOrder;
+import com.zhongzheng.modules.order.mapper.OrderInvoiceOrderMapper;
+import com.zhongzheng.modules.order.service.IOrderInvoiceOrderService;
+import com.zhongzheng.modules.order.vo.OrderInvoiceOrderVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单发票关系Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Service
+public class OrderInvoiceOrderServiceImpl extends ServiceImpl<OrderInvoiceOrderMapper, OrderInvoiceOrder> implements IOrderInvoiceOrderService {
+
+    @Override
+    public OrderInvoiceOrderVo queryById(Long id){
+        OrderInvoiceOrder db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, OrderInvoiceOrderVo.class);
+    }
+
+    @Override
+    public List<OrderInvoiceOrderVo> queryList(OrderInvoiceOrderQueryBo bo) {
+        LambdaQueryWrapper<OrderInvoiceOrder> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getInvoiceId() != null, OrderInvoiceOrder::getInvoiceId, bo.getInvoiceId());
+        lqw.eq(bo.getOrderGoodsId() != null, OrderInvoiceOrder::getOrderGoodsId, bo.getOrderGoodsId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderInvoiceOrderVo> entity2Vo(Collection<OrderInvoiceOrder> collection) {
+        List<OrderInvoiceOrderVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderInvoiceOrderVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderInvoiceOrder> page = (Page<OrderInvoiceOrder>)collection;
+            Page<OrderInvoiceOrderVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderInvoiceOrderAddBo bo) {
+        OrderInvoiceOrder add = BeanUtil.toBean(bo, OrderInvoiceOrder.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderInvoiceOrderEditBo bo) {
+        OrderInvoiceOrder update = BeanUtil.toBean(bo, OrderInvoiceOrder.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderInvoiceOrder entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 121 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -0,0 +1,121 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.order.bo.OrderInvoiceAddBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceEditBo;
+import com.zhongzheng.modules.order.bo.OrderInvoiceQueryBo;
+import com.zhongzheng.modules.order.domain.OrderInvoice;
+import com.zhongzheng.modules.order.mapper.OrderInvoiceMapper;
+import com.zhongzheng.modules.order.service.IOrderInvoiceService;
+import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单发票Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Service
+public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, OrderInvoice> implements IOrderInvoiceService {
+
+    @Override
+    public OrderInvoiceVo queryById(Long invoiceId){
+        OrderInvoice db = this.baseMapper.selectById(invoiceId);
+        return BeanUtil.toBean(db, OrderInvoiceVo.class);
+    }
+
+    @Override
+    public List<OrderInvoiceVo> queryList(OrderInvoiceQueryBo bo) {
+        LambdaQueryWrapper<OrderInvoice> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getType() != null, OrderInvoice::getType, bo.getType());
+        lqw.eq(StrUtil.isNotBlank(bo.getInvoiceTitle()), OrderInvoice::getInvoiceTitle, bo.getInvoiceTitle());
+        lqw.eq(StrUtil.isNotBlank(bo.getTelphone()), OrderInvoice::getTelphone, bo.getTelphone());
+        lqw.eq(StrUtil.isNotBlank(bo.getEmail()), OrderInvoice::getEmail, bo.getEmail());
+        lqw.eq(bo.getPeriodStatus() != null, OrderInvoice::getPeriodStatus, bo.getPeriodStatus());
+        lqw.eq(bo.getSubject() != null, OrderInvoice::getSubject, bo.getSubject());
+        lqw.eq(bo.getUserId() != null, OrderInvoice::getUserId, bo.getUserId());
+        lqw.eq(StrUtil.isNotBlank(bo.getTaxRegistryNumber()), OrderInvoice::getTaxRegistryNumber, bo.getTaxRegistryNumber());
+        lqw.eq(bo.getStatus() != null, OrderInvoice::getStatus, bo.getStatus());
+        lqw.eq(bo.getInvoiceStatus() != null, OrderInvoice::getInvoiceStatus, bo.getInvoiceStatus());
+        lqw.eq(bo.getAmount() != null, OrderInvoice::getAmount, bo.getAmount());
+        lqw.eq(StrUtil.isNotBlank(bo.getInvoiceCode()), OrderInvoice::getInvoiceCode, bo.getInvoiceCode());
+        lqw.eq(bo.getUploadInvoice() != null, OrderInvoice::getUploadInvoice, bo.getUploadInvoice());
+        lqw.eq(bo.getSendInvoice() != null, OrderInvoice::getSendInvoice, bo.getSendInvoice());
+        lqw.eq(StrUtil.isNotBlank(bo.getTrackingNum()), OrderInvoice::getTrackingNum, bo.getTrackingNum());
+        lqw.eq(bo.getMakeOutTime() != null, OrderInvoice::getMakeOutTime, bo.getMakeOutTime());
+        lqw.eq(bo.getApplyTime() != null, OrderInvoice::getApplyTime, bo.getApplyTime());
+        lqw.eq(StrUtil.isNotBlank(bo.getPeriodReason()), OrderInvoice::getPeriodReason, bo.getPeriodReason());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderInvoiceVo> entity2Vo(Collection<OrderInvoice> collection) {
+        List<OrderInvoiceVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderInvoiceVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderInvoice> page = (Page<OrderInvoice>)collection;
+            Page<OrderInvoiceVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderInvoiceAddBo bo) {
+        OrderInvoice add = BeanUtil.toBean(bo, OrderInvoice.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderInvoiceEditBo bo) {
+        OrderInvoice update = BeanUtil.toBean(bo, OrderInvoice.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderInvoice entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<OrderInvoiceVo> selectList(OrderInvoiceQueryBo bo) {
+        return baseMapper.selectList(bo);
+    }
+}

+ 35 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInvoiceOrderVo.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 订单发票关系视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@ApiModel("订单发票关系视图对象")
+public class OrderInvoiceOrderVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 发票ID */
+	@Excel(name = "发票ID")
+	@ApiModelProperty("发票ID")
+	private Long invoiceId;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+}

+ 102 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInvoiceVo.java

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 订单发票视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-03-28
+ */
+@Data
+@ApiModel("订单发票视图对象")
+public class OrderInvoiceVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 发票ID */
+	@ApiModelProperty("发票ID")
+	private Long invoiceId;
+
+	/** 类型 1普通发票 2 增值税专用发票 */
+	@Excel(name = "类型 1普通发票 2 增值税专用发票")
+	@ApiModelProperty("类型 1普通发票 2 增值税专用发票")
+	private Integer type;
+	/** 发票抬头 */
+	@Excel(name = "发票抬头")
+	@ApiModelProperty("发票抬头")
+	private String invoiceTitle;
+	/** 手机号码 */
+	@Excel(name = "手机号码")
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 邮箱 */
+	@Excel(name = "邮箱")
+	@ApiModelProperty("邮箱")
+	private String email;
+	/** 审核状态 1待审核 2驳回 3通过 */
+	@Excel(name = "审核状态 1待审核 2驳回 3通过")
+	@ApiModelProperty("审核状态 1待审核 2驳回 3通过")
+	private Integer periodStatus;
+	/** 主体 1个人 2企业 */
+	@Excel(name = "主体 1个人 2企业")
+	@ApiModelProperty("主体 1个人 2企业")
+	private Integer subject;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 纳税登记号 */
+	@Excel(name = "纳税登记号")
+	@ApiModelProperty("纳税登记号")
+	private String taxRegistryNumber;
+	/** 状态 1有效 0无效 */
+	@Excel(name = "状态 1有效 0无效")
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+	/** 发票状态 1未开票 2已开票 -1 已退票 */
+	@Excel(name = "发票状态 1未开票 2已开票 -1 已退票")
+	@ApiModelProperty("发票状态 1未开票 2已开票 -1 已退票")
+	private Integer invoiceStatus;
+	/** 发票金额 */
+	@Excel(name = "发票金额")
+	@ApiModelProperty("发票金额")
+	private BigDecimal amount;
+	/** 发票代码/发票号码 */
+	@Excel(name = "发票代码/发票号码")
+	@ApiModelProperty("发票代码/发票号码")
+	private String invoiceCode;
+	/** 是否上传发票 0否 1是 */
+	@Excel(name = "是否上传发票 0否 1是")
+	@ApiModelProperty("是否上传发票 0否 1是")
+	private Integer uploadInvoice;
+	/** 是否邮寄发票 0否 1是 */
+	@Excel(name = "是否邮寄发票 0否 1是")
+	@ApiModelProperty("是否邮寄发票 0否 1是")
+	private Integer sendInvoice;
+	/** 快递单号 */
+	@Excel(name = "快递单号")
+	@ApiModelProperty("快递单号")
+	private String trackingNum;
+	/** 开票时间 */
+	@Excel(name = "开票时间")
+	@ApiModelProperty("开票时间")
+	private Long makeOutTime;
+	/** 申请时间 */
+	@Excel(name = "申请时间")
+	@ApiModelProperty("申请时间")
+	private Long applyTime;
+	/** 审核原因 */
+	@Excel(name = "审核原因")
+	@ApiModelProperty("审核原因")
+	private String periodReason;
+	@ApiModelProperty("订单列表")
+	private List<OrderGoodsVo> orderList;
+}

+ 80 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceMapper.xml

@@ -0,0 +1,80 @@
+<?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.zhongzheng.system.mapper.OrderInvoiceMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderInvoice" id="OrderInvoiceResult">
+        <result property="invoiceId" column="invoice_id"/>
+        <result property="type" column="type"/>
+        <result property="invoiceTitle" column="invoice_title"/>
+        <result property="telphone" column="telphone"/>
+        <result property="email" column="email"/>
+        <result property="periodStatus" column="period_status"/>
+        <result property="subject" column="subject"/>
+        <result property="userId" column="user_id"/>
+        <result property="taxRegistryNumber" column="tax_registry_number"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="invoiceStatus" column="invoice_status"/>
+        <result property="amount" column="amount"/>
+        <result property="invoiceCode" column="invoice_code"/>
+        <result property="uploadInvoice" column="upload_invoice"/>
+        <result property="sendInvoice" column="send_invoice"/>
+        <result property="trackingNum" column="tracking_num"/>
+        <result property="makeOutTime" column="make_out_time"/>
+        <result property="applyTime" column="apply_time"/>
+        <result property="periodReason" column="period_reason"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.order.vo.OrderInvoiceVo" id="OrderInvoiceVoResult">
+        <result property="invoiceId" column="invoice_id"/>
+        <result property="type" column="type"/>
+        <result property="invoiceTitle" column="invoice_title"/>
+        <result property="telphone" column="telphone"/>
+        <result property="email" column="email"/>
+        <result property="periodStatus" column="period_status"/>
+        <result property="subject" column="subject"/>
+        <result property="userId" column="user_id"/>
+        <result property="taxRegistryNumber" column="tax_registry_number"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="invoiceStatus" column="invoice_status"/>
+        <result property="amount" column="amount"/>
+        <result property="invoiceCode" column="invoice_code"/>
+        <result property="uploadInvoice" column="upload_invoice"/>
+        <result property="sendInvoice" column="send_invoice"/>
+        <result property="trackingNum" column="tracking_num"/>
+        <result property="makeOutTime" column="make_out_time"/>
+        <result property="applyTime" column="apply_time"/>
+        <result property="periodReason" column="period_reason"/>
+        <collection property="orderList" column="invoice_id" select="findOrderList"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsVo" id="GoodsListResult">
+        <result property="orderSn" column="order_sn"/>
+        <result property="goodsName" column="goods_name"/>
+    </resultMap>
+
+    <select id="findOrderList" resultMap="GoodsListResult">
+        SELECT
+            og.order_sn,
+            g.goods_name
+        FROM
+            order_invoice_order oio
+                LEFT JOIN order_goods og ON oio.order_goods_id = og.order_goods_id
+                LEFT JOIN goods g ON og.goods_id = g.goods_id
+        WHERE
+            oio.invoice_id = #{invoice_id}
+    </select>
+
+    <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderInvoiceQueryBo" resultMap="OrderInvoiceVoResult">
+        SELECT
+            oi.*
+        FROM
+            order_invoice oi
+    </select>
+
+</mapper>

+ 14 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceOrderMapper.xml

@@ -0,0 +1,14 @@
+<?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.zhongzheng.system.mapper.OrderInvoiceOrderMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderInvoiceOrder" id="OrderInvoiceOrderResult">
+        <result property="id" column="id"/>
+        <result property="invoiceId" column="invoice_id"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
+    </resultMap>
+
+
+</mapper>