Merge branch 'online1' into edu_financial

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderDetailService.java

@@ -93,4 +93,12 @@ public interface StudentPaymentOrderDetailService extends BaseService<Long, Stud
      * @return
      */
     List<String> getOrderDetailType(Long orderId);
+
+
+    /**
+     * 获取订单商品详细
+     * @param orderId
+     * @return
+     */
+    List<StudentPaymentOrderDetail> getOrderGoodsDetail(Long orderId);
 }

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

@@ -447,4 +447,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     public List<String> getOrderDetailType(Long orderId) {
         return studentPaymentOrderDetailDao.getOrderDetailType(orderId);
     }
+
+    @Override
+    public List<StudentPaymentOrderDetail> getOrderGoodsDetail(Long orderId) {
+        return studentPaymentOrderDetailDao.getOrderDetail(orderId);
+    }
 }

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

@@ -1154,7 +1154,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentRegistration.setPayingStatus(0);
             }
 
-            List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.getOrderDetail(studentPaymentOrder.getId());
+            List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.getOrderGoodsDetail(studentPaymentOrder.getId());
 
             List<Long> orderIdList = new ArrayList<Long>();
             orderIdList.add(studentPaymentOrder.getId());

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

@@ -22,7 +22,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="music_group_id_" property="musicGroupId"/>
     </resultMap>
-    
+
     <resultMap type="com.ym.mec.biz.dal.dto.CloudTeacherOrderDto" id="CloudTeacherOrderDto">
     	<id column="id_" property="cloudTeacherOrder.id"/>
         <result column="organ_id_" property="cloudTeacherOrder.organId"/>
@@ -57,15 +57,15 @@
         insert into cloud_teacher_order (organ_id_,student_id_, type_, level_, time_, amount_, refund_amount_, status_,
         order_id_,start_time_,end_time_,
         remark_, create_time_, update_time_)
-        values (#{orderId},#{studentId}, #{type},#{level}, #{time}, #{amount}, #{refundAmount},
+        values (#{organId},#{studentId}, #{type},#{level}, #{time}, #{amount}, #{refundAmount},
         #{status},#{orderId},#{startTime},#{endTime}, #{remark}, NOW(), NOW())
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.CloudTeacherOrder">
         <!--@mbg.generated-->
         update cloud_teacher_order
         <set>
-            <if test="orderId != null">
-                organ_id_ = #{orderId},
+            <if test="organId != null">
+                organ_id_ = #{organId},
             </if>
             <if test="studentId != null">
                 student_id_ = #{studentId},
@@ -117,8 +117,8 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="CloudTeacherOrderDto" parameterType="map">
-        SELECT cto.*,spo.status_ trans_status_,spo.expect_amount_,mrs.name_,mrs.icon_ FROM cloud_teacher_order cto 
-        left join student_payment_order spo on cto.organ_id_ = spo.id_
+        SELECT cto.*,spo.status_ trans_status_,spo.expect_amount_,mrs.name_,mrs.icon_ FROM cloud_teacher_order cto
+        left join student_payment_order spo on cto.order_id_ = spo.id_
         left join member_rank_setting mrs on mrs.id_ = cto.level_
         where spo.type_ = 'MEMBER'
         <if test="status != null">
@@ -134,7 +134,7 @@
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(cto.id_)
-        FROM cloud_teacher_order cto left join student_payment_order spo on cto.organ_id_ = spo.id_
+        FROM cloud_teacher_order cto LEFT JOIN student_payment_order spo on cto.order_id_ = spo.id_
         where spo.type_ = 'MEMBER'
         <if test="status != null">
         	and cto.status_ = #{status}
@@ -185,11 +185,11 @@
         SELECT cto.* FROM cloud_teacher_order cto
         WHERE order_id_ = #{orderId}
     </select>
-    
+
     <select id="queryOrderInfoByOrderId" resultMap="CloudTeacherOrderDto">
-        SELECT cto.*,spo.status_ trans_status_,spo.expect_amount_,mrs.name_,mrs.icon_ FROM cloud_teacher_order cto 
-        left join student_payment_order spo on cto.organ_id_ = spo.id_
-        left join member_rank_setting mrs on mrs.id_ = cto.level_
+        SELECT cto.*,spo.status_ trans_status_,spo.expect_amount_,mrs.name_,mrs.icon_ FROM cloud_teacher_order cto
+                                                                                               left join student_payment_order spo on cto.order_id_ = spo.id_
+                                                                                               left join member_rank_setting mrs on mrs.id_ = cto.level_
         where spo.type_ = 'MEMBER' and order_id_ = #{orderId}
     </select>
 </mapper>

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

@@ -2663,7 +2663,7 @@
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
         </if>
         <if test="searchType == 'COURSE_TIME_ERROR'">
-            AND cs.status_ = 'NOT_START' AND cs.is_lock_ = 0 AND cs.start_class_time_ &lt; '06:00:00'
+            AND cs.status_ = 'NOT_START' AND cs.is_lock_ = 0 AND (cs.start_class_time_ &lt; '06:00:00' OR cs.end_class_time_ > '21:00:00')
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
         </if>
         <if test="classGroupIds != null and classGroupIds.size() > 0">

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

@@ -903,7 +903,7 @@
 	</select>
     <select id="getCourseTimeError" resultType="int">
 		SELECT COUNT(cs.id_) FROM course_schedule cs
-		WHERE cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.start_class_time_ &lt; '06:00:00'
+		WHERE cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND (cs.start_class_time_ &lt; '06:00:00' OR cs.end_class_time_ > '21:00:00')
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0
 		<if test="classGroupIds != null and classGroupIds.size() > 0">
 			AND cs.class_group_id_ IN

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -134,8 +134,11 @@ public class StudentOrderController extends BaseController {
     @Autowired
     private StudentRegistrationDao studentRegistrationDao;
 
-	@Autowired
-	private MemberRankPrivilegesService memberRankPrivilegesService;
+    @Autowired
+    private MemberRankPrivilegesService memberRankPrivilegesService;
+
+    @Autowired
+    private SellOrderService sellOrderService;
 
 
     @Value("${spring.profiles.active:dev}")
@@ -144,12 +147,12 @@ public class StudentOrderController extends BaseController {
     @ApiOperation(value = "查询订单列表")
     @GetMapping("/queryPage")
     public Object findGroupUsers(StudentPaymentOrderQueryInfo queryInfo) {
-    	SysUser user = sysUserFeignService.queryUserInfo();
-		if (user == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		queryInfo.setStudentId(user.getId());
-    	PageInfo<StudentPaymentOrderDto> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        queryInfo.setStudentId(user.getId());
+        PageInfo<StudentPaymentOrderDto> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
         return succeed(studentPaymentOrderPageInfo);
     }
 
@@ -197,10 +200,10 @@ public class StudentOrderController extends BaseController {
         HashMap<String, Object> orderDetail = new HashMap<>();
         orderDetail.put("order", orderByOrderNo);
         orderDetail.put("groupType", orderByOrderNo.getGroupType());
-        if(OrderTypeEnum.APPLY.equals(orderByOrderNo.getType())){
-            StudentRegistration studentRegistration = studentRegistrationDao.getStudentRegister(orderByOrderNo.getMusicGroupId(),orderByOrderNo.getUserId());
-            if(studentRegistration.getPayingStatus().equals(2)) {
-                orderDetail.put("payingStatus",studentRegistration.getPayingStatus());
+        if (OrderTypeEnum.APPLY.equals(orderByOrderNo.getType())) {
+            StudentRegistration studentRegistration = studentRegistrationDao.getStudentRegister(orderByOrderNo.getMusicGroupId(), orderByOrderNo.getUserId());
+            if (studentRegistration.getPayingStatus().equals(2)) {
+                orderDetail.put("payingStatus", studentRegistration.getPayingStatus());
             }
         }
 
@@ -227,8 +230,8 @@ public class StudentOrderController extends BaseController {
             orderDetail.put("calender", musicGroupRegCalender);
 
             //判断是否是系统收费
-            if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
-            	 orderDetail.put("member", cloudTeacherOrderService.queryOrderInfoByOrderId(orderByOrderNo.getId()));
+            if (musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE) {
+                orderDetail.put("member", cloudTeacherOrderService.queryOrderInfoByOrderId(orderByOrderNo.getId()));
             }
         } else if (orderByOrderNo.getGroupType().equals(GroupType.VIP)) {
             VipBuyResultDto vipBuyResultInfo = vipGroupService.findVipBuyResultInfo(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
@@ -255,7 +258,7 @@ public class StudentOrderController extends BaseController {
             orderDetail.put("detail", replacementInstrumentActivityDao.getInfo(Integer.parseInt(orderByOrderNo.getMusicGroupId())));
         } else if (orderByOrderNo.getGroupType().equals(GroupType.DEGREE)) {
             orderDetail.put("detail", childrenDayDegreeDetailDao.getByOrderId(orderByOrderNo.getId()));
-        }else if (orderByOrderNo.getGroupType().equals(GroupType.MEMBER)) {
+        } else if (orderByOrderNo.getGroupType().equals(GroupType.MEMBER)) {
             orderDetail.put("detail", cloudTeacherOrderService.queryOrderInfoByOrderId(orderByOrderNo.getId()));
         }
         return succeed(orderDetail);
@@ -871,11 +874,28 @@ public class StudentOrderController extends BaseController {
     }
 
     @GetMapping("confirmTeacherOrder")
-    public Object confirmOrder(String orderNo){
+    public Object confirmOrder(String orderNo) {
         TenantPaymentOrder tenantPaymentOrder = tenantPaymentOrderService.queryByOrderNo(orderNo);
         tenantPaymentOrderService.confirmOrder(tenantPaymentOrder);
         return succeed();
     }
 
+    @GetMapping("fixSellOrder")
+    public HttpResponseResult<List<SellOrder>> fixSellOrder(String orderNo) {
+        StudentPaymentOrder order = studentPaymentOrderService.findOrderByOrderNo(orderNo);
+        List<SellOrder> sellOrders = new ArrayList<>();
+        if (order == null || !order.getStatus().equals(DealStatusEnum.SUCCESS) || !order.getType().equals(OrderTypeEnum.APPLY)) {
+            return succeed(sellOrders);
+        }
+
+        List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.getOrderGoodsDetail(order.getId());
+        //销售订单详情
+        if (orderDetails.size() > 0) {
+            MusicGroup musicGroup = musicGroupService.get(order.getMusicGroupId());
+            sellOrders = sellOrderService.addOrderDetail2SellOrder(orderDetails, order, musicGroup);
+        }
+        return succeed(sellOrders);
+
+    }
 
 }