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
10dc92fe
Commit
10dc92fe
authored
May 07, 2021
by
hanghang.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
华莱士开团促销需新增appId
parent
f3e7ed76
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
2 deletions
+22
-2
order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java
+22
-2
No files found.
order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java
View file @
10dc92fe
...
@@ -60,7 +60,6 @@ public class SpellGroupOrderDataManager {
...
@@ -60,7 +60,6 @@ public class SpellGroupOrderDataManager {
@Autowired
@Autowired
private
DeliveryFeiginClient
deliveryFeiginClient
;
private
DeliveryFeiginClient
deliveryFeiginClient
;
@Autowired
@Autowired
private
EcologyAdminApplicationClient
ecologyAdminApplicationClient
;
private
EcologyAdminApplicationClient
ecologyAdminApplicationClient
;
...
@@ -145,7 +144,13 @@ public class SpellGroupOrderDataManager {
...
@@ -145,7 +144,13 @@ public class SpellGroupOrderDataManager {
return
queryDeliveryTemplateResponse
;
return
queryDeliveryTemplateResponse
;
}
}
/**
* 拼团订单,支付回调时开团参团
* @param orderBean
* @param userLoginInfoDto
* @param wxappid
* @return
*/
public
GroupWorkJoinResponse
groupWorkJoin
(
QueryOrdersResponseDto
.
DataBean
.
OrderBean
orderBean
,
AssortmentCustomerInfoVo
userLoginInfoDto
,
String
wxappid
){
public
GroupWorkJoinResponse
groupWorkJoin
(
QueryOrdersResponseDto
.
DataBean
.
OrderBean
orderBean
,
AssortmentCustomerInfoVo
userLoginInfoDto
,
String
wxappid
){
GroupWorkJoinRequest
groupWorkJoinRequest
=
new
GroupWorkJoinRequest
();
GroupWorkJoinRequest
groupWorkJoinRequest
=
new
GroupWorkJoinRequest
();
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
ProductBean
productBean
=
orderBean
.
getProductList
().
get
(
0
);
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
ProductBean
productBean
=
orderBean
.
getProductList
().
get
(
0
);
...
@@ -165,6 +170,13 @@ public class SpellGroupOrderDataManager {
...
@@ -165,6 +170,13 @@ public class SpellGroupOrderDataManager {
return
groupWorkJoinResponse
;
return
groupWorkJoinResponse
;
}
}
/**
* 查询团信息
* @param groupId
* @param partnerId
* @param userId
* @return
*/
public
QueryHistoryGroupVO
queryHistoryByGroupId
(
String
groupId
,
String
partnerId
,
String
userId
){
public
QueryHistoryGroupVO
queryHistoryByGroupId
(
String
groupId
,
String
partnerId
,
String
userId
){
QueryGroupHistoryRequest
querySpellGroupRequest
=
new
QueryGroupHistoryRequest
();
QueryGroupHistoryRequest
querySpellGroupRequest
=
new
QueryGroupHistoryRequest
();
List
<
String
>
groups
=
new
ArrayList
<>();
List
<
String
>
groups
=
new
ArrayList
<>();
...
@@ -179,6 +191,14 @@ public class SpellGroupOrderDataManager {
...
@@ -179,6 +191,14 @@ public class SpellGroupOrderDataManager {
return
queryHistory
.
getResult
().
get
(
0
);
return
queryHistory
.
getResult
().
get
(
0
);
}
}
/**
* 创建拼团订单,校验团信息
* @param groupId
* @param userId
* @param activityCode
* @param partnerId
* @return
*/
public
QuerySpellGroupVoResponse
queryByGroupIdNew
(
String
groupId
,
String
userId
,
String
activityCode
,
String
partnerId
){
public
QuerySpellGroupVoResponse
queryByGroupIdNew
(
String
groupId
,
String
userId
,
String
activityCode
,
String
partnerId
){
QuerySpellGroupRequest
querySpellGroupRequest
=
new
QuerySpellGroupRequest
();
QuerySpellGroupRequest
querySpellGroupRequest
=
new
QuerySpellGroupRequest
();
querySpellGroupRequest
.
setGroupId
(
groupId
);
querySpellGroupRequest
.
setGroupId
(
groupId
);
...
...
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