Merge branch 'holiday-price' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -308,4 +308,17 @@ public class BaseOrder implements Serializable {
 	@Column(name = "remark")
 	private Integer remark;
 
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "上级id")
+	@Column(name = "parent_user_id")
+	private Integer parentUserId;
+
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	@Column(name = "parent_user_company_id")
+	private Integer parentUserCompanyId;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/inter/OrderDetail.java

@@ -33,12 +33,6 @@ public interface OrderDetail extends OrderItemInter {
 
     public void setAppUserDTO(AppUserDTO appUserDTO);
 
-//    public Integer getFacilitateId();
-//
-//    public void setFacilitateId(Integer facilitateId);
-
     public String getFacilitatePhone();
 
-    public void setFacilitatePhone(String facilitatePhone);
-
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -99,6 +99,9 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         baseOrder.setUserId(appUserDTO.getUserid());
         baseOrder.setMemberLevel(appUserDTO.getMemberLevel());
 
+        //设置上级
+        baseOrder.setParentUserId(appUserDTO.getParentId());
+
         return baseOrder;
     }