Merge branch 'feature_mvp616_wangl' into 'develop'

Feature mvp616 wangl

See merge request !36

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/DispatchOrderListResp.java

@@ -20,6 +20,6 @@ public class DispatchOrderListResp {
 		private String customerName;
 		private String customerName;
 		private String remark;
 		private String remark;
 		private String groupTag;
 		private String groupTag;
-		private String groupWeight;
+		private Integer groupWeight;
 	}
 	}
 }
 }
\ No newline at end of file

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java

@@ -18,6 +18,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
+interface GroupTag {
+	// 订单分类tag
+
+	String getGroupTag(OrderRequest order);
+
+}
+
 @Service
 @Service
 public class DispatchServiceImpl implements DispatchService {
 public class DispatchServiceImpl implements DispatchService {
 
 
@@ -46,6 +53,9 @@ public class DispatchServiceImpl implements DispatchService {
 		// 获取工单列表
 		// 获取工单列表
 		List<OrderRequest> orders = this.queryOrderRequests(levelType, levelIds, date);
 		List<OrderRequest> orders = this.queryOrderRequests(levelType, levelIds, date);
 
 
+		// 获取分组标签
+		GroupTag gt = new GroupTagFactory().getGroupTag(groupTagId);
+
 		List<DispatchOrderListResp.Order> items = new ArrayList<>();
 		List<DispatchOrderListResp.Order> items = new ArrayList<>();
 		for (OrderRequest o : orders) {
 		for (OrderRequest o : orders) {
 			DispatchOrderListResp.Order item = new DispatchOrderListResp.Order();
 			DispatchOrderListResp.Order item = new DispatchOrderListResp.Order();
@@ -66,6 +76,10 @@ public class DispatchServiceImpl implements DispatchService {
 			String timeSlot = this.parseTimeSlot(o.getExpectTimeBegin());
 			String timeSlot = this.parseTimeSlot(o.getExpectTimeBegin());
 			item.setIntentionTime(String.format("%s/%s", time, timeSlot));
 			item.setIntentionTime(String.format("%s/%s", time, timeSlot));
 
 
+			String[] tags = gt.getGroupTag(o).split("#");
+			item.setGroupTag(tags[0]); // 设置tag名称
+			item.setGroupWeight(Integer.parseInt(tags[1]));  // 设置tag权重
+
 			items.add(item);
 			items.add(item);
 		}
 		}
 
 
@@ -168,3 +182,38 @@ public class DispatchServiceImpl implements DispatchService {
 		}
 		}
 	}
 	}
 }
 }
+
+class GroupTagFactory {
+
+	public GroupTag getGroupTag(String groupTagId) {
+		if (groupTagId.equals("0")) {
+			return new GroupTagUrgency();
+		} else {
+			return new GroupTagOmit();
+		}
+	}
+}
+
+class GroupTagUrgency implements GroupTag {
+	// 根据紧急程度来分组
+
+	public String getGroupTag(OrderRequest order) {
+		String s = order.getTags();
+		if (s.contains("VIP") || s.contains("财产损失")) {
+			return "超急#10";
+		} else if (s.contains("自保点") || s.contains("紧急")) {
+			return "紧急#8";
+		} else if (s.contains("3天前单") || s.contains("同地址多单") || s.contains("超重需多人")) {
+			return "一般#5";
+		} else {
+			return "正常#1";
+		}
+	}
+}
+
+class GroupTagOmit implements GroupTag {
+
+	public String getGroupTag(OrderRequest order) {
+		return "默认分类#5";
+	}
+}
\ No newline at end of file