feat: 新增payInfo测试和部分优化appsecret

wzp

2025-05-05 94ff46df856f6d4f8d8393e22001351c793f4e5b

 ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml

@@ -42,10 +42,11 @@
        <result property="ServiceOrdNo"    column="ServiceOrdNo"    />
        <result property="CreateTime"    column="CreateTime"    />
        <result property="UpdateTime"    column="UpdateTime"    />
        <result property="OrderStatus"    column="OrderStatus"    />
    </resultMap>

    <sql id="selectTbOrdersVo">
        select OrderID, LinkPerson, LinkTel, AlarmTel, PatientName, Sex, Age, Kg, Sense, LocalAddress, LocalLongitude, LocalLatitude, LocalProvince, LocalCity, LocalDistrict, SendAddress, SendLongitude, SendLatitude, SendProvince, SendCity, SendDistrict, BookingPrice, BookingDate, Remark, Complaint, PatientCount, BookingKM, EscortCode, LiftingCode, LiftingFloor, RequirementCode, TypeCode, ThirdPartyResult, ServiceOrdID, ServiceOrdNo, CreateTime, UpdateTime from tb_orders
        select OrderID, LinkPerson, LinkTel, AlarmTel, PatientName, Sex, Age, Kg, Sense, LocalAddress, LocalLongitude, LocalLatitude, LocalProvince, LocalCity, LocalDistrict, SendAddress, SendLongitude, SendLatitude, SendProvince, SendCity, SendDistrict, BookingPrice, BookingDate, Remark, Complaint, PatientCount, BookingKM, EscortCode, LiftingCode, LiftingFloor, RequirementCode, TypeCode, ThirdPartyResult, ServiceOrdID, ServiceOrdNo, CreateTime, UpdateTime, OrderStatus from tb_orders
    </sql>

    <select id="selectTbOrdersList" parameterType="TbOrders" resultMap="TbOrdersResult">
@@ -87,6 +88,7 @@
            <if test="ServiceOrdNo != null  and ServiceOrdNo != ''"> and ServiceOrdNo = #{ServiceOrdNo}</if>
            <if test="CreateTime != null "> and CreateTime = #{CreateTime}</if>
            <if test="UpdateTime != null "> and UpdateTime = #{UpdateTime}</if>
            <if test="OrderStatus != null "> and OrderStatus = #{OrderStatus}</if>
        </where>
    </select>
    
@@ -95,9 +97,10 @@
        where OrderID = #{OrderID}
    </select>

    <insert id="insertTbOrders" parameterType="TbOrders" useGeneratedKeys="true" keyProperty="OrderID">
    <insert id="insertTbOrders" parameterType="TbOrders">
        insert into tb_orders
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="OrderID != null">OrderID,</if>
            <if test="LinkPerson != null">LinkPerson,</if>
            <if test="LinkTel != null">LinkTel,</if>
            <if test="AlarmTel != null">AlarmTel,</if>
@@ -134,8 +137,10 @@
            <if test="ServiceOrdNo != null">ServiceOrdNo,</if>
            <if test="CreateTime != null">CreateTime,</if>
            <if test="UpdateTime != null">UpdateTime,</if>
            <if test="OrderStatus != null">OrderStatus,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="OrderID != null">#{OrderID},</if>
            <if test="LinkPerson != null">#{LinkPerson},</if>
            <if test="LinkTel != null">#{LinkTel},</if>
            <if test="AlarmTel != null">#{AlarmTel},</if>
@@ -172,6 +177,7 @@
            <if test="ServiceOrdNo != null">#{ServiceOrdNo},</if>
            <if test="CreateTime != null">#{CreateTime},</if>
            <if test="UpdateTime != null">#{UpdateTime},</if>
            <if test="OrderStatus != null">#{OrderStatus},</if>
         </trim>
    </insert>

@@ -214,6 +220,7 @@
            <if test="ServiceOrdNo != null">ServiceOrdNo = #{ServiceOrdNo},</if>
            <if test="CreateTime != null">CreateTime = #{CreateTime},</if>
            <if test="UpdateTime != null">UpdateTime = #{UpdateTime},</if>
            <if test="OrderStatus != null">OrderStatus = #{OrderStatus},</if>
        </trim>
        where OrderID = #{OrderID}
    </update>
@@ -228,4 +235,14 @@
            #{OrderID}
        </foreach>
    </delete>

    <select id="checkServiceOrdIDExists" parameterType="String" resultType="Integer">
        select count(1) from tb_orders where ServiceOrdID = #{ServiceOrdID}
    </select>

    <select id="selectTbOrdersByServiceOrdID" parameterType="String" resultMap="TbOrdersResult">
        <include refid="selectTbOrdersVo"/>
        where ServiceOrdID = #{ServiceOrdID}
    </select>

</mapper>