--no commit message

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

@@ -171,7 +171,7 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	
 	
 	/**
-	 * 客户列表（大后台）
+	 * 客户列表（大后台退订订单页面）
 	 * @return
 	 * @auther zzg
 	 * @data 2019年8月20日 下午3:10:11
@@ -184,6 +184,20 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 			+ " </script> ")
 	List<School> customerList(@Param("opsType")String opsType);
 	
+	/**
+	 * 客户列表（大后台订购订单页面）
+	 * @return
+	 * @auther zzg
+	 * @data 2019年8月20日 下午3:10:11
+	 */
+	@Select(" <script> "
+			+ " SELECT o.relationId as id from school_order o "
+			+ " LEFT JOIN school_order_status soi ON o.id = soi.orderId "
+			+ " where 1 = 1 and soi.status = 4 "
+			+ " group by o.relationId HAVING o.relationId is not null "
+			+ " </script> ")
+	List<School> getCustomerList(@Param("opsType")String opsType);
+	
 	
 	/**
 	 * 经销商筛选列表（大后台退订订单页面）

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/order/FgOrderServiceImpl.java

@@ -362,7 +362,12 @@ public class FgOrderServiceImpl extends BaseModelServiceImpl<Order,Integer> impl
 
 	@Override
 	public List<School> schoolAll(String opsType) {
-		List<School> list = fgOrderMapper.customerList(opsType);
+		List<School> list = new ArrayList<School>();
+		if(StringUtils.isNotEmpty(opsType)){
+			list = fgOrderMapper.customerList(opsType);
+		}else{
+			
+		}
 		list.forEach(vo ->{
 			//远程调用会员服务获取学校名称
 			CallBack<School> callback = bgMemberClient.getByOid(vo.getId());