fix 排序

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

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 订单发票添加对象 order_invoice
  *
  * @author hjl
- * @date 2022-03-28
+ * @date 2022-03-29
  */
 @Data
 @ApiModel("订单发票添加对象")
@@ -25,9 +25,6 @@ public class OrderInvoiceAddBo {
     /** 发票抬头 */
     @ApiModelProperty("发票抬头")
     private String invoiceTitle;
-    /** 手机号码 */
-    @ApiModelProperty("手机号码")
-    private String telphone;
     /** 邮箱 */
     @ApiModelProperty("邮箱")
     private String email;
@@ -76,7 +73,31 @@ public class OrderInvoiceAddBo {
     /** 申请时间 */
     @ApiModelProperty("申请时间")
     private Long applyTime;
+    /** 发票图片地址 */
+    @ApiModelProperty("发票图片地址")
+    private String invoiceImg;
     /** 审核原因 */
     @ApiModelProperty("审核原因")
     private String periodReason;
+    /** 公司地址 */
+    @ApiModelProperty("公司地址")
+    private String companyAddress;
+    /** 电话号码 */
+    @ApiModelProperty("电话号码")
+    private String phone;
+    /** 开户银行 */
+    @ApiModelProperty("开户银行")
+    private String bankName;
+    /** 银行账号 */
+    @ApiModelProperty("银行账号")
+    private String bankAccount;
+    /** 收件地址 */
+    @ApiModelProperty("收件地址")
+    private String receivingAddress;
+    /** 收件人姓名 */
+    @ApiModelProperty("收件人姓名")
+    private String receivingName;
+    /** 收件人手机号码 */
+    @ApiModelProperty("收件人手机号码")
+    private String receivingTel;
 }

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

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * 订单发票编辑对象 order_invoice
  *
  * @author hjl
- * @date 2022-03-28
+ * @date 2022-03-29
  */
 @Data
 @ApiModel("订单发票编辑对象")
@@ -30,10 +30,6 @@ public class OrderInvoiceEditBo {
     @ApiModelProperty("发票抬头")
     private String invoiceTitle;
 
-    /** 手机号码 */
-    @ApiModelProperty("手机号码")
-    private String telphone;
-
     /** 邮箱 */
     @ApiModelProperty("邮箱")
     private String email;
@@ -95,8 +91,40 @@ public class OrderInvoiceEditBo {
     @ApiModelProperty("申请时间")
     private Long applyTime;
 
+    /** 发票图片地址 */
+    @ApiModelProperty("发票图片地址")
+    private String invoiceImg;
+
     /** 审核原因 */
     @ApiModelProperty("审核原因")
     private String periodReason;
 
+    /** 公司地址 */
+    @ApiModelProperty("公司地址")
+    private String companyAddress;
+
+    /** 电话号码 */
+    @ApiModelProperty("电话号码")
+    private String phone;
+
+    /** 开户银行 */
+    @ApiModelProperty("开户银行")
+    private String bankName;
+
+    /** 银行账号 */
+    @ApiModelProperty("银行账号")
+    private String bankAccount;
+
+    /** 收件地址 */
+    @ApiModelProperty("收件地址")
+    private String receivingAddress;
+
+    /** 收件人姓名 */
+    @ApiModelProperty("收件人姓名")
+    private String receivingName;
+
+    /** 收件人手机号码 */
+    @ApiModelProperty("收件人手机号码")
+    private String receivingTel;
+
 }

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

@@ -16,7 +16,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
  * 订单发票分页查询对象 order_invoice
  *
  * @author hjl
- * @date 2022-03-28
+ * @date 2022-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -43,9 +43,6 @@ public class OrderInvoiceQueryBo extends BaseEntity {
 	/** 发票抬头 */
 	@ApiModelProperty("发票抬头")
 	private String invoiceTitle;
-	/** 手机号码 */
-	@ApiModelProperty("手机号码")
-	private String telphone;
 	/** 邮箱 */
 	@ApiModelProperty("邮箱")
 	private String email;
@@ -88,13 +85,37 @@ public class OrderInvoiceQueryBo extends BaseEntity {
 	/** 申请时间 */
 	@ApiModelProperty("申请时间")
 	private Long applyTime;
+	/** 发票图片地址 */
+	@ApiModelProperty("发票图片地址")
+	private String invoiceImg;
 	/** 审核原因 */
 	@ApiModelProperty("审核原因")
 	private String periodReason;
+	/** 公司地址 */
+	@ApiModelProperty("公司地址")
+	private String companyAddress;
+	/** 电话号码 */
+	@ApiModelProperty("电话号码")
+	private String phone;
+	/** 开户银行 */
+	@ApiModelProperty("开户银行")
+	private String bankName;
+	/** 银行账号 */
+	@ApiModelProperty("银行账号")
+	private String bankAccount;
+	/** 收件地址 */
+	@ApiModelProperty("收件地址")
+	private String receivingAddress;
+	/** 收件人姓名 */
+	@ApiModelProperty("收件人姓名")
+	private String receivingName;
+	/** 收件人手机号码 */
+	@ApiModelProperty("收件人手机号码")
+	private String receivingTel;
+	@ApiModelProperty("开票结束时间")
+	private Long applyEndTime;
+	@ApiModelProperty("开票开始时间")
+	private Long applyStartTime;
 	@ApiModelProperty("搜索kEY")
 	private String searchKey;
-	@ApiModelProperty("申请开始时间")
-	private Long applyStartTime;
-	@ApiModelProperty("申请结束时间")
-	private Long applyEndTime;
 }

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

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
  * 订单发票对象 order_invoice
  *
  * @author hjl
- * @date 2022-03-28
+ * @date 2022-03-29
  */
 @Data
 @NoArgsConstructor
@@ -30,8 +30,6 @@ private static final long serialVersionUID=1L;
     private Integer type;
     /** 发票抬头 */
     private String invoiceTitle;
-    /** 手机号码 */
-    private String telphone;
     /** 邮箱 */
     private String email;
     /** 审核状态 1待审核 2驳回 3通过 */
@@ -66,6 +64,22 @@ private static final long serialVersionUID=1L;
     private Long makeOutTime;
     /** 申请时间 */
     private Long applyTime;
+    /** 发票图片地址 */
+    private String invoiceImg;
     /** 审核原因 */
     private String periodReason;
+    /** 公司地址 */
+    private String companyAddress;
+    /** 电话号码 */
+    private String phone;
+    /** 开户银行 */
+    private String bankName;
+    /** 银行账号 */
+    private String bankAccount;
+    /** 收件地址 */
+    private String receivingAddress;
+    /** 收件人姓名 */
+    private String receivingName;
+    /** 收件人手机号码 */
+    private String receivingTel;
 }

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

@@ -1,7 +1,6 @@
 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;
@@ -13,8 +12,9 @@ import java.util.List;
  * 订单发票Mapper接口
  *
  * @author hjl
- * @date 2022-03-28
+ * @date 2022-03-29
  */
 public interface OrderInvoiceMapper extends BaseMapper<OrderInvoice> {
     List<OrderInvoiceVo> selectList(OrderInvoiceQueryBo bo);
+
 }

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

@@ -5,6 +5,7 @@ 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.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
 
 import java.util.Collection;
@@ -14,7 +15,7 @@ import java.util.List;
  * 订单发票Service接口
  *
  * @author hjl
- * @date 2022-03-28
+ * @date 2022-03-29
  */
 public interface IOrderInvoiceService extends IService<OrderInvoice> {
 	/**

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

@@ -9,6 +9,7 @@ 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.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,7 +26,7 @@ import java.util.stream.Collectors;
  * 订单发票Service业务层处理
  *
  * @author hjl
- * @date 2022-03-28
+ * @date 2022-03-29
  */
 @Service
 public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, OrderInvoice> implements IOrderInvoiceService {
@@ -41,7 +42,6 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
         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());
@@ -56,7 +56,15 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
         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.getInvoiceImg()), OrderInvoice::getInvoiceImg, bo.getInvoiceImg());
         lqw.eq(StrUtil.isNotBlank(bo.getPeriodReason()), OrderInvoice::getPeriodReason, bo.getPeriodReason());
+        lqw.eq(StrUtil.isNotBlank(bo.getCompanyAddress()), OrderInvoice::getCompanyAddress, bo.getCompanyAddress());
+        lqw.eq(StrUtil.isNotBlank(bo.getPhone()), OrderInvoice::getPhone, bo.getPhone());
+        lqw.like(StrUtil.isNotBlank(bo.getBankName()), OrderInvoice::getBankName, bo.getBankName());
+        lqw.eq(StrUtil.isNotBlank(bo.getBankAccount()), OrderInvoice::getBankAccount, bo.getBankAccount());
+        lqw.eq(StrUtil.isNotBlank(bo.getReceivingAddress()), OrderInvoice::getReceivingAddress, bo.getReceivingAddress());
+        lqw.like(StrUtil.isNotBlank(bo.getReceivingName()), OrderInvoice::getReceivingName, bo.getReceivingName());
+        lqw.eq(StrUtil.isNotBlank(bo.getReceivingTel()), OrderInvoice::getReceivingTel, bo.getReceivingTel());
         return entity2Vo(this.list(lqw));
     }
 
@@ -116,6 +124,6 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
 
     @Override
     public List<OrderInvoiceVo> selectList(OrderInvoiceQueryBo bo) {
-        return this.baseMapper.selectList(bo);
+        return baseMapper.selectList(bo);
     }
 }

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

@@ -14,7 +14,7 @@ import java.util.List;
  * 订单发票视图对象 mall_package
  *
  * @author hjl
- * @date 2022-03-28
+ * @date 2022-03-29
  */
 @Data
 @ApiModel("订单发票视图对象")
@@ -33,10 +33,6 @@ public class OrderInvoiceVo {
 	@Excel(name = "发票抬头")
 	@ApiModelProperty("发票抬头")
 	private String invoiceTitle;
-	/** 手机号码 */
-	@Excel(name = "手机号码")
-	@ApiModelProperty("手机号码")
-	private String telphone;
 	/** 邮箱 */
 	@Excel(name = "邮箱")
 	@ApiModelProperty("邮箱")
@@ -93,13 +89,43 @@ public class OrderInvoiceVo {
 	@Excel(name = "申请时间")
 	@ApiModelProperty("申请时间")
 	private Long applyTime;
+	/** 发票图片地址 */
+	@Excel(name = "发票图片地址")
+	@ApiModelProperty("发票图片地址")
+	private String invoiceImg;
 	/** 审核原因 */
 	@Excel(name = "审核原因")
 	@ApiModelProperty("审核原因")
 	private String periodReason;
-	@Excel(name = "订单列表")
+	/** 公司地址 */
+	@Excel(name = "公司地址")
+	@ApiModelProperty("公司地址")
+	private String companyAddress;
+	/** 电话号码 */
+	@Excel(name = "电话号码")
+	@ApiModelProperty("电话号码")
+	private String phone;
+	/** 开户银行 */
+	@Excel(name = "开户银行")
+	@ApiModelProperty("开户银行")
+	private String bankName;
+	/** 银行账号 */
+	@Excel(name = "银行账号")
+	@ApiModelProperty("银行账号")
+	private String bankAccount;
+	/** 收件地址 */
+	@Excel(name = "收件地址")
+	@ApiModelProperty("收件地址")
+	private String receivingAddress;
+	/** 收件人姓名 */
+	@Excel(name = "收件人姓名")
+	@ApiModelProperty("收件人姓名")
+	private String receivingName;
+	/** 收件人手机号码 */
+	@Excel(name = "收件人手机号码")
+	@ApiModelProperty("收件人手机号码")
+	private String receivingTel;
 	@ApiModelProperty("订单列表")
 	private List<OrderGoodsVo> orderList;
 
-
 }

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

@@ -8,7 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"/>
@@ -25,14 +24,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="trackingNum" column="tracking_num"/>
         <result property="makeOutTime" column="make_out_time"/>
         <result property="applyTime" column="apply_time"/>
+        <result property="invoiceImg" column="invoice_img"/>
         <result property="periodReason" column="period_reason"/>
+        <result property="companyAddress" column="company_address"/>
+        <result property="phone" column="phone"/>
+        <result property="bankName" column="bank_name"/>
+        <result property="bankAccount" column="bank_account"/>
+        <result property="receivingAddress" column="receiving_address"/>
+        <result property="receivingName" column="receiving_name"/>
+        <result property="receivingTel" column="receiving_tel"/>
     </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"/>
@@ -47,7 +53,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="trackingNum" column="tracking_num"/>
         <result property="makeOutTime" column="make_out_time"/>
         <result property="applyTime" column="apply_time"/>
+        <result property="invoiceImg" column="invoice_img"/>
         <result property="periodReason" column="period_reason"/>
+        <result property="companyAddress" column="company_address"/>
+        <result property="phone" column="phone"/>
+        <result property="bankName" column="bank_name"/>
+        <result property="bankAccount" column="bank_account"/>
+        <result property="receivingAddress" column="receiving_address"/>
+        <result property="receivingName" column="receiving_name"/>
+        <result property="receivingTel" column="receiving_tel"/>
         <collection property="orderList" column="invoice_id" select="findOrderList"/>
     </resultMap>