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
06d22a8d
Commit
06d22a8d
authored
Nov 18, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调用促销传递isaas参数
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
6b09148e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
7 deletions
+1
-7
order-application-service/src/main/java/cn/freemud/entities/dto/promotion/CalculationDiscountGoodsDto.java
+0
-5
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
+1
-2
No files found.
order-application-service/src/main/java/cn/freemud/entities/dto/promotion/CalculationDiscountGoodsDto.java
View file @
06d22a8d
...
@@ -74,11 +74,6 @@ public class CalculationDiscountGoodsDto {
...
@@ -74,11 +74,6 @@ public class CalculationDiscountGoodsDto {
*/
*/
private
boolean
gift
=
false
;
private
boolean
gift
=
false
;
/**
* i应用传isaas,快中台传fast
*/
private
String
application
=
"isaas"
;
public
boolean
getMeal
(){
return
meal
;}
public
boolean
getMeal
(){
return
meal
;}
public
void
setMeal
(
boolean
meal
){
public
void
setMeal
(
boolean
meal
){
...
...
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
View file @
06d22a8d
...
@@ -21,7 +21,6 @@ import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
...
@@ -21,7 +21,6 @@ import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
import
cn.freemud.entities.dto.promotion.CalculationDiscountRequestDto
;
import
cn.freemud.entities.dto.promotion.CalculationDiscountRequestDto
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.integralproduct.IntegralProductStatusEnum
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.manager.BuyProductOnceManager
;
import
cn.freemud.manager.BuyProductOnceManager
;
import
cn.freemud.redis.RedisCache
;
import
cn.freemud.redis.RedisCache
;
...
@@ -78,7 +77,6 @@ import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
...
@@ -78,7 +77,6 @@ import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
import
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse
;
import
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse
;
import
com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService
;
import
com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService
;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Sets
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
...
@@ -1057,6 +1055,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
...
@@ -1057,6 +1055,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
//买券包调促销指定只计算限时特价 [2,21]
//买券包调促销指定只计算限时特价 [2,21]
calculationDiscountRequestDto
.
setActivityTypes
(
Arrays
.
asList
(
2
,
21
));
calculationDiscountRequestDto
.
setActivityTypes
(
Arrays
.
asList
(
2
,
21
));
calculationDiscountRequestDto
.
setVer
(
1
);
calculationDiscountRequestDto
.
setVer
(
1
);
calculationDiscountRequestDto
.
setApplication
(
"isaas"
);
ActivityCalculationDiscountResponseDto
activityCalculationDiscountResponseDto
=
promotionDiscountClient
.
calculationDiscountSharing
(
calculationDiscountRequestDto
);
ActivityCalculationDiscountResponseDto
activityCalculationDiscountResponseDto
=
promotionDiscountClient
.
calculationDiscountSharing
(
calculationDiscountRequestDto
);
if
(!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
activityCalculationDiscountResponseDto
.
getStatusCode
())
||
activityCalculationDiscountResponseDto
.
getResult
()
==
null
)
{
if
(!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
activityCalculationDiscountResponseDto
.
getStatusCode
())
||
activityCalculationDiscountResponseDto
.
getResult
()
==
null
)
{
return
null
;
return
null
;
...
...
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