Merge branch 'pxb' into xin

xin

2025-09-04 ea26c842829ef69be20ef86d6a546f45c6c5a258

 oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml

@@ -132,9 +132,16 @@

    <update id="updatePayStatus">
        update sh_order_return
        set return_status = #{payState},
            success_time  = #{payTime}
        where order_num = #{orderNum}
        set refund_status = #{refundStatus},
            success_time  = #{successTime}
        where return_num = #{returnNum}
    </update>
    <update id="updateStatus">
        update sh_order_return
        set return_status = #{returnStatus},
            return_status_describe = #{value},
            audit_status  = #{auditStatus}
        where return_num = #{returnNum}
    </update>

    <select id="findAll" resultMap="BaseResultMap">
@@ -151,7 +158,7 @@
        ) o
        left join sh_order_return_product_snapshot as p on p.return_num = o.return_num
        <include refid="Where_Sql_Product"/>
        order by o.order_id desc
        order by o.return_id desc
    </select>
    <select id="getByReturnNum" resultMap="BaseResultMap">
        select o.* from ( select
@@ -173,4 +180,10 @@
        <include refid="Where_Sql_Product"/>
        ) t
    </select>
    <select id="getByOrderNum" resultType="com.oying.modules.sh.domain.OrderReturn">
        select
        <include refid="Base_Column_List"/>
        from sh_order_return as o
        where o.order_num = #{orderNum} and o.audit_status = #{status}
    </select>
</mapper>