Merge branch 'mj' into dev

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDetailView.java

@@ -71,6 +71,12 @@ public class OrderDetailView {
 	@DbIgnore
 	private OrderDonTransport transport;
 
+	@DbIgnore
+	private Integer mjFastNum;
+
+	@DbIgnore
+	private Integer mjRelaxNum;
+
 	@DbField("o.relation_id")
 	private Long relationId;
 

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

@@ -1028,6 +1028,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		if (detail.getRelationId() != 0) {
 			detail.setTransport(transportMapper.selectOne(Wrappers.lambdaQuery(OrderDonTransport.class).eq(OrderDonTransport::getOrderId, detail.getId()).last(" limit 1")));
 			detail.setWaybill(waybillMapper.selectOne(Wrappers.lambdaQuery(OrderDonWaybill.class).eq(OrderDonWaybill::getOrderId, detail.getId()).last(" limit 1")));
+			MidjourneyUser midjourneyUser = midjourneyUserMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUser.class).eq(MidjourneyUser::getRelationId, detail.getRelationId()).last(" limit 1"));
+			detail.setMjFastNum(midjourneyUser.getMjFastNum());
+			detail.setMjRelaxNum(midjourneyUser.getMjRelaxNum());
 		}
 		return detail;
 	}