bugfix

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

@@ -162,7 +162,8 @@
             </if>
             <if test="receiptType != null and receiptType != ''">
                 <if test="receiptType==2">
-                    AND (a.receiptType = 9)
+                    and (a.receiptType = 9)
+            or a.receiptType = #{receiptType}
                 </if>
                 <if test="receiptType!=2">
                     AND a.receiptType = #{receiptType}
@@ -170,9 +171,9 @@
             </if>
         <if test="newReceiptType !=null">
             <if test="newReceiptType==3">
-                AND a.newReceiptType is null
+              and a.newReceiptType =3
             </if>
-            <if test="newReceiptType!=3">
+            <if test="newReceiptType != 3">
                 and a.newReceiptType=#{newReceiptType}
             </if>
         </if>
@@ -216,7 +217,7 @@
                 <if test="paYee == '采美'">
                    and a.payWay = 3
                     OR a.payWay = 2
-                    AND a.newReceiptType != 3 AND a.payWay =2
+                    AND a.newReceiptType != 3 AND a.payWay = 2
                 </if>
             <if test="payWay==1">
                and s.name=#{paYee}

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

@@ -250,7 +250,7 @@
             </div>
         </c:if>
     </div>
-    <c:if test="${cmDiscernReceipt.newReceiptType eq 2}">
+    <c:if test="${not empty op.shopOrderNo}">
         <h5>关联订单</h5>
         <div class="receipt-order-form">
             <div class="receipt-order-row2">
@@ -550,9 +550,9 @@
                                     </c:if>
                                 </c:if>
                                 </span>
-                                <span>
-                                    ${receiptRecord.receiptAmount}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${vo.confirmer} 确认 ${vo.confirmTime}
-                                </span>
+<%--                                <span>--%>
+<%--                                    ${receiptRecord.receiptAmount}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${vo.confirmer} 确认 ${vo.confirmTime}--%>
+<%--                                </span>--%>
                             </div>
                         </c:forEach>
                     </div>

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

@@ -259,11 +259,13 @@
             </c:if>
             <td>
                     ${fns:getDictLabel(cmDiscernReceipt.receiptType, 'receiptType', null)}
+                        <c:if test="${cmDiscernReceipt.receiptType eq 2 or cmDiscernReceipt.receiptType eq 9}">
                 <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>
+                        </c:if>
             </td>
             <td>${fns:getDictLabel(cmDiscernReceipt.payType, 'payType', null)}</td>
             <td>
@@ -317,8 +319,8 @@
                 <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>
             </td>
            <td>   <%--  <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.orderID}）</a>--%>
-                <c:if test="${cmDiscernReceipt.newReceiptType eq 2}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNos}（${cmDiscernReceipt.orderID}）</a></c:if>
-                <c:if test="${cmDiscernReceipt.receiptType != 6 && cmDiscernReceipt.newReceiptType != 2}">${cmDiscernReceipt.orders}</c:if>
+                <c:if test="${cmDiscernReceipt.receiptType eq 2}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNos}（${cmDiscernReceipt.orderID}）</a></c:if>
+                <c:if test="${cmDiscernReceipt.receiptType != 6 || cmDiscernReceipt.receiptType != 2}">${cmDiscernReceipt.orders}</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>