供应商退款-子订单列表bugfix

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -694,6 +694,9 @@ public class ReceiptServiceImpl implements ReceiptService {
         } else {
             userName = keyword;
         }
+        if (null != excludeOrderId) {
+            orderId = null;
+        }
         ReceiptParamsBo params = new ReceiptParamsBo();
         params.setUserIds(userIds);
         params.setOrderId(orderId);

src/main/resources/mapper/ReceiptMapper.xml

@@ -475,10 +475,10 @@
         LEFT JOIN user u ON o.userID = u.userID
         LEFT JOIN cm_order_product cop ON o.orderID = cop.orderID
         <where>
-            <if test="excludeOrderId != null and excludeOrderId != ''">
+            <if test="excludeOrderId != null">
                 AND o.orderID != #{excludeOrderId}
             </if>
-            <if test="orderId != null and orderId != ''">
+            <if test="orderId != null">
                 AND o.orderID = #{orderId}
             </if>
             AND o.delFlag = '0'
@@ -676,7 +676,7 @@
         LEFT JOIN user u ON u.userID = cso.userID
         WHERE cso.delFlag = 0
         AND (cror.delFlag = 0 OR cror.id IS NULL)
-        <if test="shopName != null">
+        <if test="orderId != null">
             AND cso.orderID = #{orderId}
         </if>
         <if test="shopName != null and shopName != ''">