添加订单支持组合商品

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

@@ -139,6 +139,14 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
     List<OperatingReport> getSubjectChangeGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
+     * 统计退货的商品费用
+     *
+     * @return
+     */
+    List<OperatingReport> getRefundIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+
+    /**
      * @param sellOrderIds:
      * @return java.util.List<com.ym.mec.biz.dal.entity.SellOrder>
      * @describe 获取指定的销售记录

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

@@ -131,7 +131,8 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         //3.7 声部更换的收入
         reports.addAll(sellOrderDao.getSubjectChangeMonthReport(startTime, endTime));
         reports.addAll(sellOrderDao.getSubjectChangeGroupIncome(startTime, endTime));
-
+        //3.8 退货部分的统计
+        reports.addAll(sellOrderDao.getRefundIncome(startTime, endTime));
 
         updateFee(organOperating, cooperationOperating, reports);
 

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

@@ -511,6 +511,20 @@
         GROUP BY spo.organ_id_, spo.music_group_id_
         ]]></select>
 
+    <!-- 获取退货订单的收入和成本 -->
+    <select id="getRefundIncome" resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
+        SELECT organ_id_,
+               cooperation_organ_id_,
+               -SUM(actual_amount_)    income_total_,
+               -SUM(actual_amount_)    sell_amount_,
+               -SUM(sell_cost_ * num_) sell_cost_,
+                SUM(actual_amount_)    other_income_
+        FROM sell_order
+        WHERE status_ = 1
+          AND sell_time_ >= #{startTime}
+          AND sell_time_ <= #{endTime}
+        GROUP BY organ_id_, cooperation_organ_id_
+        ]]></select>
 
     <select id="getSellOrders" resultMap="SellOrder">
         SELECT * FROM sell_order WHERE id_ IN