Merge remote-tracking branch 'origin/zcc'

This commit is contained in:
wangjinlei
2023-12-19 16:24:15 +08:00
8 changed files with 85 additions and 55 deletions

View File

@@ -81,38 +81,39 @@
</select>
<select id="orderListCount" resultType="com.peanut.modules.book.entity.BuyOrder"
parameterType="com.peanut.modules.book.vo.request.BuyOrderListRequestVo" resultMap="buyOrderMap">
<select id="orderListCount" resultType="int" parameterType="com.peanut.modules.book.vo.request.BuyOrderListRequestVo">
select count(1) from (
select b.*
from buy_order b
<if test="productName != null and productName!= ''">
left join buy_order_product p on b.order_id = p.order_id
left join shop_product s on s.product_id = p.product_id
<if test="productName != null and productName!= ''">left join buy_order_product p on b.order_id = p.order_id
left join
shop_product s on s.product_id = p.product_id
</if>
<where>
<if test="searchKeyWord != null and searchKeyWord!= ''">
and (b.order_sn like concat('%',concat(#{searchKeyWord},'%'))
or b.shipping_user like concat('%',concat(#{searchKeyWord},'%'))
or b.user_phone like concat('%',concat(#{searchKeyWord},'%')))
</if>
<where>
<if test="searchKeyWord != null and searchKeyWord!= ''">
and (b.order_sn like concat('%',concat(#{searchKeyWord},'%'))
or b.shipping_user like concat('%',concat(#{searchKeyWord},'%'))
or b.user_phone like concat('%',concat(#{searchKeyWord},'%')))
</if>
<if test="productName != null and productName!= ''">
and (s.product_name like concat('%',concat(#{productName},'%')))
</if>
<if test="orderStatus != null and orderStatus!= ''">
and b.order_status = #{orderStatus}
</if>
<if test="startTime != null">
and b.create_time &gt;= #{startTime}
</if>
<if test="endTime != null">
and b.create_time &lt;= #{endTime}
</if>
and b.order_type = 'order'
and b.del_flag = 0
</where>
<if test="productName != null and productName!= ''">
and (s.product_name like concat('%',concat(#{productName},'%')))
group by b.order_id
</if>
<if test="orderStatus != null and orderStatus!= ''">
and b.order_status = #{orderStatus}
</if>
<if test="startTime != null">
and b.create_time &gt;= #{startTime}
</if>
<if test="endTime != null">
and b.create_time &lt;= #{endTime}
</if>
and b.order_type = 'order'
and b.del_flag = 0
</where>
<if test="productName != null and productName!= ''">
group by b.order_id
</if>
) t
</select>
<select id="orderList" resultType="com.peanut.modules.book.entity.BuyOrder"