更新维修单

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

@@ -72,7 +72,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
     List<OperatingReport> getSporadicMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
-     * 维修单和商品销售
+     * 维修单
      *
      * @param startTime
      * @param endTime
@@ -81,7 +81,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
     List<OperatingReport> getRepairGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
-     * 维修单和商品销售,总收入
+     * 维修单,总收入
      *
      * @param startTime
      * @param endTime
@@ -91,6 +91,15 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
 
 
     /**
+     * 商品销售
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<OperatingReport> getGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+
+    /**
      * 根据订单号删除
      *
      * @param orderId
@@ -177,6 +186,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
 
     /**
      * 获取退货的sellOrder
+     *
      * @param orderId
      * @return
      */

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

@@ -121,17 +121,19 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         reports.addAll(sellOrderDao.getOutOrderMonthReport(startTime, endTime));
         //外部添加订单销售总收入
         reports.addAll(sellOrderDao.getOutOrderIncome(startTime, endTime));
-        //3.4、乐器维修、商品销售
+        //3.4、乐器维修
         reports.addAll(sellOrderDao.getRepairGoodsSellGroupMonthReport(startTime, endTime));
         reports.addAll(sellOrderDao.getRepairGoodsSellGroupIncome(startTime, endTime));
-        //3.5、零星支付充值
+        //3.5、商品销售
+        reports.addAll(sellOrderDao.getGoodsSellGroupMonthReport(startTime, endTime));
+        //3.6、零星支付充值
         reports.addAll(sellOrderDao.getRechargeMonthReport(startTime, endTime));
-        //3.6、零星收费（不是充值部分的）
+        //3.7、零星收费（不是充值部分的）
         reports.addAll(sellOrderDao.getSporadicMonthReport(startTime, endTime));
-        //3.7 声部更换的收入
+        //3.8 声部更换的收入
         reports.addAll(sellOrderDao.getSubjectChangeMonthReport(startTime, endTime));
         reports.addAll(sellOrderDao.getSubjectChangeGroupIncome(startTime, endTime));
-        //3.8 退货部分的统计
+        //3.9 退货部分的统计
         reports.addAll(sellOrderDao.getRefundIncome(startTime, endTime));
 
         updateFee(organOperating, cooperationOperating, reports);

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

@@ -139,13 +139,12 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         studentDao.lockUser(studentId);
         SysUser student = sysUserFeignService.queryUserById(studentId);
         //如果教务老师为空，代表学员自己创建的订单
-        MusicGroup musicGroup = null;
         if (studentGoodsSell.getTeacherId() == null) {
             //获取学生关联的所有教务老师列表
             List<Integer> stuEducation = studentRepairDao.countStuEducation(studentId);
             if (stuEducation != null && stuEducation.size() == 1) {
                 //获取学员乐团关联的教务
-                musicGroup = musicGroupDao.getStuMusic(studentId);
+                MusicGroup musicGroup = musicGroupDao.getStuMusic(studentId);
                 studentGoodsSell.setTeacherId(stuEducation.get(0));
                 if (musicGroup != null) {
                     studentGoodsSell.setCooperationOrganId(musicGroup.getCooperationOrganId());
@@ -153,7 +152,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
             }
         } else if (studentGoodsSell.getCooperationOrganId() == null) {
             //获取教务老师，学员关联的乐团
-            musicGroup = musicGroupDao.getStuEduMusic(studentId, studentGoodsSell.getTeacherId());
+            MusicGroup musicGroup = musicGroupDao.getStuEduMusic(studentId, studentGoodsSell.getTeacherId());
             if (musicGroup != null) {
                 studentGoodsSell.setCooperationOrganId(musicGroup.getCooperationOrganId());
             }
@@ -202,9 +201,6 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setOrganId(student.getOrganId());
         studentPaymentOrder.setRoutingOrganId(student.getOrganId());
-        if (musicGroup != null) {
-            studentPaymentOrder.setMusicGroupId(musicGroup.getCooperationOrganId().toString());
-        }
         studentPaymentOrderService.insert(studentPaymentOrder);
 
         studentPaymentOrder.setVersion(0);

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

@@ -445,28 +445,43 @@
     <select id="getRepairGoodsSellGroupMonthReport"
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
-               so.cooperation_organ_id_,
                SUM(so.actual_amount_)       sell_amount_,
                SUM(so.sell_cost_ * so.num_) sell_cost_
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL')
+          AND spo.group_type_ = 'REPAIR'
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
-        GROUP BY spo.organ_id_, so.cooperation_organ_id_
+        GROUP BY spo.organ_id_
         ]]></select>
 
     <!-- 获取分部学校的收入支出(维修、商品销售订单) -->
     <select id="getRepairGoodsSellGroupIncome"
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
-               so.cooperation_organ_id_,
                SUM(spo.actual_amount_) income_total_
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL')
+          AND spo.group_type_ = 'REPAIR'
+          AND spo.create_time_ >= #{startTime}
+          AND spo.create_time_ <= #{endTime}
+        GROUP BY spo.organ_id_
+        ]]></select>
+
+    <!-- 获取分部学校的收入支出(商品销售订单) -->
+    <select id="getGoodsSellGroupMonthReport"
+            resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
+        SELECT spo.organ_id_,
+               so.cooperation_organ_id_,
+               SUM(so.actual_amount_)       income_total_,
+               SUM(so.actual_amount_)       sell_amount_,
+               SUM(so.sell_cost_ * so.num_) sell_cost_
+        FROM student_payment_order spo
+                 LEFT JOIN sell_order so on so.order_id_ = spo.id_
+        WHERE spo.status_ = 'SUCCESS'
+          AND spo.group_type_ ='GOODS_SELL'
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, so.cooperation_organ_id_