修改活动查询提示，线下订单增加取货码显示

kmall-admin/src/main/java/com/kmall/admin/entity/OrderEntity.java

@@ -205,6 +205,9 @@ public class OrderEntity implements Serializable {
 
     private BigDecimal tax;
 
+    //取货码
+    private String pickUpCodeSn;
+
 
     public BigDecimal getTopicPrice() {
         return topicPrice;
@@ -1117,4 +1120,12 @@ public class OrderEntity implements Serializable {
     public void setTax(BigDecimal tax) {
         this.tax = tax;
     }
+
+    public String getPickUpCodeSn() {
+        return pickUpCodeSn;
+    }
+
+    public void setPickUpCodeSn(String pickUpCodeSn) {
+        this.pickUpCodeSn = pickUpCodeSn;
+    }
 }

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -72,6 +72,7 @@
         <result property="fullCutPrice" column="full_cut_price"/>
         <result property="campMinusId" column="camp_minus_id"/>
         <result property="campName" column="camp_name"/>
+        <result property="pickUpCodeSn" column="pick_up_code_sn"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.OrderEntity">
@@ -395,7 +396,8 @@
         p.is_payment_send,
         p.is_ele_order_send,
         p.is_customs_send,
-        s.store_name storeName
+        s.store_name storeName,
+        c.pick_up_code_sn
         FROM
         mall_order o
 
@@ -405,6 +407,7 @@
         LEFT JOIN mall_goods gs ON g.goods_id = gs.id
         left join mall_sale_record record on record.order_sn = o.order_sn
         LEFT JOIN sys_user u ON record.saller_id = u.user_id
+        LEFT JOIN mall_pick_up_code c on o.order_sn = c.order_sn
         WHERE 1=1
         <if test="storeId != null and storeId != ''">
             AND o.store_id = #{storeId}

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescombinationprice.html

@@ -11,7 +11,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="条形码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescoupon.html

@@ -11,7 +11,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="条形码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesdiscount.html

@@ -11,7 +11,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="条形码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullgift.html

@@ -11,7 +11,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="条形码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullreduction.html

@@ -11,7 +11,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="条形码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesgetonefreegoods.html

@@ -12,7 +12,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="条形码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitieshalfprice.html

@@ -11,7 +11,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="条形码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiespromotion.html

@@ -11,7 +11,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="条形码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkdailyactivities.html

@@ -11,7 +11,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="条形码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/js/shop/offilineOrderList.js

@@ -22,6 +22,7 @@ $(function () {
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
             {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 120},
+            {label: '取货码', name: 'pickUpCodeSn', index: 'pick_up_code_sn', align: 'center',width: 80},
             {label: '操作店员', name: 'userName', index: 'user_name', align: 'center',width: 80},
             {
                 label: '购买类型', name: 'isOnfflineOrder', index: 'is_onffline_order', align: 'center',width: 80,