经营报表修改

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SellOrderDao.java

@@ -114,8 +114,17 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
 
     /**
      * 获取订单的销售成本
+     *
      * @param orderId
      * @return
      */
     BigDecimal getOrderSellCost(@Param("orderId") Long orderId);
+
+    /**
+     * 获取声部更换的销售、总收入
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<OperatingReport> getSubjectChangeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OperatingReportServiceImpl.java

@@ -117,7 +117,9 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         reports.addAll(sellOrderDao.getRechargeMonthReport(startTime, endTime));
         //3.6、零星收费（不是充值部分的）
         reports.addAll(sellOrderDao.getSporadicMonthReport(startTime, endTime));
-        updateFee(organOperating,cooperationOperating,reports);
+        //乐器更换
+        reports.addAll(sellOrderDao.getSubjectChangeMonthReport(startTime, endTime));
+        updateFee(organOperating, cooperationOperating, reports);
 
 //        Map<String, Object> params = new HashMap<>();
 //        params.put("startTime", startTime);

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -362,4 +362,19 @@
         FROM sell_order
         WHERE order_id_ = #{orderId}
     </select>
+
+    <select id="getSubjectChangeMonthReport" resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
+        SELECT spo.organ_id_,
+               sc.cooperation_organ_id_,
+               SUM(spo.actual_amount_) income_total_,
+               SUM(sc.sell_amount_)    sell_amount_,
+               SUM(sc.cost_margin_)    sell_cost_
+        FROM student_payment_order spo
+                 LEFT JOIN subject_change sc on sc.order_id_ = spo.id_
+        WHERE spo.status_ = 'SUCCESS'
+          AND spo.group_type_ = 'SUBJECT_CHANGE'
+          AND spo.create_time_ >= #{startTime}
+          AND spo.create_time_ <= #{endTime}
+        GROUP BY spo.organ_id_, sc.cooperation_organ_id_
+        ]]></select>
 </mapper>