Bladeren bron

订单增加分润人字段

liweifan 3 jaren geleden
bovenliggende
commit
cea0f3029f

+ 21 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/OrderReq.java

@@ -40,6 +40,8 @@ public class OrderReq {
     private String userNote;
     @ApiModelProperty(value = "优惠券id")
     private Long couponId;
+    @ApiModelProperty(value = "推荐用户id(有推荐人的情况)")
+    private Long recomUserId;
     @NotNull(message = "订单金额不能为空")
     @ApiModelProperty(value = "订单金额", required = true)
     private BigDecimal actualPrice;
@@ -47,10 +49,13 @@ public class OrderReq {
     @ApiModelProperty(value = "业务请求详情", required = true)
     private List<OrderReqInfo> orderInfos;
 
+
     @ApiModel(value = "OrderReqInfo对象", description = "下单请求业务详情对象")
     public class OrderReqInfo {
         @ApiModelProperty(value = "y用户id", hidden = true)
         private Long userId;
+        @ApiModelProperty(value = "推荐用户id(有推荐人的情况)")
+        private Long recomUserId;
         @ApiModelProperty(value = "订单号", hidden = true)
         private String orderNo;
         @ApiModelProperty(value = "订单详情号", hidden = true)
@@ -130,6 +135,14 @@ public class OrderReq {
         public void setCreateRes(OrderCreateRes createRes) {
             this.createRes = createRes;
         }
+
+        public Long getRecomUserId() {
+            return recomUserId;
+        }
+
+        public void setRecomUserId(Long recomUserId) {
+            this.recomUserId = recomUserId;
+        }
     }
 
     public Long getUserId() {
@@ -211,4 +224,12 @@ public class OrderReq {
     public void setOrderClient(ClientEnum orderClient) {
         this.orderClient = orderClient;
     }
+
+    public Long getRecomUserId() {
+        return recomUserId;
+    }
+
+    public void setRecomUserId(Long recomUserId) {
+        this.recomUserId = recomUserId;
+    }
 }

+ 13 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UserOrder.java

@@ -33,6 +33,9 @@ public class UserOrder implements Serializable {
     @ApiModelProperty("买家id ")
     @TableField(value = "user_id_")
     private Long userId;
+    @ApiModelProperty(value = "推荐用户id(有推荐人的情况)")
+    @TableField(value = "recom_user_id_")
+    private Long recomUserId;
     @ApiModelProperty("订单名称 ")
     @TableField(value = "order_name_")
     private String orderName;
@@ -84,6 +87,8 @@ public class UserOrder implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
+
+
     public Long getId() {
         return id;
     }
@@ -227,4 +232,12 @@ public class UserOrder implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Long getRecomUserId() {
+        return recomUserId;
+    }
+
+    public void setRecomUserId(Long recomUserId) {
+        this.recomUserId = recomUserId;
+    }
 }

+ 5 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -266,8 +266,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             info.setOrderNo(orderReq.getOrderNo());
             Long subOrderNo = idGeneratorService.generatorId("subOrderNo");
             info.setSubOrderNo(Long.toString(subOrderNo));
-
             info.setUserId(orderReq.getUserId());
+            info.setRecomUserId(orderReq.getRecomUserId());
+
             HttpResponseResult<OrderCreateRes> createResult = createFunction.apply(info);
             OrderCreateRes createRes = createResult.getData();
             if (!createResult.getStatus() || null == createRes || !createRes.getRes()) {
@@ -298,6 +299,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         for (UserOrderDetailVo orderDetailVo : orderDetailList) {
             orderDetailVo.setUserId(orderReq.getUserId());
             orderDetailVo.setOrderId(orderVo.getId());
+            orderDetailVo.setRecomUserId(orderReq.getRecomUserId());
 
             Consumer<UserOrderDetailVo> afterFunction = orderAfter.get(orderDetailVo.getGoodType());
             if (!Objects.isNull(afterFunction)) {
@@ -516,6 +518,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         userOrder.setOrderName(orderReq.getOrderName());
         userOrder.setOrderType(orderReq.getOrderType());
         userOrder.setOrderClient(orderReq.getOrderClient());
+        userOrder.setRecomUserId(orderReq.getRecomUserId());
 
         String desc = "";
         if (StringUtil.isEmpty(orderReq.getOrderDesc())) {
@@ -753,6 +756,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         for (UserOrderDetailVo orderDetailVo : orderDetailList) {
             orderDetailVo.setUserId(detail.getUserId());
             orderDetailVo.setOrderId(detail.getId());
+            orderDetailVo.setRecomUserId(detail.getRecomUserId());
             //调用业务
             Consumer<UserOrderDetailVo> userOrderVoConsumer = orderSuccess.get(orderDetailVo.getGoodType());
             if (!Objects.isNull(userOrderVoConsumer)) {

+ 10 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderDetailVo.java

@@ -29,6 +29,8 @@ public class UserOrderDetailVo extends UserOrderDetail {
 
     @ApiModelProperty(value = "冗余字段,用于传递参数用")
     private Object bizParam;
+    @ApiModelProperty(value = "推荐用户id(有推荐人的情况)")
+    private Long recomUserId;
 
     public Long getUserId() {
         return userId;
@@ -77,4 +79,12 @@ public class UserOrderDetailVo extends UserOrderDetail {
     public void setBizParam(Object bizParam) {
         this.bizParam = bizParam;
     }
+
+    public Long getRecomUserId() {
+        return recomUserId;
+    }
+
+    public void setRecomUserId(Long recomUserId) {
+        this.recomUserId = recomUserId;
+    }
 }

+ 2 - 0
cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -5,6 +5,7 @@
         <result column="id_" property="id"/>
         <result column="order_no_" property="orderNo"/>
         <result column="user_id_" property="userId"/>
+        <result column="recom_user_id_" property="recomUserId"/>
         <result column="order_name_" property="orderName"/>
         <result column="order_client_" property="orderClient"/>
         <result column="order_type_" property="orderType"/>
@@ -27,6 +28,7 @@
          t.id_ as id
         , t.order_no_ as orderNo
         , t.user_id_ as userId
+        , t.recom_user_id_ as recomUserId
         , t.order_name_ as orderName
         , t.order_client_ as orderClient
         , t.order_type_ as orderType