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

## 重消订单上传业绩处理（226）；
2025-07-04 09:27:38 +08:00 · 2025-07-04 09:27:22 +08:00
1 changed files with 2 additions and 2 deletions
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
@ -215,7 +215,7 @@
        and soi.del_flag = 0
        and soi.is_gift = 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 != ''">
            and so.order_code=#{orderCode}
        </if>
@ -228,7 +228,7 @@
        on bw.pk_id = soi.pk_wares
        and bw.del_flag = 0
        where so.order_status = 1
-        and so.order_type in (43)
+        and so.order_type in (43, 44)
        <if test="orderCode != null and orderCode != ''">
            and so.order_code=#{orderCode}
        </if>
Author	SHA1	Message	Date
cabbage	c7cb018ca1	Merge remote-tracking branch 'origin/dev' into dev	2025-07-04 09:27:38 +08:00
cabbage	45cca20ff6	## 重消订单上传业绩处理（226）；	2025-07-04 09:27:22 +08:00