Merge branch 'dev' into 202511

yami-shop-service/src/main/resources/mapper/OrderRefundMapper.xml

@@ -459,7 +459,7 @@
                 </foreach>
             </if>
             <if test="orderRefund.dvyType != null and orderRefund.dvyType != ''">
-                and o.dvy_type = #{orderParam.dvyType}
+                and o.dvy_type = #{orderRefund.dvyType}
             </if>
             <if test="orderRefund.refundSn != null">
                 and re.refund_sn = #{orderRefund.refundSn}
@@ -499,7 +499,7 @@
                 </foreach>
             </if>
             <if test="orderRefund.dvyType != null and orderRefund.dvyType != ''">
-                and o.dvy_type = #{orderParam.dvyType}
+                and o.dvy_type = #{orderRefund.dvyType}
             </if>
             <if test="orderRefund.refundSn != null">
                 and refund.refund_sn = #{orderRefund.refundSn}
@@ -561,7 +561,7 @@
                 </foreach>
             </if>
             <if test="orderRefund.dvyType != null and orderRefund.dvyType != ''">
-                and o.dvy_type = #{orderParam.dvyType}
+                and o.dvy_type = #{orderRefund.dvyType}
             </if>
             <if test="orderRefund.refundSn != null">
                 and refund.refund_sn = #{orderRefund.refundSn}