bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
nmy 2023-12-09 23:06:23 +08:00
parent bf0becc786 a4b700cd3b
commit 5b10a323ae
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
View File

@ -408,6 +408,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where user_id = #{userId} where user_id = #{userId}
</select> </select>
<select id="getHotSearchCountByMaId" resultType="Integer">
select count(1) from ma_hot_search
where ma_id = #{maId}
</select>
<insert id="insertHotSearch">
INSERT INTO ma_hot_search (ma_id, search_num)
VALUES (#{maId}, 1)
</insert>
<update id="updateHotSearchByMaId" parameterType="Long"> <update id="updateHotSearchByMaId" parameterType="Long">
update ma_hot_search update ma_hot_search
set search_num = search_num + 1 set search_num = search_num + 1

5
zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
View File

@ -44,11 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo"> <select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
select d.*,o.code,o.time,o.order_status,o.reject_reason,s.file_url as contract_url select d.*,o.code,o.time,o.order_status,o.reject_reason
from ma_order_info o from ma_order_info o
left join ma_order_details d on d.order_id = o.order_id left join ma_order_details d on d.order_id = o.order_id
left join sys_file_info s on s.model_id = o.order_id where o.order_id = #{orderId}
where s.dic_id = 21 and o.order_id = #{orderId}
</select> </select>
<insert id="insertOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo"> <insert id="insertOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">