fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -18,10 +18,7 @@ import com.zhongzheng.modules.goods.vo.QuestionOpenImportVo;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
-import com.zhongzheng.modules.order.vo.MailOrderVo;
-import com.zhongzheng.modules.order.vo.OrderGoodsVo;
-import com.zhongzheng.modules.order.vo.OrderListVo;
-import com.zhongzheng.modules.order.vo.OrderVo;
+import com.zhongzheng.modules.order.vo.*;
 import com.zhongzheng.modules.system.bo.SysTenantEditBo;
 import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysTenantService;
@@ -80,6 +77,14 @@ public class OrderController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("导出订单列表")
+    @GetMapping("/exportList")
+    public AjaxResult<OrderListExportVo> exportList(OrderQueryBo bo) {
+        List<OrderListExportVo> list = iOrderService.selectExportList(bo);
+        ExcelUtil<OrderListExportVo> util = new ExcelUtil<>(OrderListExportVo.class);
+        return util.exportExcel(list,"线上订单记录");
+    }
+
     /**
      * 查询订单列表
      */

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

@@ -140,4 +140,7 @@ public class OrderQueryBo extends BaseEntity {
 	private String oldInstitutionId;
 	@ApiModelProperty("旧客户ID")
 	private String oldCustomerId;
+
+	@ApiModelProperty("公司名称")
+	private String companyName;
 }

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

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.goods.vo.QuestionOpenImportVo;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import com.zhongzheng.modules.order.vo.OrderListExportVo;
 import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderVo;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderInvoiceVo;
@@ -39,6 +40,8 @@ public interface IOrderService extends IService<Order> {
 
 	List<OrderListVo> selectList(OrderQueryBo bo);
 
+	List<OrderListExportVo> selectExportList(OrderQueryBo bo);
+
 	List<OrderListVo> selectDangAnOrderList(OrderQueryBo bo);
 
 	List<OrderListVo> selectRebuyList(OrderQueryBo bo);

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

@@ -56,10 +56,7 @@ import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.*;
 import com.zhongzheng.modules.order.mapper.OrderMapper;
 import com.zhongzheng.modules.order.service.*;
-import com.zhongzheng.modules.order.vo.OrderGoodsVo;
-import com.zhongzheng.modules.order.vo.OrderListVo;
-import com.zhongzheng.modules.order.vo.OrderPayVo;
-import com.zhongzheng.modules.order.vo.OrderVo;
+import com.zhongzheng.modules.order.vo.*;
 import com.zhongzheng.modules.system.domain.SysOldOrg;
 import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysOldOrgService;
@@ -283,6 +280,30 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return orderListVos;
     }
 
+    @Override
+    public List<OrderListExportVo> selectExportList(OrderQueryBo bo) {
+        if (Validator.isNotEmpty(bo.getOrderGoodsStatus())) {
+            if (bo.getOrderGoodsStatus() == -1) {
+                Integer[] orderStatus = new Integer[]{-2, -1};
+                bo.setOrderStatus(orderStatus);
+            } else if (bo.getOrderGoodsStatus() == 0) {
+                bo.setGoodsPayStatus(1);
+            } else if (bo.getOrderGoodsStatus() == 1) {
+                //已支付 sql实现
+            } else if (bo.getOrderGoodsStatus() == 2) {
+                bo.setRefundStatus(2);
+            }
+        }
+        List<OrderListVo> orderListVos = this.baseMapper.selectListByBo(bo);
+        List<OrderListExportVo> list = new ArrayList<>();
+        for(OrderListVo vo : orderListVos){
+            OrderListExportVo item = BeanUtil.toBean(vo,OrderListExportVo.class);
+            item.setPayTime(DateUtils.timestampToDate(vo.getPayTime()));
+            list.add(item);
+        }
+        return list;
+    }
+
     @Override
     public List<OrderListVo> selectDangAnOrderList(OrderQueryBo bo) {
         if (Validator.isNotEmpty(bo.getOrderGoodsStatus())) {

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

@@ -0,0 +1,93 @@
+package com.zhongzheng.modules.order.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单视图对象")
+public class OrderListExportVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "姓名")
+    @ApiModelProperty("真实姓名")
+    private String realname;
+
+    /**
+     * 身份证号
+     */
+    @Excel(name = "身份证号")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+
+    /**
+     * 手机号码
+     */
+    @Excel(name = "手机号码")
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    @ApiModelProperty("公司名称")
+    private String companyName;
+    /**
+     * 订单编号
+     */
+    @Excel(name = "订单编号")
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /**
+     * 订单价格
+     */
+    @Excel(name = "订单价格")
+    @ApiModelProperty("订单价格")
+    private BigDecimal orderPrice;
+
+    /**
+     * 支付时间
+     */
+    @Excel(name = "支付时间")
+    @ApiModelProperty("支付时间")
+    private String payTime;
+
+    /**
+     * 微信流水号
+     */
+    @Excel(name = "微信流水号")
+    @ApiModelProperty("微信流水号")
+    private String transid;
+
+    /**
+     * 支付价格
+     */
+    @Excel(name = "支付价格")
+    @ApiModelProperty("支付价格")
+    private BigDecimal payPrice;
+
+    @ApiModelProperty("教育名称")
+    private String educationName;
+    @ApiModelProperty("项目名称")
+    private String projectName;
+    @ApiModelProperty("业务名称")
+    private String businessName;
+
+    @ApiModelProperty("专业名称")
+    private String categoryName;
+
+
+
+}

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

@@ -187,6 +187,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="inputOrderSn != null">
             AND o.input_order_sn = #{inputOrderSn}
         </if>
+        <if test="companyName != null and companyName != ''">
+            AND u.company_name like concat('%', #{companyName}, '%')
+        </if>
         <if test="searchKey != null and searchKey != ''">
             AND (u.realname like concat('%', #{searchKey}, '%') or o.order_sn = #{searchKey} or u.id_card = #{searchKey} or g.goods_name like concat('%', #{searchKey}, '%'))
         </if>