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
01287880
Commit
01287880
authored
Jan 04, 2022
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
除配送券外,其他券都需要传商品
parent
b6b98d57
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
+2
-2
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
+3
-2
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOfflineClient.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
View file @
01287880
...
...
@@ -947,10 +947,10 @@ public class CouponAdapter {
orderCouponSettlementList
.
forEach
(
orderSettlement
->
{
//商品券参数
List
<
PreCheckAndLockReq
.
ProductInfo
>
products
=
null
;
if
(
orderSettlement
.
getSettlementType
().
equals
(
OrderSettlementType
.
PRODUC
T_COUPON
.
getIndex
()))
{
if
(
!
orderSettlement
.
getSettlementType
().
equals
(
OrderSettlementType
.
FREIGH
T_COUPON
.
getIndex
()))
{
products
=
new
ArrayList
<>();
List
<
OrderSettlementResp
>
couponProductList
=
orderBean
.
getOrderSettlementDetailList
().
stream
().
filter
(
productSettlement
->
!
Objects
.
equals
(
"
0
"
,
productSettlement
.
getProductId
())
!
Objects
.
equals
(
""
,
productSettlement
.
getProductId
())
&&
Objects
.
equals
(
orderSettlement
.
getExternalObjectId
(),
productSettlement
.
getExternalObjectId
())
&&
OrderSettlementType
.
PRODUCT_COUPON
.
getIndex
().
equals
(
productSettlement
.
getSettlementType
())
).
collect
(
Collectors
.
toList
());
...
...
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
View file @
01287880
...
...
@@ -3,6 +3,7 @@ package cn.freemud.service.business.impl;
import
cn.freemud.adapter.CouponAdapter
;
import
cn.freemud.amqp.MQService
;
import
cn.freemud.base.util.DateUtil
;
import
cn.freemud.entities.dto.CouponCodeResponseDto
;
import
cn.freemud.entities.dto.GetMemberExtendInfoRequestDto
;
import
cn.freemud.entities.dto.GetMemberExtendInfoResponseDto
;
import
cn.freemud.entities.dto.GetUserScoreUserDetailDto
;
...
...
@@ -324,13 +325,13 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
if
(
request
!=
null
)
{
// request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
request
.
getStoreInfo
().
setChannelIdList
(
getOrgCodes
(
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
()));
BaseResponse
couponLockResponseBaseResponse
=
offlineCouponSdkService
.
preCheckAndLock
(
request
);
CouponCodeResponseDto
couponLockResponseBaseResponse
=
offlineCouponSdkService
.
preCheckAndLock
(
request
);
if
(!
ObjectUtils
.
equals
(
RESPONSE_SUCCESS_STR
,
couponLockResponseBaseResponse
.
getStatusCode
()))
{
CancelOrderRequest
cancelOrderRequest
=
orderSdkAdapter
.
convent2CancelOrderRequest
(
orderBean
.
getOid
(),
orderBean
.
getCompanyId
(),
AfterSalesType
.
SYSTEM_CANCEL
,
"锁定券码失败"
,
""
,
null
);
orderCancel
(
cancelOrderRequest
);
//失败异步冲正库存,取消订单
orderQueueService
.
backOrdersStatusChange
(
orderBean
.
getOid
(),
orderBean
.
getStatus
());
return
BaseOrderResponse
.
getErrorBaseOrderResponse
(
couponLockResponseBaseResponse
.
get
Code
(),
couponLockResponseBaseResponse
.
getMessage
());
return
BaseOrderResponse
.
getErrorBaseOrderResponse
(
couponLockResponseBaseResponse
.
get
StatusCode
(),
couponLockResponseBaseResponse
.
getMsg
());
}
}
return
BaseOrderResponse
.
getErrorBaseOrderResponse
(
RESPONSE_SUCCESS_STR
,
""
);
...
...
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOfflineClient.java
View file @
01287880
...
...
@@ -23,5 +23,5 @@ public interface CouponOfflineClient {
*/
@LogIgnoreFeign
(
logMessage
=
"precheckAndLock"
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
,
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
)
@PostMapping
(
"/standard/checkandlock"
)
BaseResponse
preCheckAndLock
(
PreCheckAndLockReq
couponCodeVerificationDto
);
CouponCodeResponseDto
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