bug

src/main/java/com/huiju/estateagents/bo/request/RaiseOrderRequestBO.java

@@ -23,6 +23,11 @@ public class RaiseOrderRequestBO {
      */
     private Integer orderId;
 
+    /**
+     * 订单表ID
+     */
+    private Integer refundedOrderId;
+
     /**
      * 认筹单表ID
      */

src/main/java/com/huiju/estateagents/entity/TaRaiseRecord.java

@@ -240,4 +240,10 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private String captcha;
+
+    /**
+     * 订单id
+     */
+    @TableField(exist = false)
+    private Integer refundedOrderId;
 }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -46,7 +46,6 @@
             AND t4.`status` = 1
         <if test = "source == 'raiseChoose'">
             AND ( t6.`status` != 0 OR t6.`status` IS NULL )
-            --AND (t.house_locking_status  != 'locked' OR t.house_locking_status IS NULL)
             AND t7.raise_start_time &lt;= now() AND t7.raise_end_time &gt;= now()
             <if test="personId != null and personId != ''">
                 AND (t6.person_id != #{personId} OR t6.person_id IS NULL)

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -139,6 +139,7 @@
             t2.trade_no,
             t2.transaction_id,
             t4.refund_no,
+            t4.order_id as refunded_order_id,
             t2.total_fee
         FROM
             ta_raise_record t
@@ -154,6 +155,9 @@
             <if test = "bo.orderId != null and bo.orderId != ''">
                 AND t2.order_id = #{bo.orderId}
             </if>
+            <if test = "bo.refundedOrderId != null and bo.refundedOrderId != ''">
+                AND t4.order_id = #{bo.refundedOrderId}
+            </if>
             <if test = "bo.raiseRecordId != null and bo.raiseRecordId != ''">
                 AND t.raise_record_id = #{bo.raiseRecordId}
             </if>
@@ -173,7 +177,7 @@
                 AND t2.refund_no = #{bo.refundNo}
             </if>
             <if test = "bo.payStatus == 'paid'">
-                AND t.pay_status = #{bo.payStatus}
+                AND t.pay_status IN ('refunded','paid')
             </if>
             <if test = "bo.payStatus == 'refunded'">
                 AND t.pay_status IN ('refunded','change')