Compare commits

..

No commits in common. "e16dcb5eaa5acd5c6be1e3a512bffcd271633bc6" and "d4d99c5c94b34063e7b8b58c70b38f66dc44a90e" have entirely different histories.

1 changed files with 5 additions and 5 deletions

View File

@ -47,11 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
<if test="orderStatus == 4"> <if test="orderStatus == 4">
,take_over_user = #{userId}, ,take_over_user = #{userId},
,take_over_time = now() ,pre_outbound_time = now()
</if> </if>
<if test="orderStatus == 5"> <if test="orderStatus == 3">
,rent_over_user = #{userId}, ,pre_outbound_user = #{phoneNumber},
,rent_over_time = now() ,pre_outbound_time = now()
</if> </if>
where id in where id in
<foreach item="id" collection="ids" open="(" separator="," close=")"> <foreach item="id" collection="ids" open="(" separator="," close=")">
@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN bm_file_info bfi ON hh.ma_id = bfi.model_id LEFT JOIN bm_file_info bfi ON hh.ma_id = bfi.model_id
AND bfi.file_type = 0 AND bfi.file_type = 0
WHERE WHERE
hh.id = #{id} limit 1 hh.id = #{id}
</select> </select>
<select id="getOrderDetailsById" resultType="com.bonus.material.order.domain.OrderInfoDto"> <select id="getOrderDetailsById" resultType="com.bonus.material.order.domain.OrderInfoDto">
SELECT SELECT