--no commit message

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/order/OrderInfoManageimpl.java

@@ -208,7 +208,7 @@ public class OrderInfoManageimpl extends BaseManageImpl<OrderInfo,Integer> imple
 		info.setLessonId(lessonId);
 		OrderInfo orderInfo = new OrderInfo();
 		try{
-			orderInfo = super.selectOne(info);
+			orderInfo = fgOrderInfoMapper.query(resourceId, lessonId);
 			if(orderInfo != null){
 				Order o = fgOrderMapper.selectByPrimaryKey(orderInfo.getOrderId());
 				orderInfo.setSupplierId(o.getSupplierId());

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/studentorder/StudentOrderInfoManageImpl.java

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
+import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.school.order.OrderInfo;
 import com.zrqx.core.model.school.studentorder.StudentOrderInfo;
@@ -37,6 +39,9 @@ public class StudentOrderInfoManageImpl extends BaseManageImpl<StudentOrderInfo,
 			info.setOrderNum(new BigDecimal(1));
 			//根据课程id和教材id查询教材的折扣和教材归属于哪个经销商
 			OrderInfo orderInfo = orderInfoManage.query(vo.getResourceId(), vo.getLessonId());
+			if(orderInfo == null){
+				throw new BusinessValidateException("请联系经销商检查是否所有的订单都已经订购");
+			}
 			if(orderInfo != null){
 				info.setDiscount(orderInfo.getDiscount());
 				info.setSupplierId(orderInfo.getSupplierId());

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/order/FgOrderInfoMapper.java

@@ -162,4 +162,22 @@ public interface FgOrderInfoMapper extends BaseMapper<OrderInfo>{
 	List<String> publisherList(@Param("form") QueryTypeAndRelationIdForm form);
 	
 	
+	
+	/**
+	 * 根据资源id和课程id获取已经订购了的教材
+	 * @param resourceId
+	 * @param lessonId
+	 * @return
+	 * @auther zzg
+	 * @data 2019年9月9日 下午3:07:31
+	 */
+	@Select("<script>"
+			+ " SELECT * from school_order_info o LEFT JOIN school_order_info_status s ON o.id = s.orderInfoId "
+			+ " where 1=1 and s.status = 3 "
+			+ " eq(o.lessonId,lessonId) "
+			+ " eq(o.resourceId,resourceId) "
+			+ "</script>")
+	OrderInfo query(@Param("resourceId")String resourceId,@Param("lessonId")Integer lessonId);
+	
+	
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/payset/PaySetServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.enums.BooleanStatusEnum;
+import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.school.sysuser.fg.payset.QueryPayRecordForm;
 import com.zrqx.core.form.school.sysuser.fg.splitorder.QuerySplitOrderForm;
@@ -87,6 +88,11 @@ public class PaySetServiceImpl extends BaseModelServiceImpl<PaymentSet,Integer>
 			split.setType(redis.getMember().getType());
 			split.setIsValid("1");
 			List<SplitOrderVo> orderList = splitOrderMapper.page(split);
+			orderList.forEach(vo ->{
+				if("0".equals(vo.getStatus())){
+					throw new BusinessValidateException("分担管理:有未提交的课程");
+				}
+			});
 			
 			Map<Integer, List<SplitOrderVo>> map = orderList.stream()
 	                .collect(Collectors.groupingBy(SplitOrderVo::getClassId));