bugfix

src/main/java/com/caimei365/order/model/vo/ReceiptVo.java

@@ -61,6 +61,14 @@ public class ReceiptVo implements Serializable {
      * 撤销原因
      */
     private String cancelReason;
+    /**
+     * 审核不通过原因
+     */
+    private String reviewReason;
+    /**
+     * 非订单款说明
+     */
+    private String noOrderReason;
     /**
      * 单次收款金额
      */

src/main/resources/mapper/ReceiptMapper.xml

@@ -292,13 +292,13 @@
         <if test="endDate != null  and endDate != ''">
             AND cdr.receiptDate <![CDATA[  <  ]]> #{endDate}
         </if>
-        <if test="receiptStatusArr != null and receiptStatusArr != ''">
+        <if test="receiptStatusArr != null">
             AND cdr.receiptStatus in
             <foreach collection="receiptStatusArr" open="(" close=")" separator="," item="val">
                 #{val}
             </foreach>
         </if>
-        <if test="userIds != null and userIds.size() > 0 and receiptStatus != 1">
+        <if test="userIds != null and userIds.size() > 0">
             AND ((co.userID IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="val">
                     #{val}
@@ -311,7 +311,7 @@
                 AND cror.relationType = 1)
             OR cror.orderID IS NULL)
         </if>
-        ORDER BY cdr.receiptDate desc
+        ORDER BY cdr.updateDate desc
     </select>
     <select id="getReceiptDetail" resultType="com.caimei365.order.model.vo.ReceiptVo">
         SELECT DISTINCT
@@ -792,7 +792,7 @@
         </if>
     </select>
     <select id="countNeedPayAmount" resultType="java.lang.Double">
-        SELECT SUM(cso.needPayAmount) FROM cm_receipt_order_relation cror
+        SELECT IFNULL(SUM(cso.needPayAmount), 0) FROM cm_receipt_order_relation cror
             LEFT JOIN  cm_discern_receipt cdr ON cdr.id = cror.receiptID
             LEFT JOIN cm_shop_order cso ON cso.shopOrderID = cror.orderID
         WHERE cror.delFlag = '0' AND cror.relationType = '1' AND cdr.receiptType = 3