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
jenkins
order-group
Commits
d8deeacd
Commit
d8deeacd
authored
Feb 10, 2020
by
shuhu.hou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级券码sdk,传参添加app_flag
parent
8549cd17
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
3 deletions
+4
-3
assortment-ordercenter-sdk/pom.xml
+1
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+1
-1
order-application-service/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/CouponActivityServiceImpl.java
+1
-0
No files found.
assortment-ordercenter-sdk/pom.xml
View file @
d8deeacd
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<dependency>
<dependency>
<artifactId>
couponcenter-sdk
</artifactId>
<artifactId>
couponcenter-sdk
</artifactId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<version>
1.8.
2
-SNAPSHOT
</version>
<version>
1.8.
3
-SNAPSHOT
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
d8deeacd
...
@@ -2070,7 +2070,7 @@ public class OrderSdkAdapter {
...
@@ -2070,7 +2070,7 @@ public class OrderSdkAdapter {
couponCodeVerificationDto
.
setOperator_id
(
"-1"
);
couponCodeVerificationDto
.
setOperator_id
(
"-1"
);
couponCodeVerificationDto
.
setStore_id
(
orderBean
.
getShopId
());
couponCodeVerificationDto
.
setStore_id
(
orderBean
.
getShopId
());
//核销不需要核销通知
//核销不需要核销通知
couponCodeVerificationDto
.
setApp
_f
lag
(
"kgd.N"
);
couponCodeVerificationDto
.
setApp
F
lag
(
"kgd.N"
);
// 订单号 替换成唯一序号
// 订单号 替换成唯一序号
couponCodeVerificationDto
.
setTrans_id
(
orderBean
.
getOid
());
couponCodeVerificationDto
.
setTrans_id
(
orderBean
.
getOid
());
couponCodeVerificationDto
.
setBusiness_date
(
cn
.
freemud
.
base
.
util
.
DateUtil
.
convert2Str
(
new
Date
(),
cn
.
freemud
.
base
.
util
.
DateUtil
.
FORMAT_yyyyMMdd
));
couponCodeVerificationDto
.
setBusiness_date
(
cn
.
freemud
.
base
.
util
.
DateUtil
.
convert2Str
(
new
Date
(),
cn
.
freemud
.
base
.
util
.
DateUtil
.
FORMAT_yyyyMMdd
));
...
...
order-application-service/pom.xml
View file @
d8deeacd
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
<dependency>
<dependency>
<artifactId>
couponcenter-sdk
</artifactId>
<artifactId>
couponcenter-sdk
</artifactId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<version>
1.8.
2
-SNAPSHOT
</version>
<version>
1.8.
3
-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CouponActivityServiceImpl.java
View file @
d8deeacd
...
@@ -116,6 +116,7 @@ public class CouponActivityServiceImpl implements CouponActivityService {
...
@@ -116,6 +116,7 @@ public class CouponActivityServiceImpl implements CouponActivityService {
@Override
@Override
public
BaseResponse
callbackNotify
(
QueryOrdersResponseDto
.
DataBean
.
OrderBean
orderBean
)
{
public
BaseResponse
callbackNotify
(
QueryOrdersResponseDto
.
DataBean
.
OrderBean
orderBean
)
{
if
(
CollectionUtils
.
isEmpty
(
orderBean
.
getAccountList
()))
{
if
(
CollectionUtils
.
isEmpty
(
orderBean
.
getAccountList
()))
{
return
ResponseUtil
.
success
();
return
ResponseUtil
.
success
();
}
}
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
accountBean
=
orderBean
.
getAccountList
().
stream
().
filter
(
account
->
account
.
getType
().
equals
(
OldOrderAccountType
.
COUPON
.
getCode
())
||
account
.
getType
().
equals
(
OldOrderAccountType
.
PRODUCT_COUPON
.
getCode
())
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
accountBean
=
orderBean
.
getAccountList
().
stream
().
filter
(
account
->
account
.
getType
().
equals
(
OldOrderAccountType
.
COUPON
.
getCode
())
||
account
.
getType
().
equals
(
OldOrderAccountType
.
PRODUCT_COUPON
.
getCode
())
...
...
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