// 毛利率计算逻辑调整

web-manager/src/main/resources/mappers/ord/OrdOrderDao.xml

@@ -144,7 +144,7 @@
         <![CDATA[
            SELECT DISTINCT dt.name AS groupName,od.`date` AS `orderDate`,od.`lock_time` AS `lockTime`,od.order_code AS orderCode,od.`date` AS `orderTime`,ROUND(od.pay_price/100,2) AS payPrice,ROUND(od.buy_order_price/100,2) AS buyOrderPrice,
                ROUND((od.pay_price/100)*0.9-(od.buy_order_price/100),2) AS grossProfit,
-               ROUND((((od.pay_price/100)*0.9-(od.buy_order_price/100))/(od.pay_price/100))*100,2) AS grossProfitMargin,
+               ROUND((((od.pay_price/100)*0.9-(od.buy_order_price/100))/(od.buy_order_price/100))*100,2) AS grossProfitMargin,
                ht.hotel_name AS hotelName,od.room_num AS roomNum,od.check_in_date AS checkInDate,od.check_out_date AS checkOutDate,od.name AS `name`,ci.city_name_zh AS city,
                (CASE od.order_status WHEN 1 THEN '未支付' WHEN 2 THEN '已支付' WHEN 3 THEN '已发货' WHEN 4 THEN '已入住' WHEN -1 THEN '申请退款'  WHEN -2 THEN '已退款'  WHEN -3 THEN '关单' WHEN -4 THEN '已入住' WHEN -5 THEN '申请取消订单' ELSE '其他' END) AS orderStatus,
                 (CASE od.buy_status WHEN 0 THEN '未采购' WHEN 1 THEN '已受理 （ 已提交）' WHEN 2 THEN '采购中' WHEN 3 THEN '已采购' WHEN -1 THEN '采购失败'  WHEN -2 THEN '退款中' WHEN -3 THEN '已退款' WHEN -4 THEN '退款失败' WHEN -5 THEN '订单取消中' WHEN -6 THEN '已取消' WHEN -7 THEN '取消失败' WHEN -8 THEN '已入住' ELSE '其他' END) as buyStatus