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
f0760b42
Commit
f0760b42
authored
May 10, 2021
by
hanghang.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级SDK,华莱士开团新增拓展字段配送城市编号
parent
e0449b6e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
4 deletions
+11
-4
assortment-ordercenter-sdk/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java
+2
-1
order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
+1
-1
order-management/pom.xml
+1
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
+6
-0
No files found.
assortment-ordercenter-sdk/pom.xml
View file @
f0760b42
...
...
@@ -38,7 +38,7 @@
<dependency>
<groupId>
cn.freemud
</groupId>
<artifactId>
ordercenter-sdk
</artifactId>
<version>
1.3.46.RELEASE
</version>
<version>
2.9.11-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java
View file @
f0760b42
...
...
@@ -149,7 +149,7 @@ public class SpellGroupOrderAdapter {
}
public
CreatePrepayRequestDto
convertToCreatePrepayRequest
(
AssortmentCustomerInfoVo
userLoginInfoDto
,
QueryOrdersResponse
.
DataBean
.
OrderBean
data
,
String
trackingNo
AssortmentCustomerInfoVo
userLoginInfoDto
,
QueryOrdersResponse
.
DataBean
.
OrderBean
data
,
String
trackingNo
,
String
province
)
{
CreatePrepayRequestDto
requestDto
=
new
CreatePrepayRequestDto
();
requestDto
.
setPartnerId
(
data
.
getParentCode
());
...
...
@@ -159,6 +159,7 @@ public class SpellGroupOrderAdapter {
requestDto
.
setCardAmount
(
0
);
OrderExtInfoDto
orderExtInfoDto
=
new
OrderExtInfoDto
();
orderExtInfoDto
.
setSessionId
(
userLoginInfoDto
.
getSessionId
());
orderExtInfoDto
.
setProvince
(
province
);
requestDto
.
setOrderExtInfoDTO
(
orderExtInfoDto
);
requestDto
.
setTransId
(
data
.
getOid
());
requestDto
.
setOrderClient
(
OrderClientType
.
getOrderClientType
(
Integer
.
valueOf
(
data
.
getOrderClient
())));
...
...
order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
View file @
f0760b42
...
...
@@ -185,7 +185,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
return
ResponseUtil
.
error
(
baseOrderResponse
.
getErrcode
().
toString
(),
baseOrderResponse
.
getErrmsg
(),
null
);
}
/*创建支付*/
CreatePrepayRequestDto
createPrepayRequestDto
=
spellGroupOrderAdapter
.
convertToCreatePrepayRequest
(
userLoginInfoDto
,
createOrderResponse
.
getData
(),
trackingNo
);
CreatePrepayRequestDto
createPrepayRequestDto
=
spellGroupOrderAdapter
.
convertToCreatePrepayRequest
(
userLoginInfoDto
,
createOrderResponse
.
getData
(),
trackingNo
,
createSpellGroupOrderDto
.
getProvince
()
);
return
orderService
.
createPrepayOrder
(
createPrepayRequestDto
);
}
...
...
order-management/pom.xml
View file @
f0760b42
...
...
@@ -65,7 +65,7 @@
<dependency>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.
1.48-RELEASE
</version>
<version>
2.
3.03-SNAPSHOT
</version>
<scope>
provided
</scope>
</dependency>
<dependency>
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
View file @
f0760b42
...
...
@@ -12,6 +12,7 @@
*/
package
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
request
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
...
...
@@ -200,5 +201,10 @@ public class OrderExtInfoDto {
*/
private
String
autoReceiveTime
;
/**
* 城市编号
*/
private
String
province
;
}
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