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
ba652c5c
Commit
ba652c5c
authored
Jul 15, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【华莱士】华莱士&百事抽奖活动 新增接口,是否告知前端需要弹框
parent
578345cf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
75 additions
and
8 deletions
+75
-8
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
+11
-0
order-application-service/src/main/java/cn/freemud/entities/vo/order/WallaceTempActivityRequest.java
+27
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
+37
-8
No files found.
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
View file @
ba652c5c
...
...
@@ -556,5 +556,16 @@ public class OrderController {
return
ResponseUtil
.
success
(
orderAdapterService
.
getOrderConfig
(
request
));
}
/**
* 华莱士临时对接百事抽奖活动
* @param request
* @return 是否需要弹框,跳转百事
*/
@ApiAnnotation
(
logMessage
=
"/order/temp/activity"
)
@PostMapping
(
"/temp/activity/query"
)
public
BaseResponse
wallaceTempActivity
(
@Validated
@LogParams
@RequestBody
WallaceTempActivityRequest
request
)
{
return
orderAdapterService
.
wallaceTempActivity
(
request
);
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/WallaceTempActivityRequest.java
0 → 100644
View file @
ba652c5c
package
cn
.
freemud
.
entities
.
vo
.
order
;
import
lombok.Data
;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2022/7/15 11:18
* @description :
*/
@Data
public
class
WallaceTempActivityRequest
{
/**
* 商户号
*/
private
String
parentId
;
/**
* 订单号
*/
private
String
orderCode
;
private
String
sessionId
;
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
View file @
ba652c5c
...
...
@@ -12,10 +12,7 @@ import cn.freemud.entities.dto.order.CreateCashierOrderDto;
import
cn.freemud.entities.dto.pay.SvcPayItem
;
import
cn.freemud.entities.dto.pay.svc.ConsumeHistoryCreateRequest
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.order.CashierCheckResponseVo
;
import
cn.freemud.entities.vo.order.GetOrderConfigRequestVo
;
import
cn.freemud.entities.vo.order.PaymentConfigVo
;
import
cn.freemud.entities.vo.order.PlugInParameter
;
import
cn.freemud.entities.vo.order.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.management.service.handle.PaymentHandle
;
...
...
@@ -35,6 +32,7 @@ import com.freemud.api.assortment.datamanager.enums.IappIdType;
import
com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager
;
import
com.freemud.application.sdk.api.log.ApiLog
;
import
com.freemud.application.sdk.api.log.ErrorLog
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1
;
...
...
@@ -43,7 +41,10 @@ import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import
com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum
;
import
com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus
;
import
com.freemud.application.sdk.api.ordercenter.enums.PayChannelType
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse
;
import
com.freemud.application.sdk.api.ordercenter.service.OrderSdkService
;
import
com.freemud.application.sdk.api.service.EmailAlertService
;
import
com.freemud.sdk.api.assortment.order.util.LockUtils
;
import
com.google.gson.Gson
;
...
...
@@ -56,10 +57,7 @@ import org.springframework.context.annotation.Lazy;
import
org.springframework.stereotype.Service
;
import
java.text.MessageFormat
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.*
;
import
java.util.stream.Collectors
;
...
...
@@ -171,6 +169,8 @@ public class OrderAdapterServiceImpl {
private
EmailAlertService
emailAlertService
;
@Autowired
private
PaymentHandle
paymentHandle
;
@Autowired
private
OrderSdkService
orderSdkService
;
//获取下单实现对象
private
OrderFactoryService
getCreateOrderBean
(
AssortmentCustomerInfoVo
assortmentCustomerInfoVo
,
CreateOrderVo
createOrderVo
)
{
...
...
@@ -583,4 +583,33 @@ public class OrderAdapterServiceImpl {
return
false
;
}
/**
* 华莱士临时需求,
* @param request
* @return
*/
public
BaseResponse
wallaceTempActivity
(
WallaceTempActivityRequest
request
)
{
AssortmentCustomerInfoVo
assortmentCustomerInfoVo
=
assortmentCustomerInfoManager
.
getCustomerInfoByObject
(
request
.
getSessionId
());
if
(
assortmentCustomerInfoVo
==
null
||
StringUtils
.
isEmpty
(
assortmentCustomerInfoVo
.
getMemberId
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
}
// 校验订单
QueryByCodeResponse
orderDetailResponse
=
orderSdkService
.
getOrderInfo
(
null
,
request
.
getOrderCode
(),
null
,
null
,
LogThreadLocal
.
getTrackingNo
());
if
(
orderDetailResponse
==
null
||
!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
orderDetailResponse
.
getCode
()
+
""
)
||
orderDetailResponse
.
getResult
()
==
null
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_NOT_EXIST
);
}
OrderInfoReqs
orderInfoReqs
=
orderDetailResponse
.
getResult
();
if
(!
Objects
.
equals
(
orderInfoReqs
.
getUserId
(),
assortmentCustomerInfoVo
.
getMemberId
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_NOT_EXIST
);
}
Map
<
String
,
Boolean
>
respVo
=
new
HashMap
<>();
respVo
.
put
(
"isSkip"
,
false
);
// 校验 是否可以参加活动
// step1 调用敬轩, 是否能参加活动
// stpe2 调用光兴, 是否成功 +1
return
ResponseUtil
.
success
(
respVo
);
}
}
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