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
22d7fb64
Commit
22d7fb64
authored
Nov 09, 2021
by
徐光兴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加储值卡svc商户配置
parent
be696dab
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
60 additions
and
4 deletions
+60
-4
order-application-service/src/main/java/cn/freemud/controller/CreateOrderController.java
+10
-0
order-application-service/src/main/java/cn/freemud/entities/vo/SellCouponSvcConfigVo.java
+12
-0
order-application-service/src/main/java/cn/freemud/entities/vo/SvcConfigResponse.java
+15
-0
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
+1
-0
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
+22
-4
No files found.
order-application-service/src/main/java/cn/freemud/controller/CreateOrderController.java
View file @
22d7fb64
...
@@ -3,6 +3,7 @@ package cn.freemud.controller;
...
@@ -3,6 +3,7 @@ package cn.freemud.controller;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.vo.NgsSellCouponCreateOrderVo
;
import
cn.freemud.entities.vo.NgsSellCouponCreateOrderVo
;
import
cn.freemud.entities.vo.SellCouponCreateOrderVo
;
import
cn.freemud.entities.vo.SellCouponCreateOrderVo
;
import
cn.freemud.entities.vo.SellCouponSvcConfigVo
;
import
cn.freemud.service.impl.SellCouponOrderServiceImpl
;
import
cn.freemud.service.impl.SellCouponOrderServiceImpl
;
import
com.freemud.application.sdk.api.log.ApiAnnotation
;
import
com.freemud.application.sdk.api.log.ApiAnnotation
;
import
com.freemud.application.sdk.api.log.LogParams
;
import
com.freemud.application.sdk.api.log.LogParams
;
...
@@ -43,6 +44,15 @@ public class CreateOrderController {
...
@@ -43,6 +44,15 @@ public class CreateOrderController {
}
}
/**
/**
* 卖券订单创建查询是否支持储值卡 (临时方案,后续)
*/
@ApiAnnotation
(
logMessage
=
"svcConfig"
)
@PostMapping
(
"/sellCouponOrder/svcConfig"
)
public
BaseResponse
svcConfig
(
@Validated
@LogParams
@RequestBody
SellCouponSvcConfigVo
requestVo
)
{
return
sellCouponOrderService
.
svcConfig
(
requestVo
);
}
/**
* 农工商卖券订单创建
* 农工商卖券订单创建
*/
*/
@ApiAnnotation
(
logMessage
=
"sellCouponOrderCreate"
)
@ApiAnnotation
(
logMessage
=
"sellCouponOrderCreate"
)
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/SellCouponSvcConfigVo.java
0 → 100644
View file @
22d7fb64
package
cn
.
freemud
.
entities
.
vo
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.NotEmpty
;
@Data
public
class
SellCouponSvcConfigVo
{
@NotEmpty
(
message
=
"sessionId 不能为空"
)
private
String
sessionId
;
}
order-application-service/src/main/java/cn/freemud/entities/vo/SvcConfigResponse.java
0 → 100644
View file @
22d7fb64
package
cn
.
freemud
.
entities
.
vo
;
import
lombok.Data
;
@Data
public
class
SvcConfigResponse
{
private
boolean
svcPay
;
public
SvcConfigResponse
()
{
}
public
SvcConfigResponse
(
boolean
svcPay
)
{
this
.
svcPay
=
svcPay
;
}
}
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
View file @
22d7fb64
...
@@ -200,6 +200,7 @@ public enum ResponseResult {
...
@@ -200,6 +200,7 @@ public enum ResponseResult {
* 支付
* 支付
*/
*/
PAY_BACKEND_CONFIG_ERROR
(
"58003"
,
"支付交易异常"
,
"Abnormal payment transaction"
),
PAY_BACKEND_CONFIG_ERROR
(
"58003"
,
"支付交易异常"
,
"Abnormal payment transaction"
),
PAY_SVC_CONFIG_ERROR
(
"58004"
,
"不支持储值卡"
,
""
),
/**
/**
* 优惠券活动
* 优惠券活动
*/
*/
...
...
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
View file @
22d7fb64
...
@@ -16,10 +16,7 @@ import cn.freemud.entities.dto.product.ProductInfo;
...
@@ -16,10 +16,7 @@ import cn.freemud.entities.dto.product.ProductInfo;
import
cn.freemud.entities.dto.product.ValidateProductInfosDto
;
import
cn.freemud.entities.dto.product.ValidateProductInfosDto
;
import
cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto
;
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.CreateOrderVo
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.NgsSellCouponCreateOrderVo
;
import
cn.freemud.entities.vo.PaysuccessNoticeMessage
;
import
cn.freemud.entities.vo.SellCouponCreateOrderVo
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.manager.BuyProductOnceManager
;
import
cn.freemud.manager.BuyProductOnceManager
;
...
@@ -151,6 +148,9 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
...
@@ -151,6 +148,9 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
private
List
<
String
>
buyProductOncePartnerIds
;
private
List
<
String
>
buyProductOncePartnerIds
;
@Value
(
"#{'${virtual.product.svc.pay.partnerId}'.split(',')}"
)
private
List
<
String
>
virtualProductSvcPayPartnerId
;
private
final
String
SUCCESS
=
"100"
;
private
final
String
SUCCESS
=
"100"
;
private
final
String
ngsCouponProductId
=
"76161384"
;
private
final
String
ngsCouponProductId
=
"76161384"
;
...
@@ -275,6 +275,21 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
...
@@ -275,6 +275,21 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
}
}
/**
/**
* 获取用户所在的商户是否支持储值卡买券
*
* @param requestVo
* @return
*/
public
BaseResponse
svcConfig
(
SellCouponSvcConfigVo
requestVo
)
{
// 查询用户信息
AssortmentCustomerInfoVo
userLoginInfoDto
=
checkOrder
.
checkOrderByMemberNew
(
requestVo
.
getSessionId
());
if
(
CollectionUtils
.
isNotEmpty
(
virtualProductSvcPayPartnerId
)
&&
!
virtualProductSvcPayPartnerId
.
contains
(
userLoginInfoDto
.
getPartnerId
()))
{
return
ResponseUtil
.
success
(
new
SvcConfigResponse
(
false
));
}
return
ResponseUtil
.
success
(
new
SvcConfigResponse
(
true
));
}
/**
* 卖券订单创建
* 卖券订单创建
*/
*/
public
BaseResponse
createOrder
(
SellCouponCreateOrderVo
requestVo
){
public
BaseResponse
createOrder
(
SellCouponCreateOrderVo
requestVo
){
...
@@ -286,6 +301,9 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
...
@@ -286,6 +301,9 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
String
partnerId
=
userLoginInfoDto
.
getPartnerId
();
String
partnerId
=
userLoginInfoDto
.
getPartnerId
();
String
storeId
=
requestVo
.
getShopId
();
String
storeId
=
requestVo
.
getShopId
();
String
userId
=
userLoginInfoDto
.
getMemberId
();
String
userId
=
userLoginInfoDto
.
getMemberId
();
if
(
CollectionUtils
.
isNotEmpty
(
virtualProductSvcPayPartnerId
)
&&
!
virtualProductSvcPayPartnerId
.
contains
(
partnerId
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
PAY_SVC_CONFIG_ERROR
);
}
//查询门店信息
//查询门店信息
StoreInfoRequest
storeInfoRequest
=
new
StoreInfoRequest
(
partnerId
,
storeId
,
null
);
StoreInfoRequest
storeInfoRequest
=
new
StoreInfoRequest
(
partnerId
,
storeId
,
null
);
StoreResponse
storeResponse
=
storeCenterService
.
getStoreInfo
(
storeInfoRequest
,
trackingNo
);
StoreResponse
storeResponse
=
storeCenterService
.
getStoreInfo
(
storeInfoRequest
,
trackingNo
);
...
...
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