Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
d3daa39d
Commit
d3daa39d
authored
Oct 16, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
c24f8704
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
1 deletion
+32
-1
BaseOrder.java
...c/main/java/com/xxfc/platform/order/entity/BaseOrder.java
+14
-0
AddOrderCommonDTO.java
...xxfc/platform/order/pojo/order/add/AddOrderCommonDTO.java
+14
-0
AbstractOrderHandle.java
.../com/xxfc/platform/order/service/AbstractOrderHandle.java
+4
-1
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java
View file @
d3daa39d
...
...
@@ -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/pojo/order/add/AddOrderCommonDTO.java
View file @
d3daa39d
...
...
@@ -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
View file @
d3daa39d
...
...
@@ -66,12 +66,14 @@ 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 查询后台管理系统人员
//设置订单号
baseOrder
.
setNo
(
OrderUtil
.
GetOrderNumber
(
""
,
OrderUtil
.
APP_MID
));
//设置订单类型
...
...
@@ -89,6 +91,7 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
//设置用户id
baseOrder
.
setUserId
(
appUserDTO
.
getUserid
());
baseOrder
.
setMemberLevel
(
appUserDTO
.
getMemberLevel
());
return
baseOrder
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment