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
049338ed
Commit
049338ed
authored
Aug 02, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
促销返回状态码参数接收错误修改
parent
83359cf4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
+3
-2
order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java
+2
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
View file @
049338ed
...
...
@@ -60,6 +60,7 @@ import com.freemud.application.sdk.api.productcenter.response.menu.GetMenuCatego
import
com.freemud.application.sdk.api.productcenter.response.product.GetProductInfosResponse
;
import
com.freemud.application.sdk.api.productcenter.service.MenuService
;
import
com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest
;
import
com.freemud.application.sdk.api.promotioncenter.response.PromotionResponseDTO
;
import
com.freemud.application.sdk.api.stockapi.request.UpdateStocksRequest
;
import
com.freemud.application.sdk.api.stockapi.service.StockSdkService
;
import
com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest
;
...
...
@@ -247,8 +248,8 @@ public class SellCouponOrderServiceImpl {
ActivityUpdateStockRequest
activityUpdateStockRequest
=
orderSdkAdapter
.
convert2ActivityUpdateStockRequest
(
orderBean
,
stockBeanDtos
);
// 原逻辑只检测扣减库存不为空时调用,现改为扣减库存不为空或参加活动不为空时调用
if
(
activityUpdateStockRequest
!=
null
&&
(
CollectionUtils
.
isNotEmpty
(
activityUpdateStockRequest
.
getStock
())
||
CollectionUtils
.
isNotEmpty
(
activityUpdateStockRequest
.
getActivityList
())))
{
BaseResponse
activityResponse
=
promotionDiscountClient
.
subtractStock
(
activityUpdateStockRequest
);
if
(!
ObjectUtils
.
equals
(
RESPONSE_SUCCESS_STR
,
activityResponse
.
getCode
()))
{
PromotionResponseDTO
activityResponse
=
promotionDiscountClient
.
subtractStock
(
activityUpdateStockRequest
);
if
(!
ObjectUtils
.
equals
(
RESPONSE_SUCCESS_STR
,
activityResponse
.
get
Status
Code
()))
{
// 失败取消订单
CancelOrderRequest
cancelOrderRequest
=
orderSdkAdapter
.
convent2CancelOrderRequest
(
orderBean
.
getOid
(),
orderBean
.
getCompanyId
(),
AfterSalesType
.
SYSTEM_CANCEL
,
"活动库存不足"
,
""
,
null
);
...
...
order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java
View file @
049338ed
...
...
@@ -23,6 +23,7 @@ import cn.freemud.entities.dto.promotion.*;
import
cn.freemud.entities.vo.QueryGroupHistoryRequest
;
import
cn.freemud.entities.vo.QuerySpellGroupRequest
;
import
com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest
;
import
com.freemud.application.sdk.api.promotioncenter.response.PromotionResponseDTO
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -92,5 +93,5 @@ public interface PromotionDiscountClient {
* 扣减活动库存
*/
@PostMapping
(
"/activity/stock/subtractStock"
)
BaseResponse
subtractStock
(
@RequestBody
ActivityUpdateStockRequest
activityReq
);
PromotionResponseDTO
subtractStock
(
@RequestBody
ActivityUpdateStockRequest
activityReq
);
}
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