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
161e42b5
Commit
161e42b5
authored
Nov 09, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
替换sdk 旧接口/batchQueryActivityInfo 改成feign
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
a1a190f3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
128 additions
and
2 deletions
+128
-2
order-application-service/src/main/java/cn/freemud/entities/dto/coupon/CouponResponseDTO.java
+22
-0
order-application-service/src/main/java/cn/freemud/entities/dto/coupon/FastBatchQueryTemplateInfoRequest.java
+26
-0
order-application-service/src/main/java/cn/freemud/entities/dto/coupon/FastTemplateInfoResponseVO.java
+66
-0
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
+0
-0
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java
+14
-2
No files found.
order-application-service/src/main/java/cn/freemud/entities/dto/coupon/CouponResponseDTO.java
0 → 100644
View file @
161e42b5
package
cn
.
freemud
.
entities
.
dto
.
coupon
;
import
lombok.Data
;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2021/11/9 下午2:45
* @description :
*/
@Data
public
class
CouponResponseDTO
<
T
>
{
private
Integer
statusCode
;
/**
* 返回信息
*/
private
String
msg
;
private
T
result
;
}
order-application-service/src/main/java/cn/freemud/entities/dto/coupon/FastBatchQueryTemplateInfoRequest.java
0 → 100644
View file @
161e42b5
package
cn
.
freemud
.
entities
.
dto
.
coupon
;
import
lombok.Data
;
import
java.util.Set
;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2021/11/9 下午2:42
* @description :
*/
@Data
public
class
FastBatchQueryTemplateInfoRequest
{
/**
* 商户号
*/
private
String
partnerId
;
/**
* 模板编号列表
*/
private
Set
<
String
>
templateCode
;
private
String
trackingNo
;
}
order-application-service/src/main/java/cn/freemud/entities/dto/coupon/FastTemplateInfoResponseVO.java
0 → 100644
View file @
161e42b5
package
cn
.
freemud
.
entities
.
dto
.
coupon
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2021/11/9 下午2:43
* @description :
*/
@Data
public
class
FastTemplateInfoResponseVO
{
@ApiModelProperty
(
value
=
"模板编号"
,
required
=
true
)
private
String
templateCode
;
@ApiModelProperty
(
value
=
"模板名称"
,
required
=
true
)
private
String
templateName
;
@ApiModelProperty
(
value
=
"券类型:0 商品券 1 代金券 3 折扣券 4 换购券 5 配送券 6商品兑换券 7买M免N券"
,
required
=
true
)
private
Integer
type
;
@ApiModelProperty
(
"券子类型,目前只对商品券生效,0:白名单商品券,1:黑名单商品券"
)
private
Integer
subType
;
@ApiModelProperty
(
value
=
"固定有效期开始时间,格式YYYY-MM-DD HH:mm:ss"
,
required
=
true
)
private
Date
effectiveStartTime
;
@ApiModelProperty
(
value
=
"固定有效结束时间,格式YYYY-MM-DD HH:mm:ss"
,
required
=
true
)
private
Date
effectiveEndTime
;
@ApiModelProperty
(
value
=
"领券结束时间,格式YYYY-MM-DD HH:mm:ss"
,
required
=
true
)
private
Date
receiveEndTime
;
@ApiModelProperty
(
value
=
"领券开始时间,格式YYYY-MM-DD HH:mm:ss"
,
required
=
true
)
private
Date
receiveStartTime
;
@ApiModelProperty
(
value
=
"启用金额,单位:分"
,
required
=
true
)
private
Integer
minAmount
;
@ApiModelProperty
(
value
=
"券面值,折扣券时,10代表1折,65代表6.5折。其他券时单位为分,如100=1元"
,
required
=
true
)
private
Integer
faceValue
;
@ApiModelProperty
(
"固定时长有效期类型的券,领取后等待生效天数,0代表立即生效。"
)
private
Integer
fromDayEffective
;
@ApiModelProperty
(
"固定时长有效期类型的券,生效后几天内有效"
)
private
Integer
effectiveDays
;
@ApiModelProperty
(
"券图片"
)
private
String
logo
;
@ApiModelProperty
(
"券扩展类型"
)
private
Integer
extentType
;
@ApiModelProperty
(
"门店限制类型,当“门店或渠道限制类型”为“门店限制”时生效,当 1:所有门店,2:部分门店,3:发券指定门店"
)
private
Integer
storeLimitType
;
@ApiModelProperty
(
"门店或渠道限制类型,1:门店限制,2:渠道限制"
)
private
Integer
storeChannelLimitType
;
@ApiModelProperty
(
"活动状态:0未启用、 1启用、2开始、 3结束、 4暂停、5作废、6禁用"
)
private
Integer
status
;
}
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
View file @
161e42b5
This diff is collapsed.
Click to expand it.
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java
View file @
161e42b5
...
@@ -2,11 +2,11 @@ package cn.freemud.service.thirdparty;
...
@@ -2,11 +2,11 @@ package cn.freemud.service.thirdparty;
//import cn.freemud.constant.IgnoreFeignLogAnnotation;
//import cn.freemud.constant.IgnoreFeignLogAnnotation;
import
cn.freemud.annotations.LogIgnoreFeign
;
import
cn.freemud.annotations.LogIgnoreFeign
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.entities.dto.GetCouponDetailResponseDto
;
import
cn.freemud.entities.dto.GetCouponDetailResponseDto
;
import
cn.freemud.entities.dto.coupon.InvalidCouponsRequestDto
;
import
cn.freemud.entities.dto.coupon.*
;
import
cn.freemud.entities.dto.coupon.InvalidCouponsResponseDto
;
import
cn.freemud.interceptor.FormSupportConfig
;
import
cn.freemud.interceptor.FormSupportConfig
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
...
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
...
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
//@IgnoreFeignLogAnnotation
//@IgnoreFeignLogAnnotation
...
@@ -38,4 +39,15 @@ public interface CouponOnlineClient {
...
@@ -38,4 +39,15 @@ public interface CouponOnlineClient {
@LogIgnoreFeign
(
logMessage
=
"invalidCoupons"
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
,
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
)
@LogIgnoreFeign
(
logMessage
=
"invalidCoupons"
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
,
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
)
@PostMapping
(
value
=
"/coupon/state/invalid/coupons"
)
@PostMapping
(
value
=
"/coupon/state/invalid/coupons"
)
InvalidCouponsResponseDto
invalidCoupons
(
@RequestBody
InvalidCouponsRequestDto
invalidCouponsRequestDto
);
InvalidCouponsResponseDto
invalidCoupons
(
@RequestBody
InvalidCouponsRequestDto
invalidCouponsRequestDto
);
/**
* 新版 根据券模板查询 券基础信息数据
* @param request
* @return
*/
@LogIgnoreFeign
(
logMessage
=
"fastBatchQueryTemplateInfo"
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
,
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
)
@PostMapping
(
value
=
"/fastBatchQueryTemplateInfo"
)
CouponResponseDTO
<
List
<
FastTemplateInfoResponseVO
>>
fastBatchQueryTemplateInfo
(
@RequestBody
FastBatchQueryTemplateInfoRequest
request
);
}
}
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