Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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/dal/page/SubjectChangeQueryInfo.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.SubjectChangeStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -13,6 +14,9 @@ public class SubjectChangeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "合作单位id",required = false)
     private Integer cooperationOrganId;
 
+    @ApiModelProperty(value = "状态",required = false)
+    private SubjectChangeStatusEnum status;
+
     @ApiModelProperty(value = "开始时间",required = false)
     private Date startTime;
 
@@ -52,4 +56,12 @@ public class SubjectChangeQueryInfo extends QueryInfo {
     public void setCooperationOrganId(Integer cooperationOrganId) {
         this.cooperationOrganId = cooperationOrganId;
     }
+
+    public SubjectChangeStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(SubjectChangeStatusEnum status) {
+        this.status = status;
+    }
 }

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/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -170,7 +170,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             Map<String, Object> payment = Payment.queryPayment(payingOrder.getTransNo());
             Map<String, String> rpMap = new HashMap<>();
             rpMap.put("merOrderNo", payingOrder.getOrderNo());
-            rpMap.put("orderNo", (String) payment.get("id"));
+            rpMap.put("orderNo", payingOrder.getTransNo());
             rpMap.put("channelType", (String) payment.get("pay_channel"));
             String status = (String) payment.get("status");
             if (payment.containsKey("error_msg")) {

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

@@ -380,6 +380,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
             studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
 
             subjectChange.setStatus(SubjectChangeStatusEnum.SUCCESSED);
+            subjectChange.setSellTime(nowDate);
 
             //乐器辅件价差大于0时，有销售金额
             if (subjectChange.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.GROUP) && studentPaymentOrder.getActualAmount().compareTo(BigDecimal.ZERO) > 0) {

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

@@ -362,4 +362,18 @@
         FROM sell_order
         WHERE order_id_ = #{orderId}
     </select>
+
+    <select id="getSubjectChangeMonthReport" resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
+        SELECT sc.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 subject_change sc
+                 LEFT JOIN student_payment_order spo ON spo.id_ = sc.order_id_
+        WHERE sc.status_ = 2
+          AND sc.sell_time_ >= #{startTime}
+          AND sc.sell_time_ <= #{endTime}
+        GROUP BY sc.organ_id_, sc.cooperation_organ_id_
+        ]]></select>
 </mapper>

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

@@ -239,6 +239,9 @@
             <if test="organIdList != null and organIdList != ''">
                 AND FIND_IN_SET(sc.organ_id_,#{organIdList})
             </if>
+            <if test="status != null">
+                AND sc.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
             <if test="cooperationOrganId != null">
                 AND sc.cooperation_organ_id_ = #{cooperationOrganId}
             </if>
@@ -295,6 +298,7 @@
         FROM subject_change
         WHERE music_group_id_ = #{musicGroupId}
           AND student_id_ = #{studentId}
-          AND status_ IN (0, 1) LIMIT 1
+          AND status_ IN (0, 1)
+        LIMIT 1
     </select>
 </mapper>

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.SellOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.entity.SubjectChange;
+import com.ym.mec.biz.dal.enums.SubjectChangeStatusEnum;
 import com.ym.mec.biz.dal.page.SellOrderQueryInfo;
 import com.ym.mec.biz.dal.page.SubjectChangeQueryInfo;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
@@ -71,6 +72,7 @@ public class SubjectChangeController extends BaseController {
         if (queryInfo.getEndTime() != null) {
             queryInfo.setEndTime(DateUtil.getLastTimeWithDay(queryInfo.getEndTime()));
         }
+        queryInfo.setStatus(SubjectChangeStatusEnum.SUCCESSED);
         return succeed(subjectChangeService.getPageList(queryInfo));
     }