From 751649a51189293afcdf7c3c58a9526d29e04625 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 12 Apr 2021 23:34:17 +0800
Subject: [PATCH] 1

---
 .../java/com/hai/dao/HighOrderMapperExt.java  |  6 +++--
 .../java/com/hai/model/HighOrderData.java     | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
index 8bf9ceb0..68729d2f 100644
--- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
@@ -44,10 +44,10 @@ public interface HighOrderMapperExt {
     @Select({
             "<script>",
             "select",
-            "coupon_code_id, child_order_id,order_no,mem_name,mem_phone,pay_model,a.pay_type as pay_type, coupon.merchant_id as merchant_id, store_id,pay_gold,pay_price,pay_real_price, ",
+            "coupon_code_id, child_order_id, goods_name , giveaway_type , order_no,mem_name,mem_phone,pay_model,a.pay_type as pay_type, coupon.merchant_id as merchant_id, store_id,pay_gold,pay_price,pay_real_price, ",
             "pay_serial_no,order_status,total_price,a.create_time as create_time ,order_id,company_id, goods_type ",
             "from high_coupon coupon join (  select * from high_order od ",
-            "join (select cc.id as coupon_code_id,     cc.child_order_id, merchant_id,coupon_id,order_id,store_id, goods_type ",
+            "join (select cc.id as coupon_code_id, co.goods_name , co.giveaway_type ,   cc.child_order_id, merchant_id,coupon_id,order_id,store_id, goods_type ",
             "from high_coupon_code cc join high_child_order co on cc.child_order_id = co.id) cocc on cocc.order_id = od.id ",
             ") a on coupon.id = a.coupon_id ",
             "where ",
@@ -73,6 +73,8 @@ public interface HighOrderMapperExt {
             @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
             @Result(column="pay_gold", property="payGold", jdbcType=JdbcType.INTEGER),
             @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL),
+            @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
+            @Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT),
             @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
             @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR),
             @Result(column="order_status", property="orderStatus", jdbcType=JdbcType.INTEGER),
diff --git a/hai-service/src/main/java/com/hai/model/HighOrderData.java b/hai-service/src/main/java/com/hai/model/HighOrderData.java
index 55848450..8ec01db3 100644
--- a/hai-service/src/main/java/com/hai/model/HighOrderData.java
+++ b/hai-service/src/main/java/com/hai/model/HighOrderData.java
@@ -35,6 +35,16 @@ public class HighOrderData extends HighOrder {
      */
     private Integer goodsType;
 
+    /**
+     * 商品的名称
+     */
+    private String goodsName;
+
+    /**
+     * 是否是赠品  0：否   1：是
+     */
+    private Boolean giveawayType;
+
     public Long getChildOrderId() {
         return childOrderId;
     }
@@ -82,4 +92,20 @@ public class HighOrderData extends HighOrder {
     public void setGoodsType(Integer goodsType) {
         this.goodsType = goodsType;
     }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public Boolean getGiveawayType() {
+        return giveawayType;
+    }
+
+    public void setGiveawayType(Boolean giveawayType) {
+        this.giveawayType = giveawayType;
+    }
 }