Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
9addf12b
Commit
9addf12b
authored
May 18, 2020
by
haibo.jiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加订单支付类型
parent
fd61cca6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
2 deletions
+13
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+1
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
+2
-0
order-application-service/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-0
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
+6
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
+2
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
9addf12b
...
...
@@ -173,6 +173,7 @@ public class OrderSdkAdapter {
request
.
setPayTime
(
requestVO
.
getPayTime
());
request
.
setThirdStoreId
(
requestVO
.
getThirdShopId
());
request
.
setThirdOrderCode
(
requestVO
.
getThirdOrderCode
());
request
.
setPayChannelType
(
requestVO
.
getPayChannelType
());
if
(
requestVO
.
getOrderStatus
()
!=
null
)
{
request
.
setOrderState
(
getNewOrderStatus
(
requestVO
.
getOrderStatus
().
getCode
()));
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
View file @
9addf12b
...
...
@@ -159,6 +159,8 @@ public class BaseCreateOrderRequest extends BaseConfig {
*/
private
String
region
;
private
Byte
payChannelType
;
@Data
public
static
class
DeliveryTypeInfo
{
/**
...
...
order-application-service/pom.xml
View file @
9addf12b
...
...
@@ -40,7 +40,7 @@
<dependency>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
1.4.
2
.RELEASE
</version>
<version>
1.4.
3
.RELEASE
</version>
</dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
9addf12b
...
...
@@ -255,6 +255,7 @@ public class OrderAdapter {
activityUpdateStockRequest
.
setStock
(
stocks
);
createOrderDto
.
setActivityUpdateStockRequest
(
activityUpdateStockRequest
);
}
createOrderDto
.
setPayChannelType
(
createOrderVo
.
getPayChannelType
());
return
createOrderDto
;
}
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
View file @
9addf12b
...
...
@@ -153,6 +153,11 @@ public class CreateOrderVo {
*/
public
UserDeliveryInfoDto
userDeliveryInfoDto
;
/**
* 下单支付渠道类型
*/
private
Byte
payChannelType
;
@Valid
private
PremiumExchangeActivity
premiumExchangeActivity
;
/**
...
...
@@ -185,7 +190,7 @@ public class CreateOrderVo {
/**
* 渠道类型 OrderChannelType
*/
private
String
channelType
;
private
Byte
channelType
;
/**
* 微信配送地址信息
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
View file @
9addf12b
...
...
@@ -211,4 +211,6 @@ public class CreateOrderRequest extends BaseRequest {
//操作人
private
String
operator
;
private
Byte
payChannelType
;
}
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