添加收款方

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

@@ -161,11 +161,22 @@
                 AND a.payType = #{payType}
             </if>
             <if test="receiptType != null and receiptType != ''">
-                AND a.receiptType = #{receiptType}
+                <if test="receiptType==2">
+                    AND (a.receiptType = 2 or a.receiptType = 9)
+                </if>
+                <if test="receiptType!=2">
+                    AND a.receiptType = #{receiptType}
+                </if>
+            </if>
+        <if test="newReceiptType !=null">
+            <if test="newReceiptType==3">
+                AND a.newReceiptType is null
+            </if>
+            <if test="newReceiptType!=3">
+                and a.newReceiptType=#{newReceiptType}
             </if>
-        <if test="newReceiptType !=null and newReceiptType !=''">
-             and newReceiptType=#{newReceiptType}
         </if>
+
             <if test="receiptStatus != null and receiptStatus != ''">
                 AND a.receiptStatus = #{receiptStatus}
             </if>

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

@@ -262,6 +262,7 @@
                 <c:if test="${cmDiscernReceipt.newReceiptType eq 1}">-上架费</c:if>
                         <c:if test="${cmDiscernReceipt.newReceiptType eq 2}">-订单返佣</c:if>
                         <c:if test="${cmDiscernReceipt.newReceiptType eq 3}">-认证通会员</c:if>
+                        <c:if test="${cmDiscernReceipt.receiptType eq 9}">认证通会员</c:if>
                         <c:if test="${cmDiscernReceipt.newReceiptType eq 4}">-认证通企划</c:if>
             </td>
             <td>${fns:getDictLabel(cmDiscernReceipt.payType, 'payType', null)}</td>
@@ -284,7 +285,7 @@
                 <c:if test="${cmDiscernReceipt.payWay != 2}">-----</c:if>
             </td>
             <td>
-                <c:if test="${(cmDiscernReceipt.payWay == '3' || cmDiscernReceipt.payWay == '2') && (cmDiscernReceipt.receiptType==1 || cmDiscernReceipt.receiptType==2 || cmDiscernReceipt.receiptType==3 || cmDiscernReceipt.receiptType==4) || cmDiscernReceipt.newReceiptType == 3 && cmDiscernReceipt.payWay ==2}">
+                <c:if test="${(cmDiscernReceipt.payWay == '3' || cmDiscernReceipt.payWay == '2') && (cmDiscernReceipt.receiptType==1 || cmDiscernReceipt.receiptType==2 || cmDiscernReceipt.receiptType==3 || cmDiscernReceipt.receiptType==4 || cmDiscernReceipt.receiptType==5) || cmDiscernReceipt.newReceiptType == 3 && cmDiscernReceipt.payWay ==2}">
                     采美
                 </c:if>
                 <c:if test="${cmDiscernReceipt.payWay == '1'}">