fix

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderMasterDetailView.java

@@ -25,6 +25,9 @@ public class OrderMasterDetailView {
 	@DbField("o.id")
 	private Long mOid;
 
+	@DbField("o.user_id")
+	private Long userId;
+
 	@DbField("o.order_no")
 	private String orderNo;
 

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -90,6 +90,7 @@ import com.cyksj.service.wechat.WeChatService;
 import com.cyksj.task.JobManager;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.param.Operator;
+import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -1447,7 +1448,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 	@Override
 	public OrderMasterDetailView getDetail(Long mOid, Long userId) {
-		OrderMasterDetailView orderMasterDetailView = beanSearcher.searchFirst(OrderMasterDetailView.class, MapUtils.builder().field(OrderMasterDetailView::getMOid, mOid).build());
+		MapBuilder builder = MapUtils.builder();
+		if (userId != null) {
+			builder.field(OrderMasterDetailView::getUserId, userId);
+		}
+		OrderMasterDetailView orderMasterDetailView = beanSearcher.searchFirst(OrderMasterDetailView.class, builder.field(OrderMasterDetailView::getMOid, mOid).build());
+		if (orderMasterDetailView == null) {
+			return null;
+		}
 
 		List<OrderDetailView> orderDetailViews = beanSearcher.searchAll(OrderDetailView.class, MapUtils.builder().field(OrderDetailView::getMOid, mOid)
 				.build());