--no commit message

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

@@ -209,10 +209,9 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	 * @data 2019年8月20日 下午4:09:29
 	 */
 	@Select(" <script> "
-			+ " SELECT DISTINCT o.*,s.name as schoolName,p.distributorName as supplierName from school_order o LEFT JOIN `jgjy-member`.me_school s ON o.relationId = s.id "
-			+ "  LEFT JOIN school_order_info soi ON o.id = soi.orderId " 
-			+ "  LEFT JOIN me_supplier p ON o.supplierId = p.distributorId "              
-			+ " where 1 = 1 and (opsType = 2 or opsType = 5) "
+			+ " SELECT DISTINCT o.*,s.name as schoolName,soi.status from school_order o LEFT JOIN `jgjy-member`.me_school s ON o.relationId = s.id  "
+			+ "  LEFT JOIN school_order_status soi ON o.id = soi.orderId  " 
+			 + " where 1 = 1 and and soi.status = 4 "
 			+ DEFAULT_ORDER_SQL
 			+ " </script> ")
 	List<OrderVo> orderList(@Param("form") QueryOrderPageForm form);

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

@@ -377,6 +377,11 @@ public class FgOrderServiceImpl extends BaseModelServiceImpl<Order,Integer> impl
 			//统计订单详情的条数（教材种类）
 			Integer count = orderInfoManage.count(vo.getId());
 			vo.setNum(count);
+			//远程获取经销商的名称
+			CallBack<Distributor> callback = bgMemberClient.getDistributorById(vo.getSupplierId());
+			if(callback.isStatus() && callback.getData() != null){
+				vo.setSupplierName(callback.getData().getName());
+			}
 		});
 		return new PageInfo<OrderVo>(list);
 	}

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/studentorder/StudentOrderServiceImpl.java

@@ -60,7 +60,7 @@ public class StudentOrderServiceImpl extends BaseModelServiceImpl<StudentOrder,I
 		list.forEach(vo ->{
 			//获取学校名称
 			CallBack<School> callback = bgMemberClient.getByOid(vo.getRelationId());
-			if(callback.hasEntity()){
+			if(callback.hasEntity() && callback.getData() != null){
 				vo.setSchool(callback.getData().getName());
 			}
 		});