Merge branch 'abroad_073' into abroad_pre

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

@@ -250,6 +250,8 @@ public class OrderDon extends BaseEntity implements Serializable {
 
     private String payTitle;
 
+    private String phone;
+
 	public enum Status {
         /**
          * 订单状态

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

@@ -188,4 +188,7 @@ public class OrderDonBackView {
 
 	@DbField("sku.mj_relax_num")
 	private Integer mjRelaxNum;
+
+	@DbField("o.phone")
+	private String orderPhone;
 }

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

@@ -220,6 +220,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		String donNo = SEQUENCE.nextId().toString();
 		OrderDon orderDon = new OrderDon();
 		orderDon.setIsDp(false);
+		//下单手机号
+		orderDon.setPhone(orderPhone);
 		if (isNoLogin != null && isNoLogin) {
 			orderDon.setIsNoLogin(true);
 		}

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -31,7 +31,6 @@ import com.cyksj.service.order.OrderDonService;
 import com.cyksj.service.relation.GroupRelationFrontService;
 import com.cyksj.service.relation.GroupsRelationNetflixService;
 import com.cyksj.service.user.UserBindRelationService;
-import com.cyksj.service.user.UserService;
 import com.cyksj.web.util.StpUserUtil;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -63,8 +62,6 @@ public class GroupRelationController {
 
     private final GroupRelationFrontService groupRelationFrontService;
 
-    private final UserService userService;
-
     private final UserBindRelationService userBindRelationService;
 
     private final HttpServletRequest request;