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
a9b6da53
Commit
a9b6da53
authored
Dec 31, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
券预校验与锁定新接口对接
parent
739e5ef7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
+0
-0
order-application-service/src/main/java/cn/freemud/entities/dto/coupon/PreCheckAndLockReq.java
+0
-1
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
+2
-1
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOfflineClient.java
+5
-2
No files found.
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
View file @
a9b6da53
This diff is collapsed.
Click to expand it.
order-application-service/src/main/java/cn/freemud/entities/dto/coupon/PreCheckAndLockReq.java
View file @
a9b6da53
...
@@ -34,7 +34,6 @@ public class PreCheckAndLockReq {
...
@@ -34,7 +34,6 @@ public class PreCheckAndLockReq {
@ApiModelProperty
(
value
=
"券信息列表"
,
required
=
true
)
@ApiModelProperty
(
value
=
"券信息列表"
,
required
=
true
)
private
List
<
CouponInfo
>
couponInfoList
;
private
List
<
CouponInfo
>
couponInfoList
;
@ApiModelProperty
(
value
=
"用户微信openid"
)
@ApiModelProperty
(
value
=
"用户微信openid"
)
private
String
openId
;
private
String
openId
;
...
...
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
View file @
a9b6da53
...
@@ -323,7 +323,8 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
...
@@ -323,7 +323,8 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
PreCheckAndLockReq
request
=
couponAdapter
.
convert2PreCheckRequest
(
orderBean
,
openId
);
PreCheckAndLockReq
request
=
couponAdapter
.
convert2PreCheckRequest
(
orderBean
,
openId
);
if
(
request
!=
null
)
{
if
(
request
!=
null
)
{
// request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
// request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
BaseResponse
<
CouponLockResponse
>
couponLockResponseBaseResponse
=
offlineCouponSdkService
.
preCheckAndLock
(
request
);
request
.
getStoreInfo
().
setChannelIdList
(
getOrgCodes
(
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
()));
BaseResponse
couponLockResponseBaseResponse
=
offlineCouponSdkService
.
preCheckAndLock
(
request
);
if
(!
ObjectUtils
.
equals
(
RESPONSE_SUCCESS_STR
,
couponLockResponseBaseResponse
.
getCode
()))
{
if
(!
ObjectUtils
.
equals
(
RESPONSE_SUCCESS_STR
,
couponLockResponseBaseResponse
.
getCode
()))
{
CancelOrderRequest
cancelOrderRequest
=
orderSdkAdapter
.
convent2CancelOrderRequest
(
orderBean
.
getOid
(),
orderBean
.
getCompanyId
(),
AfterSalesType
.
SYSTEM_CANCEL
,
"锁定券码失败"
,
""
,
null
);
CancelOrderRequest
cancelOrderRequest
=
orderSdkAdapter
.
convent2CancelOrderRequest
(
orderBean
.
getOid
(),
orderBean
.
getCompanyId
(),
AfterSalesType
.
SYSTEM_CANCEL
,
"锁定券码失败"
,
""
,
null
);
orderCancel
(
cancelOrderRequest
);
orderCancel
(
cancelOrderRequest
);
...
...
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOfflineClient.java
View file @
a9b6da53
...
@@ -18,7 +18,10 @@ public interface CouponOfflineClient {
...
@@ -18,7 +18,10 @@ public interface CouponOfflineClient {
@PostMapping
(
"/api"
)
@PostMapping
(
"/api"
)
CouponCodeResponseDto
verification
(
CouponCodeVerificationDto
couponCodeVerificationDto
);
CouponCodeResponseDto
verification
(
CouponCodeVerificationDto
couponCodeVerificationDto
);
/**
* 预校验锁定券新接口
*/
@LogIgnoreFeign
(
logMessage
=
"precheckAndLock"
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
,
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
)
@LogIgnoreFeign
(
logMessage
=
"precheckAndLock"
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
,
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
)
@PostMapping
(
"/
precheck/redeem
"
)
@PostMapping
(
"/
standard/checkandlock
"
)
BaseResponse
<
CouponLockResponse
>
preCheckAndLock
(
PreCheckAndLockReq
couponCodeVerificationDto
);
BaseResponse
preCheckAndLock
(
PreCheckAndLockReq
couponCodeVerificationDto
);
}
}
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