Merge remote-tracking branch 'origin/main'

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeVisitorMapper.xml

@@ -392,8 +392,8 @@
                     a1.country_id,
                     a1.country_name,
                     sum( CASE WHEN a1.type = 'adultTake' OR a1.type = 'adultPlus' THEN a1.num ELSE 0 END ) AS adultNum,
-                    sum( CASE WHEN a1.type = 'childTake' OR a1.type = 'childNonTake' AND a1.type = 'childPlus' THEN a1.num ELSE 0 END ) AS childNum,
-                    sum( CASE WHEN a1.type = 'babyTake' OR a1.type = 'babyNonTake' AND a1.type = 'babyPlus' THEN a1.num ELSE 0 END ) AS babyNum,
+                    sum( CASE WHEN a1.type = 'childTake' OR a1.type = 'childNonTake' or a1.type = 'childPlus' THEN a1.num ELSE 0 END ) AS childNum,
+                    sum( CASE WHEN a1.type = 'babyTake' OR a1.type = 'babyNonTake' or a1.type = 'babyPlus' THEN a1.num ELSE 0 END ) AS babyNum,
                     sum( CASE WHEN a1.type = 'leader' THEN a1.num ELSE 0 END ) AS leaderNum,
                     sum( CASE WHEN a1.type = 'with' THEN a1.num ELSE 0 END ) AS withNum
                 FROM