angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sangelxiu1 2025-07-04 09:32:25 +08:00
parent dd7c121577 c7cb018ca1
commit fbd6a2e033
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
View File

@ -215,7 +215,7 @@
and soi.del_flag = 0 and soi.del_flag = 0
and soi.is_gift = 1 and soi.is_gift = 1
where so.order_status = 1 where so.order_status = 1
and so.order_type in (43) and so.order_type in (43, 44)
<if test="orderCode != null and orderCode != ''"> <if test="orderCode != null and orderCode != ''">
and so.order_code=#{orderCode} and so.order_code=#{orderCode}
</if> </if>
@ -228,7 +228,7 @@
on bw.pk_id = soi.pk_wares on bw.pk_id = soi.pk_wares
and bw.del_flag = 0 and bw.del_flag = 0
where so.order_status = 1 where so.order_status = 1
and so.order_type in (43) and so.order_type in (43, 44)
<if test="orderCode != null and orderCode != ''"> <if test="orderCode != null and orderCode != ''">
and so.order_code=#{orderCode} and so.order_code=#{orderCode}
</if> </if>