From 4f7ba9881c5ce3cab0f107893665b237896d7d7f Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 14 Feb 2023 17:11:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hai/dao/order/OrderMapperExt.java | 4 +++- .../src/main/java/com/hai/order/model/OrderCouponModel.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java index 22aaf27e..9f858455 100644 --- a/hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java @@ -61,9 +61,11 @@ public interface OrderMapperExt { " b.create_time createTime," + " b.pay_time payTime," + " b.finish_time finishTime," + - " case b.exception_status when 1 then '异常' when 0 then '正常' else '未知' end exceptionStatus" + + " case b.exception_status when 1 then '异常' when 0 then '正常' else '未知' end exceptionStatus," + + " c.cou_no couNo" + " from high_child_order a" + " LEFT JOIN high_order b on b.id = a.order_id" + + " LEFT JOIN (select child_order_id, cou_no from high_coupon_code_other where child_order_id is not null GROUP BY child_order_id) c on c.child_order_id = a.id" + " LEFT JOIN high_coupon d on d.id = a.goods_id" + " where a.goods_type = 1" + " and d.company_id = #{param.companyId} " + diff --git a/hai-service/src/main/java/com/hai/order/model/OrderCouponModel.java b/hai-service/src/main/java/com/hai/order/model/OrderCouponModel.java index 6d3b2f3f..75f21170 100644 --- a/hai-service/src/main/java/com/hai/order/model/OrderCouponModel.java +++ b/hai-service/src/main/java/com/hai/order/model/OrderCouponModel.java @@ -99,4 +99,8 @@ public class OrderCouponModel { @ColumnWidth(10) @ExcelProperty(value = "异常状态") private String exceptionStatus; + + @ColumnWidth(50) + @ExcelProperty(value = "券码") + private String couNo; }