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
f2ea2732
Commit
f2ea2732
authored
Jan 02, 2024
by
box
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同意退款校验卖券订单的券状态
parent
1bb497d9
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
272 additions
and
0 deletions
+272
-0
order-management/src/main/java/cn/freemud/management/entities/dto/request/coupon/CodeInfoQueryDto.java
+70
-0
order-management/src/main/java/cn/freemud/management/entities/dto/response/coupon/CouponBaseResponse.java
+2
-0
order-management/src/main/java/cn/freemud/management/enums/CouponStatus.java
+44
-0
order-management/src/main/java/cn/freemud/management/service/handle/CouponQueryHandle.java
+90
-0
order-management/src/main/java/cn/freemud/management/service/impl/SaleCouponOrderMangerServiceImpl.java
+8
-0
order-management/src/main/java/cn/freemud/management/thirdparty/CouponQueryClient.java
+36
-0
order-management/src/main/java/cn/freemud/management/thirdparty/request/coupon/CodeInfoQueryReq.java
+22
-0
No files found.
order-management/src/main/java/cn/freemud/management/entities/dto/request/coupon/CodeInfoQueryDto.java
0 → 100644
View file @
f2ea2732
package
cn
.
freemud
.
management
.
entities
.
dto
.
request
.
coupon
;
import
lombok.Data
;
import
org.springframework.lang.Nullable
;
/**
* © All rights Reserved, Designed By www.freemud.cn
*
* @author wénkǎi.zhāng 2023-05-30
* @since 1.0
*/
@Data
public
class
CodeInfoQueryDto
{
/**
* 券名称
*/
private
String
name
;
/**
* 券号,目前最长23个字符
*/
private
String
code
;
/**
* 券Logo
*/
private
String
logo
;
/**
* 券类型
*/
private
Integer
type
;
/**
* 券状态:0可用,1已核销,2部分核销
*/
private
Integer
state
;
/**
* 当前剩余可用次数
*/
private
Integer
leftAvailableTimes
;
/**
* 最大剩余可用次数
*/
private
Integer
maxLeftAvailableTimes
;
/**
* 优惠券使用限制相关配置
*/
private
CouponCodeUseRuleModel
couponUseRule
;
@Data
public
static
class
CouponCodeUseRuleModel
{
/**
* 最大可核销次数,大于1时为频次券, 默认1次
*/
private
int
maxRedeemTimes
=
1
;
/**
* 核销次数限制类型对应的可核销次数,频次券时有效,默认null不限
*/
@Nullable
private
Integer
limitedRedeemTimes
;
}
}
order-management/src/main/java/cn/freemud/management/entities/dto/response/coupon/CouponBaseResponse.java
View file @
f2ea2732
package
cn
.
freemud
.
management
.
entities
.
dto
.
response
.
coupon
;
import
com.fasterxml.jackson.annotation.JsonAlias
;
import
lombok.Data
;
/**
...
...
@@ -17,6 +18,7 @@ public class CouponBaseResponse<T> {
*/
private
String
msg
;
@JsonAlias
(
"data"
)
private
T
result
;
}
order-management/src/main/java/cn/freemud/management/enums/CouponStatus.java
0 → 100644
View file @
f2ea2732
package
cn
.
freemud
.
management
.
enums
;
public
enum
CouponStatus
{
STATUS
(-
1
,
"未激活"
),
STATUS_0
(
0
,
"可用"
),
STATUS_1
(
1
,
"已使用"
),
STATUS_2
(
2
,
"部分使用"
),
STATUS_3
(
3
,
"取消"
),
STATUS_6
(
6
,
"已过期"
),
;
private
Integer
code
;
private
String
desc
;
CouponStatus
(
Integer
code
,
String
desc
)
{
this
.
code
=
code
;
this
.
desc
=
desc
;
}
public
static
CouponStatus
getByCode
(
Integer
code
)
{
for
(
CouponStatus
payType
:
values
())
{
if
(
payType
.
getCode
().
equals
(
code
))
{
return
payType
;
}
}
return
null
;
}
public
Integer
getCode
()
{
return
code
;
}
public
void
setCode
(
Integer
code
)
{
this
.
code
=
code
;
}
public
String
getDesc
()
{
return
desc
;
}
public
void
setDesc
(
String
desc
)
{
this
.
desc
=
desc
;
}
}
order-management/src/main/java/cn/freemud/management/service/handle/CouponQueryHandle.java
0 → 100644
View file @
f2ea2732
package
cn
.
freemud
.
management
.
service
.
handle
;
import
cn.freemud.management.entities.dto.request.coupon.CodeInfoQueryDto
;
import
cn.freemud.management.entities.dto.response.coupon.CouponBaseResponse
;
import
cn.freemud.management.enums.CouponStatus
;
import
cn.freemud.management.thirdparty.CouponQueryClient
;
import
cn.freemud.management.thirdparty.request.coupon.CodeInfoQueryReq
;
import
com.alibaba.fastjson.JSONObject
;
import
com.freemud.application.sdk.api.log.ApiLog
;
import
com.google.common.collect.Lists
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.springframework.stereotype.Component
;
import
java.util.*
;
/**
* © All rights Reserved
*
* @author wénkǎi.zhāng 2024-01-02
* @since 1.0
*/
@Component
@RequiredArgsConstructor
public
class
CouponQueryHandle
{
private
final
CouponQueryClient
couponQueryClient
;
private
final
int
SUCCESS_CODE
=
100
;
/**
* 查询券信息
* <pre>
* 1. 本方法会忽略查询失败的券,因此可能传入的券号不一定都能在返回列表中找到与之对应的券信息
* 2. 同时,本方法会对入参中的codes去重,券码接口对已归档的券也不会返回,基于本条和上一条,
* 应注意传入集合的size可能和返回列表的size不同,也许是正常现象
* 3. 本方法不保证返回的券信息顺序和入参的券号顺序相同
* </pre>
* @param partnerId
* @param codes 券号列表,支持 非码券/微信商家券/支付宝商家券
* @return 对券号列表去重后,成功查到的券信息列表
*/
public
List
<
CodeInfoQueryDto
>
queryCodesInfo
(
String
partnerId
,
Collection
<
String
>
codes
)
{
List
<
CodeInfoQueryDto
>
result
=
new
ArrayList
<>();
CodeInfoQueryReq
request
=
new
CodeInfoQueryReq
();
request
.
setPartnerId
(
partnerId
);
// 券码接口最大支持每次10个券号
Lists
.
partition
(
new
ArrayList
<>(
new
HashSet
<>(
codes
)),
10
).
forEach
(
subList
->
{
// 注意:如果改成并发调用,这里不能直接复用request
request
.
setCodes
(
subList
);
try
{
CouponBaseResponse
<
List
<
CodeInfoQueryDto
>>
resp
=
couponQueryClient
.
queryCodesInfo
(
request
);
if
(!
Objects
.
equals
(
SUCCESS_CODE
,
resp
.
getStatusCode
())
||
CollectionUtils
.
isEmpty
(
resp
.
getResult
()))
{
ApiLog
.
warnMessage
(
"优惠券信息查询失败:{} {}"
,
JSONObject
.
toJSONString
(
request
),
JSONObject
.
toJSONString
(
resp
));
return
;
}
result
.
addAll
(
resp
.
getResult
());
}
catch
(
Throwable
e
)
{
ApiLog
.
warnMessage
(
"优惠券信息查询异常:{} {}"
,
e
.
getMessage
(),
JSONObject
.
toJSONString
(
request
));
}
});
return
result
;
}
/**
* 指定一组券号,判断这些券号中是否存在已使用的券
* <pre></pre>
* @param partnerId
* @param couponCodes
* @return 如果有一张或多张券没查到、或已使用、或已部分使用、或已锁定,返回true
*/
public
boolean
isCouponUsed
(
String
partnerId
,
Collection
<
String
>
couponCodes
)
{
boolean
used
;
List
<
CodeInfoQueryDto
>
codeInfoQueryDtos
=
this
.
queryCodesInfo
(
partnerId
,
couponCodes
);
// 以下条件任意一个成立,说明券已使用:
// 1. 返回的数量和查询的不一致
// 2. 存在已使用或者部分使用的券状态
// 3. 存在锁定的券(剩余核销次数!=总核销次数)
used
=
couponCodes
.
size
()
!=
codeInfoQueryDtos
.
size
()
||
codeInfoQueryDtos
.
stream
().
anyMatch
(
o
->
{
return
CouponStatus
.
STATUS_1
.
getCode
().
equals
(
o
.
getState
())
||
CouponStatus
.
STATUS_2
.
getCode
().
equals
(
o
.
getState
())
||
!
Objects
.
equals
(
o
.
getMaxLeftAvailableTimes
(),
o
.
getCouponUseRule
().
getMaxRedeemTimes
());
});
return
used
;
}
}
order-management/src/main/java/cn/freemud/management/service/impl/SaleCouponOrderMangerServiceImpl.java
View file @
f2ea2732
...
...
@@ -73,6 +73,9 @@ public class SaleCouponOrderMangerServiceImpl extends SaasOrderMangerServiceImpl
@Autowired
private
CouponOnlineClient
couponOnlineClient
;
@Autowired
private
CouponQueryHandle
couponQueryHandle
;
@Value
(
"${coupon.partner.id:1983}"
)
private
String
couponPartnerId
;
...
...
@@ -93,6 +96,11 @@ public class SaleCouponOrderMangerServiceImpl extends SaasOrderMangerServiceImpl
.
map
(
OrderSettlementResp:
:
getExternalObjectId
)
.
collect
(
Collectors
.
toList
());
// 校验券状态是否已被使用
if
(
couponQueryHandle
.
isCouponUsed
(
request
.
getPartnerId
(),
couponCodes
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
SYSTEM_ERROR
.
getCode
(),
"作废优惠券失败,部分券已被使用。"
);
}
BatchCouponDiscardReq
discardReq
=
new
BatchCouponDiscardReq
();
discardReq
.
setCoupons
(
couponCodes
.
stream
().
map
(
code
->
{
return
new
BatchCouponDiscardReq
.
CouponInfo
(){{
...
...
order-management/src/main/java/cn/freemud/management/thirdparty/CouponQueryClient.java
0 → 100644
View file @
f2ea2732
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: CouponQueryClient
* @Package cn.freemud.service.thirdparty
* @Description:
* @author: song.cai
* @date: 2019/2/20 16:42
* @version V1.0
* @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/
package
cn
.
freemud
.
management
.
thirdparty
;
import
cn.freemud.management.entities.dto.request.coupon.CodeInfoQueryDto
;
import
cn.freemud.management.entities.dto.response.coupon.CouponBaseResponse
;
import
cn.freemud.management.thirdparty.request.coupon.CodeInfoQueryReq
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
java.util.List
;
@FeignClient
(
name
=
"OPEN-STORE-COUPON-QUERY-SERVICE"
,
url
=
"${saas.coupon-query-service.feign.url:}"
)
@RequestMapping
(
produces
=
{
"application/json;charset=UTF-8"
})
public
interface
CouponQueryClient
{
/**
* 查询券信息
* <pre></pre>
* @param request
* @return
*/
@PostMapping
(
"coupon/query/info"
)
CouponBaseResponse
<
List
<
CodeInfoQueryDto
>>
queryCodesInfo
(
CodeInfoQueryReq
request
);
}
order-management/src/main/java/cn/freemud/management/thirdparty/request/coupon/CodeInfoQueryReq.java
0 → 100644
View file @
f2ea2732
package
cn
.
freemud
.
management
.
thirdparty
.
request
.
coupon
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
/**
* © All rights Reserved, Designed By www.freemud.cn
*
* @author wénkǎi.zhāng 2023-05-30
* @since 1.0
*/
@Data
public
class
CodeInfoQueryReq
{
@ApiModelProperty
(
value
=
"商户号"
,
required
=
true
,
example
=
"1864"
)
private
String
partnerId
;
@ApiModelProperty
(
value
=
"券号列表,最多支持10张券,支持 非码券/微信商家券/支付宝商家券"
,
required
=
true
,
example
=
"[\"88600000001823678618\",\"88600000001823679226\"]"
)
private
List
<
String
>
codes
;
}
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