submit

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

@@ -89,6 +89,14 @@ public class OrderController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("导出订单列表")
+    @GetMapping("/kaoqian/exportList")
+    public AjaxResult<OrderKaoQianListExportVo> exportKaoqianList(OrderQueryBo bo) {
+        List<OrderKaoQianListExportVo> list = iOrderService.exportKaoqianList(bo);
+        ExcelUtil<OrderKaoQianListExportVo> util = new ExcelUtil<>(OrderKaoQianListExportVo.class);
+        return util.exportExcel(list,"考前订单记录");
+    }
+
     @ApiOperation("导出订单列表")
     @GetMapping("/exportList")
     public AjaxResult<OrderListExportVo> exportList(OrderQueryBo bo) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityRecommendServiceImpl.java

@@ -238,6 +238,7 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
 //                    item.setSpecTemplateId(relation.getSpecTemplateId());
 //                }
 //            }
+            item.setBeforeSign(goods.getBeforeSign());
             //多规格下的价格区间
             if (ObjectUtils.isNotNull(goods.getSpecTemplateId())){
                 item.setSpecTemplateId(goods.getSpecTemplateId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityRecommendGoodsVo.java

@@ -65,4 +65,8 @@ public class ActivityRecommendGoodsVo {
 
 	@ApiModelProperty("最大价格")
 	private BigDecimal maxPrice;
+
+
+	@ApiModelProperty("外部考前订单标签：0否1是")
+	private Integer beforeSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -430,4 +430,7 @@ public class GoodsVo {
 
 	/** 是否有题库答案：1 有 0没有 */
 	private Integer isQuestionAnswer;
+
+	@ApiModelProperty("外部考前订单标签：0否1是")
+	private Integer beforeSign;
 }

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

@@ -146,4 +146,7 @@ public class OrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("业务员")
 	private String salesman;
+
+	@ApiModelProperty("外部考前订单标签：0否1是")
+	private Integer beforeSign;
 }

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

@@ -146,4 +146,7 @@ private static final long serialVersionUID=1L;
     /** 课时标识：1 显示 0不显示 */
     private Integer hoursSign;
 
+    @ApiModelProperty("外部考前订单标签：0否1是")
+    private Integer beforeSign;
+
 }

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

@@ -155,4 +155,5 @@ public interface IOrderService extends IService<Order> {
 
     String closeOrderImport(List<CloseOrderImport> importList);
 
+	List<OrderKaoQianListExportVo> exportKaoqianList(OrderQueryBo bo);
 }

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

@@ -617,6 +617,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
+            orderGoods.setBeforeSign(goods.getBeforeSign());
             if (g.getGoodsInputData() != null) {
                 orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
             }
@@ -854,6 +855,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 //            }
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
+            orderGoods.setBeforeSign(goods.getBeforeSign());
             if (g.getGoodsInputData() != null) {
                 orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
             }
@@ -1501,6 +1503,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
+            orderGoods.setBeforeSign(goods.getBeforeSign());
             orderGoods.setGoodsYear(goods.getYear().toString());
             if (g.getGoodsInputData() != null) {
                 orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
@@ -1947,6 +1950,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
+            orderGoods.setBeforeSign(goods.getBeforeSign());
             if (g.getGoodsInputData() != null) {
                 orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
             }
@@ -2188,6 +2192,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
+            orderGoods.setBeforeSign(goods.getBeforeSign());
             if (g.getGoodsInputData() != null) {
                 orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
             }
@@ -3924,6 +3929,29 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return "";
     }
 
+    @Override
+    public List<OrderKaoQianListExportVo> exportKaoqianList(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<OrderKaoQianListExportVo> list = new ArrayList<>();
+        for(OrderListVo vo : orderListVos){
+            OrderKaoQianListExportVo item = BeanUtil.toBean(vo,OrderKaoQianListExportVo.class);
+            list.add(item);
+        }
+        return list;
+    }
+
     /**
      * 根据身份证号码判断性别
      *

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

@@ -0,0 +1,76 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单视图对象")
+public class OrderKaoQianListExportVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单编号
+     */
+    @Excel(name = "订单编号")
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "姓名")
+    @ApiModelProperty("真实姓名")
+    private String realname;
+
+    @Excel(name = "手机号码")
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    /**
+     * 身份证号
+     */
+    @Excel(name = "身份证号")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+
+
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+    /**
+     * 商品名称
+     */
+    @Excel(name = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    /**
+     * 订单价格
+     */
+    @Excel(name = "订单价格")
+    @ApiModelProperty("订单价格")
+    private BigDecimal orderPrice;
+
+    @Excel(name = "专业")
+    @ApiModelProperty("专业")
+    private String categoryName;
+
+
+    @Excel(name = "教育名称")
+    @ApiModelProperty("教育名称")
+    private String educationName;
+
+
+
+}

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -109,6 +109,7 @@
         <result property="mailSign" column="mail_sign"/>
         <result property="classHoursStr" column="classHoursStr"/>
         <result property="hoursSign" column="hours_Sign"/>
+        <result property="beforeSign" column="before_sign"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>

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

@@ -158,6 +158,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderType != null and orderType != ''">
             AND o.order_type = #{orderType}
         </if>
+        <if test="beforeSign != null and beforeSign != ''">
+            AND og.before_sign = #{beforeSign}
+        </if>
         <if test="orderStatus != null ">
             AND o.order_status in
             <foreach collection="orderStatus" item="item" index="index" open="(" close=")" separator=",">