Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

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" +
             " <if test='param.companyId != null'> and d.company_id = #{param.companyId} </if>" +

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;
 }