修复台账报表

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/IncomeOrderLedgerMapper.xml

@@ -23,10 +23,12 @@
             SUM(CASE WHEN tv.type IN ('babyTake','babyPlus','babyNonTake') THEN 1 ELSE 0 END) AS infantCount,
             SUM(CASE WHEN tv.type IN ('babyTake','babyPlus','babyNonTake','leader','with','childTake','childPlus','childNonTake','adultPlus', 'adultTake') THEN 1 ELSE 0 END) AS totalCount,
              IFNULL(tot.free_num, 0) AS freeCount,
-            IFNULL(CASE WHEN o.pay_status = 1 THEN p.pay_amount else o.real_pay_amount END , 0) - COALESCE(refund_fee_sum.refund_amount, 0) AS marketingPrice,
+            o.pay_amount AS marketingPrice,
+             /*IFNULL(CASE WHEN o.pay_status = 1 THEN p.pay_amount else o.real_pay_amount END , 0) - COALESCE(refund_fee_sum.refund_amount, 0) AS marketingPrice,*/
             o.free_amount AS discountAmount,
             COALESCE(refund_fee_sum.refund_amount, 0) AS refundFee,
-           (IFNULL(CASE WHEN o.pay_status = 1 THEN p.pay_amount else o.real_pay_amount END , 0) - IFNULL(o.free_amount, 0) - COALESCE(refund_fee_sum.refund_amount, 0)) AS actualSettlementPrice
+        o.real_pay_amount as actualSettlementPrice
+           /*(IFNULL(CASE WHEN o.pay_status = 1 THEN p.pay_amount else o.real_pay_amount END , 0) - IFNULL(o.free_amount, 0) - COALESCE(refund_fee_sum.refund_amount, 0)) AS actualSettlementPrice*/
         FROM trade_order o
         INNER JOIN product_voyage v ON o.voyage_id = v.id AND v.deleted = 0
         INNER JOIN resource_route r ON v.route_id = r.id AND r.deleted = 0
@@ -116,10 +118,12 @@
             SUM(CASE WHEN tv.type IN ('babyTake','babyPlus','babyNonTake') THEN 1 ELSE 0 END) AS infantCount,
             SUM(CASE WHEN tv.type IN ('babyTake','babyPlus','babyNonTake','leader','with','childTake','childPlus','childNonTake','adultPlus', 'adultTake') THEN 1 ELSE 0 END) AS totalCount,
             IFNULL(tot.free_num, 0) AS freeCount,
-            IFNULL(CASE WHEN o.pay_status = 1 THEN p.pay_amount else o.real_pay_amount END , 0) - COALESCE(refund_fee_sum.refund_amount, 0) AS marketingPrice,
+            o.pay_amount AS marketingPrice,
+            /*IFNULL(CASE WHEN o.pay_status = 1 THEN p.pay_amount else o.real_pay_amount END , 0) - COALESCE(refund_fee_sum.refund_amount, 0) AS marketingPrice,*/
             o.free_amount AS discountAmount,
             COALESCE(refund_fee_sum.refund_amount, 0) AS refundFee,
-            (IFNULL(CASE WHEN o.pay_status = 1 THEN p.pay_amount else o.real_pay_amount END , 0) - IFNULL(o.free_amount, 0) - COALESCE(refund_fee_sum.refund_amount, 0)) AS actualSettlementPrice
+        o.real_pay_amount as actualSettlementPrice
+            /*(IFNULL(CASE WHEN o.pay_status = 1 THEN p.pay_amount else o.real_pay_amount END , 0) - IFNULL(o.free_amount, 0) - COALESCE(refund_fee_sum.refund_amount, 0)) AS actualSettlementPrice*/
         FROM trade_order o
         INNER JOIN product_voyage v ON o.voyage_id = v.id AND v.deleted = 0
         INNER JOIN resource_route r ON v.route_id = r.id AND r.deleted = 0