Merge branch 'master-zjw' into dev

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

@@ -279,4 +279,18 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "返回的优惠券")
 	@Column(name = "back_coupon")
 	String backCoupon;
+
+	/**
+	 * 促成人后台管理系统用户id
+	 */
+	@ApiModelProperty(value = "促成人后台管理系统用户id")
+	@Column(name = "facilitate_id")
+	Integer facilitateId;
+
+	/**
+	 * 促成人联系方式
+	 */
+	@ApiModelProperty(value = "促成人联系方式")
+	@Column(name = "facilitate_phone")
+	String facilitatePhone;
 }

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

@@ -33,4 +33,12 @@ 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-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddOrderCommonDTO.java

@@ -3,6 +3,8 @@ package com.xxfc.platform.order.pojo.order.add;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+
 @Data
 public class AddOrderCommonDTO {
     /**
@@ -17,4 +19,16 @@ public class AddOrderCommonDTO {
      */
     @ApiModelProperty(value = "优惠券ids")
     private String couponIds;
+
+//    /**
+//     * 促成人后台管理系统用户id
+//     */
+//    @ApiModelProperty(value = "促成人后台管理系统用户id")
+//    Integer facilitateId;
+
+    /**
+     * 促成人联系方式
+     */
+    @ApiModelProperty(value = "促成人联系方式")
+    String facilitatePhone;
 }

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

@@ -66,12 +66,18 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
      * 创建基础订单
      * @return
      */
-    public BaseOrder createBaseOrder(Integer orderOrigin, AppUserDTO appUserDTO) {
+    public BaseOrder createBaseOrder(Integer orderOrigin, String facilitatePhone, AppUserDTO appUserDTO) {
         BaseOrder baseOrder = new BaseOrder();
 
         //设置下单来源
         baseOrder.setOrderOrigin(orderOrigin);
 
+        //根据facilitatePhone 查询后台管理系统人员 未完成
+        if(StrUtil.isNotBlank(facilitatePhone)) {
+            baseOrder.setFacilitatePhone(facilitatePhone);
+            userFeign.getOne(facilitatePhone, null);
+        }
+
         //设置订单号
         baseOrder.setNo(OrderUtil.GetOrderNumber("", OrderUtil.APP_MID));
         //设置订单类型
@@ -89,12 +95,13 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         //设置用户id
         baseOrder.setUserId(appUserDTO.getUserid());
         baseOrder.setMemberLevel(appUserDTO.getMemberLevel());
+
         return baseOrder;
     }
 
     public void initDetail(Detail detail) {
 //        Integer appUserId = (null == detail.getAppUserDTO())? Integer.valueOf(BaseContextHandler.getUserID()): detail.getAppUserDTO().getUserid();
-        BaseOrder order = createBaseOrder(detail.getOrderOrigin(), detail.getAppUserDTO());
+        BaseOrder order = createBaseOrder(detail.getOrderOrigin(), detail.getFacilitatePhone(), detail.getAppUserDTO());
         detail.setOrder(order);
     }