Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

 Conflicts:

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

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

@@ -1997,7 +1997,37 @@
         </if>
     </select>
 
-
+    <select id="queryPickUpCodeList" resultType="com.kmall.admin.entity.OrderEntity">
+        SELECT distinct
+        o.*,
+        c.pick_up_code_sn,
+        c.pick_up_code_status
+        FROM mall_order o
+        LEFT JOIN mall_pick_up_code c ON c.order_sn = o.order_sn
+        WHERE 1=1
+        <if test="storeId != null and storeId != ''">
+            AND o.store_id = #{storeId}
+        </if>
+        <if test="isOnfiilineOrder != null">
+            AND o.is_onffline_order = #{isOnfiilineOrder}
+        </if>
+        <if test="orderSn != null and orderSn.trim() != ''">
+            AND o.order_sn LIKE concat('%',#{orderSn},'%')
+        </if>
+        <if test="payName != null and payName.trim() != ''">
+            AND o.pay_name = LIKE concat('%',#{payName},'%')
+        </if>
+        <if test="payMobile != null and payMobile.trim() != ''">
+            AND o.pay_mobile LIKE concat('%',#{pay_mobile},'%')
+        </if>
+        <if test="startTime != null and startTime.trim() != ''">
+            AND o.add_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime.trim() != ''">
+            AND o.add_time &lt; #{endTime}
+        </if>
+        order by o.id desc
+    </select>
 
     <update id="updateOrderInfo" parameterType="map">
         UPDATE mall_order a