update 销售列表根据添加日期倒序排

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

@@ -76,6 +76,16 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
     List<OperatingReport> getRepairGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
+     * 维修单和商品销售,总收入
+     *
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<OperatingReport> getRepairGoodsSellGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+
+    /**
      * 根据订单号删除
      *
      * @param orderId
@@ -94,6 +104,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
 
     /**
      * 外部订单总收入
+     *
      * @param startTime
      * @param endTime
      * @return

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

@@ -112,6 +112,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         reports.addAll(sellOrderDao.getOutOrderIncome(startTime, endTime));
         //3.4、乐器维修、商品销售
         reports.addAll(sellOrderDao.getRepairGoodsSellGroupMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getRepairGoodsSellGroupIncome(startTime, endTime));
         //3.5、零星支付充值
         reports.addAll(sellOrderDao.getRechargeMonthReport(startTime, endTime));
         //3.6、零星收费（不是充值部分的）

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

@@ -149,6 +149,6 @@
     <!-- 获取全部使用中的合作单位 -->
     <select id="getAllCooperationOrgan" resultMap="CooperationOrgan">
         SELECT * FROM cooperation_organ
-        WHERE full_job_resource_ =1 AND del_flag_ = 0
+        WHERE del_flag_ = 0
     </select>
 </mapper>

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

@@ -309,7 +309,6 @@
     <select id="getRepairGoodsSellGroupMonthReport"
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
-               SUM(so.actual_amount_) income_total_,
                SUM(so.actual_amount_) sell_amount_,
                SUM(so.sell_cost_)     sellCost
         FROM student_payment_order spo
@@ -321,6 +320,20 @@
         GROUP BY spo.organ_id_
         ]]></select>
 
+    <!-- 获取分部学校的收入支出(维修、商品销售订单) -->
+    <select id="getRepairGoodsSellGroupIncome"
+            resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
+        SELECT spo.organ_id_,
+               SUM(spo.actual_amount_) income_total_
+        FROM student_payment_order spo
+        WHERE spo.status_ = 'SUCCESS'
+          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL')
+          AND spo.create_time_ >= #{startTime}
+          AND spo.create_time_ <= #{endTime}
+        GROUP BY spo.organ_id_
+        ]]></select>
+
+
     <!-- 获取订单的销售列表 -->
     <select id="getOrderSellOrder" resultMap="SellOrder">
         SELECT *

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -95,6 +95,12 @@ public class StudentPaymentRouteOrderController extends BaseController {
         if (studentPaymentRouteOrderDto.getSchoolId() != null) {
             studentPaymentRouteOrderDto.setMusicGroupId(studentPaymentRouteOrderDto.getSchoolId().toString());
         }
+        if (studentPaymentRouteOrderDto.getServiceAmount() == null) {
+            studentPaymentRouteOrderDto.setServiceAmount(BigDecimal.ZERO);
+        }
+        if (studentPaymentRouteOrderDto.getGoodsAmount() == null) {
+            studentPaymentRouteOrderDto.setGoodsAmount(BigDecimal.ZERO);
+        }
         studentPaymentRouteOrderDto.setActualAmount(studentPaymentRouteOrderDto.getServiceAmount().add(studentPaymentRouteOrderDto.getGoodsAmount()));
         return succeed(studentPaymentRouteOrderService.addOutOrder(studentPaymentRouteOrderDto));
     }