呵呵订单列表/订单资料列表增加筛选项

src/main/resources/mappings/modules/archive/CmOrderArchiveMapper.xml

@@ -54,6 +54,9 @@
             <if test="shopOrderId != null and shopOrderId != ''">
                 AND a.shopOrderId = #{shopOrderId}
             </if>
+            <if test="orderId != null and orderId != ''">
+                AND co.orderID = #{orderId}
+            </if>
             <if test="shopName != null and shopName != ''">
                 AND a.shopName LIKE
                 <if test="dbName == 'oracle'">'%'||#{shopName}||'%'</if>

src/main/resources/mappings/modules/hehe/HeHeNewOrderMapper.xml

@@ -225,6 +225,17 @@
                     AND (select count(1) from cm_returned_purchase crp where co.orderID = crp.orderID and crp.status = 3 and crp.delFlag = 0) > 0
                 </if>
             </if>
+            <if test="collageFlag != null">
+                <if test="collageFlag == 1">
+                    and chcm.id is not null
+                </if>
+                <if test="collageFlag == 0">
+                    and chcm.id is null
+                </if>
+            </if>
+            <if test="collageStatus != null">
+                and chc.status = #{collageStatus}
+            </if>
             AND co.delFlag = 0
         </where>
         <choose>

src/main/webapp/WEB-INF/views/modules/archive/cmOrderArchiveList.jsp

@@ -67,6 +67,8 @@
         <form:input path="title" htmlEscape="false" maxlength="35" class="input-medium"/>
         <label>子订单id：</label>
         <form:input path="shopOrderId" htmlEscape="false" class="input-medium" onkeyup="onlynum(this)"/>
+        <label>母订单id</label>
+        <form:input path="orderId" htmlEscape="false" class="input-medium" onkeyup="onlynum(this)"/>
         <label>供应商名称：</label>
         <form:input path="shopName" htmlEscape="false" maxlength="55" class="input-medium"/>
         <label>机构名称：</label>

src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderList.jsp

@@ -680,6 +680,14 @@
                 <label>订单ID：</label>
                 <form:input path="orderID" id="orderID" htmlEscape="false" maxlength="30" class="input-medium"/>
             </div>
+            <div class="item">
+                <label>订单类型：</label>
+                <form:select path="collageFlag" class="select-ele input-medium required">
+                    <form:option value="" label="所有"/>
+                    <form:option value="0" label="独立订单"/>
+                    <form:option value="1" label="拼团订单"/>
+                </form:select>
+            </div>
             <div class="item">
                 <label>订单编号：</label>
                 <form:input path="orderNo" htmlEscape="false" maxlength="30" class="input-medium"/>
@@ -708,6 +716,14 @@
                                   htmlEscape="false"/>
                 </form:select>
             </div>
+            <div class="item">
+                <label>拼团状态：</label>
+                <form:select path="collageStatus" class="select-ele input-medium required">
+                    <form:option value="" label="所有"/>
+                    <form:option value="1" label="拼团中"/>
+                    <form:option value="2" label="已拼成"/>
+                </form:select>
+            </div>
             <div class="item">
                 <label>发货状态：</label>
                 <form:select path="sendOutStatus" class="select-ele input-medium required">