bugfix

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -168,6 +168,9 @@
             <if test="shopOrderId != null and shopOrderId != ''">
                 AND (cso.shopOrderId = #{shopOrderId} )
             </if>
+            <if test="shopOrderNo != null and shopOrderNo != ''">
+                AND (cso.shopOrderNo = #{shopOrderNo} )
+            </if>
             <if test="userName != null and userName != ''">
                 AND (u.userName LIKE concat('%',#{userName},'%') or u.name LIKE concat('%',#{userName},'%'))
             </if>

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -931,15 +931,6 @@
             <if test="shopOrderNo != null and shopOrderNo != ''">
                 AND a.shopOrderNo like concat('%', #{shopOrderNo} ,'%')
             </if>
-            <if test="operatingMode != null and operatingMode == '1'.toString()">
-                and a.payStatus != 3 and co.status NOT IN (6,7)
-            </if>
-            <if test="operatingMode != null and operatingMode == '2'.toString()">
-                and a.payStatus != 1 and co.status != 6
-            </if>
-            <if test="operatingMode != null and operatingMode == '3'.toString()">
-                and a.payStatus = 3 and co.status NOT IN (6,7)
-            </if>
             and co.delFlag = 0
             --              and not (co.secondHandOrderFlag=1 AND co.rebateFlag=1)
             and a.delFlag = 0

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

@@ -116,10 +116,10 @@
         <div>
             <label>收款ID：</label>
             <form:input path="id" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
-            <label>订单ID：</label>
+            <label>子订单ID：</label>
             <form:input path="shopOrderId" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
-            <label>订单编号：</label>
-            <form:input path="orderNo" htmlEscape="false" maxlength="50" class="input-medium"/>
+            <label>子订单编号：</label>
+            <form:input path="shopOrderNo" htmlEscape="false" maxlength="50" class="input-medium"/>
             <label>机构名称：</label>
             <form:input path="userName" htmlEscape="false" maxlength="25" class="input-medium"/>
             <label>收款方：</label>