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
e4f62a75
Commit
e4f62a75
authored
Apr 02, 2021
by
hanghang.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单配送类型
parent
e964f567
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
332 additions
and
78 deletions
+332
-78
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+0
-0
order-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java
+20
-0
order-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java
+96
-0
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
+5
-0
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+14
-0
order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java
+8
-8
order-application-service/src/main/java/cn/freemud/enums/PayStatus.java
+5
-5
order-application-service/src/main/java/cn/freemud/enums/RefundStatus.java
+1
-1
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
+37
-37
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java
+8
-7
shopping-cart-application-service/src/main/java/cn/freemud/annotations/IgnoreFeignLogAnnotation.java
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java
+19
-0
shopping-cart-application-service/src/main/java/cn/freemud/annotations/LogIgnore.java
+2
-2
shopping-cart-application-service/src/main/java/cn/freemud/aop/ControllerLogAop.java
+2
-2
shopping-cart-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java
+98
-0
shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
+1
-2
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
+7
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java
+1
-3
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/BigDataFeiginClient.java
+0
-3
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CalculationClient.java
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CardBinClient.java
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomScoreClient.java
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerApplicationClient.java
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StockClient.java
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StoreItemClient.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
e4f62a75
This diff is collapsed.
Click to expand it.
order-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java
0 → 100644
View file @
e4f62a75
package
cn
.
freemud
.
annotations
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Retention
(
RetentionPolicy
.
RUNTIME
)
public
@interface
IsConvertEN
{
//此字段用于区分具体服务。
//区分服务之后寻找对应服务的返回code枚举类
String
service
()
default
""
;
}
order-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java
0 → 100644
View file @
e4f62a75
package
cn
.
freemud
.
aop
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.enums.ResponseResult
;
import
com.alibaba.fastjson.JSON
;
import
com.freemud.application.sdk.api.base.SDKCommonBaseContextWare
;
import
com.freemud.application.sdk.api.exception.IgnoreErrorAnnotation
;
import
com.freemud.application.sdk.api.log.ApiLog
;
import
com.freemud.application.sdk.api.log.ErrorLog
;
import
com.freemud.application.sdk.api.log.LogParams
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.service.EmailAlertService
;
import
com.google.common.collect.Lists
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.aspectj.lang.JoinPoint
;
import
org.aspectj.lang.ProceedingJoinPoint
;
import
org.aspectj.lang.Signature
;
import
org.aspectj.lang.annotation.*
;
import
org.aspectj.lang.reflect.MethodSignature
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.core.Ordered
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
javax.servlet.http.HttpServletRequest
;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Parameter
;
import
java.util.*
;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Aspect
@Component
@Slf4j
public
class
IsConvertEnAspect
implements
Ordered
{
@Pointcut
(
"@annotation(cn.freemud.annotations.IsConvertEN)"
)
public
void
pointcut
()
{
}
@Around
(
"pointcut()"
)
public
Object
convertMessage
(
ProceedingJoinPoint
joinPoint
)
throws
Throwable
{
HttpServletRequest
request
=
currentRequest
();
String
language
=
request
.
getHeader
(
"lang"
);
BaseResponse
baseResponse
=
(
BaseResponse
)
joinPoint
.
proceed
();
//表示返回英文提示
if
(
"en-US"
.
equals
(
language
))
{
/**此处注释**/
String
enMessage
=
ResponseResult
.
getResponseResult
(
baseResponse
.
getCode
()).
getEnMessage
();
if
(!
StringUtils
.
isEmpty
(
enMessage
))
{
baseResponse
.
setMessage
(
enMessage
);
}
}
return
baseResponse
;
}
private
HttpServletRequest
currentRequest
()
{
ServletRequestAttributes
servletRequestAttributes
=
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
return
Optional
.
ofNullable
(
servletRequestAttributes
).
map
(
ServletRequestAttributes:
:
getRequest
).
orElse
(
null
);
}
/**
* 备用方法,避免code或者message信息不统一
* 过滤返参code是否在excludeStatusCodes存在
*
* @param excludeStatusCodes
* @param statusCodeValue
* @return
*/
private
boolean
containStatusCode
(
String
[]
excludeStatusCodes
,
String
statusCodeValue
)
{
if
(
excludeStatusCodes
==
null
||
excludeStatusCodes
.
length
==
0
)
{
return
false
;
}
for
(
int
i
=
0
;
i
<
excludeStatusCodes
.
length
;
i
++)
{
if
(
excludeStatusCodes
[
i
].
equals
(
statusCodeValue
))
{
return
true
;
}
}
return
false
;
}
@Override
public
int
getOrder
()
{
return
0
;
}
}
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
View file @
e4f62a75
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
*/
*/
package
cn
.
freemud
.
controller
;
package
cn
.
freemud
.
controller
;
import
cn.freemud.annotations.IsConvertEN
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.encircle.CreateReserveOrderVo
;
import
cn.freemud.entities.vo.encircle.CreateReserveOrderVo
;
...
@@ -68,6 +69,7 @@ public class OrderController {
...
@@ -68,6 +69,7 @@ public class OrderController {
/**
/**
* 创建订单
* 创建订单
*/
*/
@IsConvertEN
@ApiAnnotation
(
logMessage
=
"createOrder"
)
@ApiAnnotation
(
logMessage
=
"createOrder"
)
@PostMapping
(
"/createOrder"
)
@PostMapping
(
"/createOrder"
)
public
BaseResponse
createOrder
(
@Validated
@LogParams
@RequestBody
CreateOrderVo
createOrderVo
)
{
public
BaseResponse
createOrder
(
@Validated
@LogParams
@RequestBody
CreateOrderVo
createOrderVo
)
{
...
@@ -160,6 +162,7 @@ public class OrderController {
...
@@ -160,6 +162,7 @@ public class OrderController {
* @param queryOrderVo
* @param queryOrderVo
* @return
* @return
*/
*/
@IsConvertEN
@ApiAnnotation
(
logMessage
=
"previewOrderInfo"
)
@ApiAnnotation
(
logMessage
=
"previewOrderInfo"
)
@PostMapping
(
"/previewOrderInfo"
)
@PostMapping
(
"/previewOrderInfo"
)
public
BaseResponse
previewOrderInfo
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
){
public
BaseResponse
previewOrderInfo
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
){
...
@@ -176,6 +179,7 @@ public class OrderController {
...
@@ -176,6 +179,7 @@ public class OrderController {
* @param queryOrderVo
* @param queryOrderVo
* @return
* @return
*/
*/
@IsConvertEN
@ApiAnnotation
(
logMessage
=
"previewOrderInfoSvcCheck"
)
@ApiAnnotation
(
logMessage
=
"previewOrderInfoSvcCheck"
)
@PostMapping
(
"/previewOrderInfoSvcCheck"
)
@PostMapping
(
"/previewOrderInfoSvcCheck"
)
public
BaseResponse
previewOrderInfoSvcCheck
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
){
public
BaseResponse
previewOrderInfoSvcCheck
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
){
...
@@ -296,6 +300,7 @@ public class OrderController {
...
@@ -296,6 +300,7 @@ public class OrderController {
/**
/**
* 查询桌号是否开台
* 查询桌号是否开台
*/
*/
@IsConvertEN
@ApiAnnotation
(
logMessage
=
"queryTableNumberStatus"
)
@ApiAnnotation
(
logMessage
=
"queryTableNumberStatus"
)
@ApiOperation
(
value
=
"查询桌号是否开台"
,
notes
=
"查询桌号是否开台"
,
produces
=
"application/json"
)
@ApiOperation
(
value
=
"查询桌号是否开台"
,
notes
=
"查询桌号是否开台"
,
produces
=
"application/json"
)
@PostMapping
(
"/queryTableNumberStatus"
)
@PostMapping
(
"/queryTableNumberStatus"
)
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
e4f62a75
...
@@ -139,6 +139,10 @@ public class QueryOrderResponseVo {
...
@@ -139,6 +139,10 @@ public class QueryOrderResponseVo {
*/
*/
private
String
orderTypeDesc
;
private
String
orderTypeDesc
;
/**
/**
* 订单类型描述
*/
private
String
orderTypeDescEn
;
/**
* 订单状态 enum OrderStatus ,DeliverStatus=42 骑手取餐中
* 订单状态 enum OrderStatus ,DeliverStatus=42 骑手取餐中
*/
*/
private
Integer
orderStatus
;
private
Integer
orderStatus
;
...
@@ -211,6 +215,11 @@ public class QueryOrderResponseVo {
...
@@ -211,6 +215,11 @@ public class QueryOrderResponseVo {
* 付款方式 微信支付
* 付款方式 微信支付
*/
*/
private
String
orderPayType
;
private
String
orderPayType
;
/**
* 付款方式 微信支付
*/
private
String
orderPayTypeDescEn
;
/**
/**
* 收货地址id
* 收货地址id
*/
*/
...
@@ -241,6 +250,11 @@ public class QueryOrderResponseVo {
...
@@ -241,6 +250,11 @@ public class QueryOrderResponseVo {
private
String
refundStatusDesc
;
private
String
refundStatusDesc
;
/**
/**
* 退款状态描述
*/
private
String
refundStatusDescEn
;
/**
* 退款原因
* 退款原因
*/
*/
private
String
refundReason
;
private
String
refundReason
;
...
...
order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java
View file @
e4f62a75
...
@@ -14,14 +14,14 @@ package cn.freemud.enums;
...
@@ -14,14 +14,14 @@ package cn.freemud.enums;
public
enum
OrderStatus
{
public
enum
OrderStatus
{
TAKE_ORDER
(
1
,
"下单"
,
"
take
order"
),
TAKE_ORDER
(
1
,
"下单"
,
"
place an
order"
),
WAIT_PAY
(
2
,
"待支付"
,
"
wait pay
"
),
WAIT_PAY
(
2
,
"待支付"
,
"
To be paid
"
),
RECEIPT
(
3
,
"接单"
,
"
receipt order
"
),
RECEIPT
(
3
,
"接单"
,
"
Receiving orders
"
),
DISTRIBUTION
(
4
,
"配送中"
,
"
deliver
"
),
DISTRIBUTION
(
4
,
"配送中"
,
"
In delivery
"
),
COMPLETE
(
5
,
"完成"
,
"
c
omplete"
),
COMPLETE
(
5
,
"完成"
,
"
C
omplete"
),
CALCEL
(
6
,
"取消"
,
"
c
ancel"
),
CALCEL
(
6
,
"取消"
,
"
C
ancel"
),
REFUSE
(
7
,
"拒单"
,
"
refuse order
"
),
REFUSE
(
7
,
"拒单"
,
"
Refuse to accept orders
"
),
COMPLETE_MAKE
(
31
,
"制作完成"
,
"
complete make
"
);
COMPLETE_MAKE
(
31
,
"制作完成"
,
"
Production completed
"
);
private
Integer
code
;
private
Integer
code
;
private
String
desc
;
private
String
desc
;
...
...
order-application-service/src/main/java/cn/freemud/enums/PayStatus.java
View file @
e4f62a75
...
@@ -14,11 +14,11 @@ package cn.freemud.enums;
...
@@ -14,11 +14,11 @@ package cn.freemud.enums;
public
enum
PayStatus
{
public
enum
PayStatus
{
NOT_PAY
(
1
,
"未支付"
,
"
not pay
"
),
NOT_PAY
(
1
,
"未支付"
,
"
Unpaid
"
),
HAVE_PAID
(
2
,
"已支付"
,
"
have p
aid"
),
HAVE_PAID
(
2
,
"已支付"
,
"
P
aid"
),
HAVE_REFUND
(
3
,
"已退款"
,
"
have refun
d"
),
HAVE_REFUND
(
3
,
"已退款"
,
"
Refunde
d"
),
HAVE_PART_REFUND
(
4
,
"已经部分退款"
,
"
have part
refund"
),
HAVE_PART_REFUND
(
4
,
"已经部分退款"
,
"
Partial
refund"
),
COMPLETE
(
5
,
"完成"
,
"
c
omplete"
);
COMPLETE
(
5
,
"完成"
,
"
C
omplete"
);
private
Integer
code
;
private
Integer
code
;
...
...
order-application-service/src/main/java/cn/freemud/enums/RefundStatus.java
View file @
e4f62a75
...
@@ -14,7 +14,7 @@ package cn.freemud.enums;
...
@@ -14,7 +14,7 @@ package cn.freemud.enums;
public
enum
RefundStatus
{
public
enum
RefundStatus
{
APPLY_REFUND
(
1
,
"申请退款"
,
"
a
pply for a refund"
),
APPLY_REFUND
(
1
,
"申请退款"
,
"
A
pply for a refund"
),
AGREE_REFUND
(
2
,
"同意退款"
,
"Agree to refund"
),
AGREE_REFUND
(
2
,
"同意退款"
,
"Agree to refund"
),
ALREADY_REFUND
(
3
,
"已退货"
,
"Returned"
),
ALREADY_REFUND
(
3
,
"已退货"
,
"Returned"
),
COMPLETE_REFUND
(
4
,
"退款完成"
,
"Refund complete"
),
COMPLETE_REFUND
(
4
,
"退款完成"
,
"Refund complete"
),
...
...
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
View file @
e4f62a75
This diff is collapsed.
Click to expand it.
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java
View file @
e4f62a75
...
@@ -7,17 +7,18 @@ import lombok.Getter;
...
@@ -7,17 +7,18 @@ import lombok.Getter;
@AllArgsConstructor
@AllArgsConstructor
public
enum
PayChannelType
{
public
enum
PayChannelType
{
WECHAT
((
byte
)
1
,
"10211"
,
"微信"
),
WECHAT
((
byte
)
1
,
"10211"
,
"微信"
,
"wechat"
),
ALIPAY
((
byte
)
2
,
"10300"
,
"支付宝"
),
ALIPAY
((
byte
)
2
,
"10300"
,
"支付宝"
,
"alipay"
),
SVC
((
byte
)
3
,
"10102"
,
"储值卡"
),
SVC
((
byte
)
3
,
"10102"
,
"储值卡"
,
"svc"
),
COMB
((
byte
)
4
,
"10212"
,
"混合支付"
),
COMB
((
byte
)
4
,
"10212"
,
"混合支付"
,
"comb"
),
USVCP
((
byte
)
5
,
"10556"
,
"电子风味卡支付"
),
USVCP
((
byte
)
5
,
"10556"
,
"电子风味卡支付"
,
"usvcp"
),
ZERO
((
byte
)
6
,
"100000"
,
"0元支付"
),
ZERO
((
byte
)
6
,
"100000"
,
"0元支付"
,
"zero"
),
TIKTOKPAY
((
byte
)
7
,
"10066"
,
"抖音支付"
);
TIKTOKPAY
((
byte
)
7
,
"10066"
,
"抖音支付"
,
"tiktokpay"
);
private
Byte
index
;
private
Byte
index
;
private
String
ebcode
;
private
String
ebcode
;
private
String
name
;
private
String
name
;
private
String
nameEn
;
public
static
final
String
API_DESC
=
"订单支付渠道类型 1:微信 2:储值卡 3:支付宝 4:混合支付,5:电子风味卡支付"
;
public
static
final
String
API_DESC
=
"订单支付渠道类型 1:微信 2:储值卡 3:支付宝 4:混合支付,5:电子风味卡支付"
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/a
op
/IgnoreFeignLogAnnotation.java
→
shopping-cart-application-service/src/main/java/cn/freemud/a
nnotations
/IgnoreFeignLogAnnotation.java
View file @
e4f62a75
package
cn
.
freemud
.
a
op
;
package
cn
.
freemud
.
a
nnotations
;
import
java.lang.annotation.*
;
import
java.lang.annotation.*
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java
0 → 100644
View file @
e4f62a75
package
cn
.
freemud
.
annotations
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Retention
(
RetentionPolicy
.
RUNTIME
)
public
@interface
IsConvertEN
{
//传入服务名,用于区分枚举类
String
service
()
default
""
;
}
shopping-cart-application-service/src/main/java/cn/freemud/a
op
/LogIgnore.java
→
shopping-cart-application-service/src/main/java/cn/freemud/a
nnotations
/LogIgnore.java
View file @
e4f62a75
package
cn
.
freemud
.
a
op
;
package
cn
.
freemud
.
a
nnotations
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.RetentionPolicy
;
/**
/**
* @author
* @author
wanghanghang
*/
*/
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Retention
(
RetentionPolicy
.
RUNTIME
)
...
...
shopping-cart-application-service/src/main/java/cn/freemud/aop/ControllerLogAop.java
View file @
e4f62a75
package
cn
.
freemud
.
aop
;
package
cn
.
freemud
.
aop
;
import
cn.freemud.annotations.LogIgnore
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.freemud.application.sdk.api.base.SDKCommonBaseContextWare
;
import
com.freemud.application.sdk.api.base.SDKCommonBaseContextWare
;
import
com.freemud.application.sdk.api.exception.IgnoreErrorAnnotation
;
import
com.freemud.application.sdk.api.exception.IgnoreErrorAnnotation
;
...
@@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletRequest;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Parameter
;
import
java.lang.reflect.Parameter
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.UUID
;
import
java.util.UUID
;
...
@@ -53,7 +53,7 @@ public class ControllerLogAop implements Ordered {
...
@@ -53,7 +53,7 @@ public class ControllerLogAop implements Ordered {
@Value
(
"${exclude-print-body-log-methods:findNearPickUpStores,getMenuCategory}"
)
@Value
(
"${exclude-print-body-log-methods:findNearPickUpStores,getMenuCategory}"
)
private
volatile
List
<
String
>
excludePrintBodyLogMethods
=
Lists
.
newArrayList
();
private
volatile
List
<
String
>
excludePrintBodyLogMethods
=
Lists
.
newArrayList
();
@Pointcut
(
"@annotation(cn.freemud.a
op
.LogIgnore)"
)
@Pointcut
(
"@annotation(cn.freemud.a
nnotations
.LogIgnore)"
)
public
void
pointcut
()
{
public
void
pointcut
()
{
}
}
...
...
shopping-cart-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java
0 → 100644
View file @
e4f62a75
package
cn
.
freemud
.
aop
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.enums.ResponseResult
;
import
lombok.extern.slf4j.Slf4j
;
import
org.aspectj.lang.ProceedingJoinPoint
;
import
org.aspectj.lang.annotation.Around
;
import
org.aspectj.lang.annotation.Aspect
;
import
org.aspectj.lang.annotation.Pointcut
;
import
org.springframework.core.Ordered
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.Optional
;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Aspect
@Component
@Slf4j
public
class
IsConvertEnAspect
implements
Ordered
{
@Pointcut
(
"@annotation(cn.freemud.annotations.IsConvertEN)"
)
public
void
pointcut
()
{
}
@Around
(
"pointcut()"
)
public
Object
convertMessage
(
ProceedingJoinPoint
joinPoint
)
throws
Throwable
{
HttpServletRequest
request
=
currentRequest
();
String
language
=
request
.
getHeader
(
"lang"
);
BaseResponse
baseResponse
=
(
BaseResponse
)
joinPoint
.
proceed
();
//表示返回英文提示 本次变更3个提示 手动直接转换
if
(
"en-US"
.
equals
(
language
))
{
switch
(
baseResponse
.
getCode
())
{
case
"44013"
:
//购物车商品有变动,请手动刷新再修改
baseResponse
.
setMessage
(
"Shopping cart items have changed, please refresh and modify manually"
);
break
;
case
"44014"
:
//没有绑定桌号,无法加入购物车
baseResponse
.
setMessage
(
"There is no binding table number, unable to join the shopping cart"
);
break
;
case
"44003"
:
//添加购物车失败
baseResponse
.
setMessage
(
"Failed to add shopping cart"
);
break
;
case
"43005"
:
//门店商品校验失败
baseResponse
.
setMessage
(
"Store product verification failed"
);
break
;
case
"43003"
:
//门店商品信息不存在
baseResponse
.
setMessage
(
"Store product information does not exist"
);
break
;
}
}
return
baseResponse
;
}
private
HttpServletRequest
currentRequest
()
{
ServletRequestAttributes
servletRequestAttributes
=
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
return
Optional
.
ofNullable
(
servletRequestAttributes
).
map
(
ServletRequestAttributes:
:
getRequest
).
orElse
(
null
);
}
/**
* 备用方法,避免code或者message信息不统一
* 过滤返参code是否在excludeStatusCodes存在
*
* @param excludeStatusCodes
* @param statusCodeValue
* @return
*/
private
boolean
containStatusCode
(
String
[]
excludeStatusCodes
,
String
statusCodeValue
)
{
if
(
excludeStatusCodes
==
null
||
excludeStatusCodes
.
length
==
0
)
{
return
false
;
}
for
(
int
i
=
0
;
i
<
excludeStatusCodes
.
length
;
i
++)
{
if
(
excludeStatusCodes
[
i
].
equals
(
statusCodeValue
))
{
return
true
;
}
}
return
false
;
}
@Override
public
int
getOrder
()
{
return
0
;
}
}
shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
View file @
e4f62a75
package
cn
.
freemud
.
aop
;
package
cn
.
freemud
.
aop
;
import
cn.freemud.annotations.IgnoreFeignLogAnnotation
;
import
cn.freemud.constant.CommonRedisKeyConstant
;
import
cn.freemud.constant.CommonRedisKeyConstant
;
import
cn.freemud.entities.vo.ThirdPartLogVo
;
import
cn.freemud.entities.vo.ThirdPartLogVo
;
import
cn.freemud.enums.CommonResponseResult
;
import
cn.freemud.enums.CommonResponseResult
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
View file @
e4f62a75
...
@@ -12,12 +12,11 @@
...
@@ -12,12 +12,11 @@
*/
*/
package
cn
.
freemud
.
controller
;
package
cn
.
freemud
.
controller
;
import
cn.freemud.a
op
.LogIgnore
;
import
cn.freemud.a
nnotations
.LogIgnore
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.enums.ResponseResult
;
import
cn.freemud.enums.ResponseResult
;
import
cn.freemud.service.impl.ShoppingCartCollageServiceImpl
;
import
cn.freemud.service.impl.ShoppingCartCollageServiceImpl
;
import
cn.freemud.service.impl.ShoppingCartMallServiceImpl
;
import
cn.freemud.utils.ResponseUtil
;
import
cn.freemud.utils.ResponseUtil
;
import
com.freemud.application.sdk.api.base.SDKCommonBaseContextWare
;
import
com.freemud.application.sdk.api.base.SDKCommonBaseContextWare
;
import
com.freemud.application.sdk.api.log.ApiAnnotation
;
import
com.freemud.application.sdk.api.log.ApiAnnotation
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
View file @
e4f62a75
...
@@ -12,7 +12,8 @@
...
@@ -12,7 +12,8 @@
*/
*/
package
cn
.
freemud
.
controller
;
package
cn
.
freemud
.
controller
;
import
cn.freemud.aop.LogIgnore
;
import
cn.freemud.annotations.IsConvertEN
;
import
cn.freemud.annotations.LogIgnore
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.entities.dto.GetMemberInfoRequestDto
;
import
cn.freemud.entities.dto.GetMemberInfoRequestDto
;
...
@@ -67,6 +68,7 @@ public class ShoppingCartController {
...
@@ -67,6 +68,7 @@ public class ShoppingCartController {
/**
/**
* 向购物车中添加商品
* 向购物车中添加商品
*/
*/
@IsConvertEN
@PostMapping
(
value
=
"/addGoods"
)
@PostMapping
(
value
=
"/addGoods"
)
@LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"addGoods"
)
@LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"addGoods"
)
public
BaseResponse
addGoods
(
@Validated
@LogParams
@RequestBody
AddShoppingCartGoodsRequestVo
request
)
{
public
BaseResponse
addGoods
(
@Validated
@LogParams
@RequestBody
AddShoppingCartGoodsRequestVo
request
)
{
...
@@ -76,6 +78,7 @@ public class ShoppingCartController {
...
@@ -76,6 +78,7 @@ public class ShoppingCartController {
/**
/**
* 修改购物车中商品数量
* 修改购物车中商品数量
*/
*/
@IsConvertEN
@PostMapping
(
value
=
"/updateGoodsQty"
)
@PostMapping
(
value
=
"/updateGoodsQty"
)
@LogIgnore
(
logMessage
=
"updateGoodsQty"
)
@LogIgnore
(
logMessage
=
"updateGoodsQty"
)
public
BaseResponse
updateGoodsQty
(
@Validated
@LogParams
@RequestBody
UpdateShoppingCartGoodsQtyRequestVo
request
)
{
public
BaseResponse
updateGoodsQty
(
@Validated
@LogParams
@RequestBody
UpdateShoppingCartGoodsQtyRequestVo
request
)
{
...
@@ -85,6 +88,7 @@ public class ShoppingCartController {
...
@@ -85,6 +88,7 @@ public class ShoppingCartController {
/**
/**
* 查询购物车信息
* 查询购物车信息
*/
*/
@IsConvertEN
@PostMapping
(
value
=
"/listCartGoods"
)
@PostMapping
(
value
=
"/listCartGoods"
)
@LogIgnore
(
logMessage
=
"listCartGoods"
)
@LogIgnore
(
logMessage
=
"listCartGoods"
)
public
BaseResponse
listCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
public
BaseResponse
listCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
...
@@ -112,6 +116,7 @@ public class ShoppingCartController {
...
@@ -112,6 +116,7 @@ public class ShoppingCartController {
/**
/**
* 清空购物车
* 清空购物车
*/
*/
@IsConvertEN
@PostMapping
(
value
=
"/clearCartGoods"
)
@PostMapping
(
value
=
"/clearCartGoods"
)
@LogIgnore
(
logMessage
=
"clearCartGoods"
)
@LogIgnore
(
logMessage
=
"clearCartGoods"
)
public
BaseResponse
clearCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartClearRequestVo
request
)
{
public
BaseResponse
clearCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartClearRequestVo
request
)
{
...
@@ -133,6 +138,7 @@ public class ShoppingCartController {
...
@@ -133,6 +138,7 @@ public class ShoppingCartController {
* @param getShoppingCartGoodsApportionRequestVo
* @param getShoppingCartGoodsApportionRequestVo
* @return
* @return
*/
*/
@IsConvertEN
@PostMapping
(
value
=
"/getShoppingCartGoodsApportion"
)
@PostMapping
(
value
=
"/getShoppingCartGoodsApportion"
)
@LogIgnore
(
logMessage
=
"getShoppingCartGoodsApportion"
)
@LogIgnore
(
logMessage
=
"getShoppingCartGoodsApportion"
)
public
BaseResponse
getShoppingCartGoodsApportion
(
@Validated
@LogParams
@RequestBody
GetShoppingCartGoodsApportionRequestVo
getShoppingCartGoodsApportionRequestVo
)
{
public
BaseResponse
getShoppingCartGoodsApportion
(
@Validated
@LogParams
@RequestBody
GetShoppingCartGoodsApportionRequestVo
getShoppingCartGoodsApportionRequestVo
)
{
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java
View file @
e4f62a75
...
@@ -12,13 +12,11 @@
...
@@ -12,13 +12,11 @@
*/
*/
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.a
op
.IgnoreFeignLogAnnotation
;
import
cn.freemud.a
nnotations
.IgnoreFeignLogAnnotation
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.entities.dto.*
;
import
cn.freemud.entities.dto.*
;
import
cn.freemud.entities.dto.activity.ActivityQueryResponseDto
;
import
cn.freemud.entities.dto.activity.ActivityQueryResponseDto
;
import
com.freemud.application.sdk.api.base.BaseResponse
;
import
com.freemud.application.sdk.api.promotioncenter.response.CalculationDiscountResponseDTO
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/BigDataFeiginClient.java
View file @
e4f62a75
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.aop.IgnoreFeignLogAnnotation
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.entities.dto.BuryingPointBigDto
;
import
cn.freemud.entities.dto.BuryingPointBigDto
;
import
cn.freemud.entities.dto.BuryingPointResDto
;
import
cn.freemud.entities.dto.BuryingPointResDto
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CalculationClient.java
View file @
e4f62a75
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.a
op
.IgnoreFeignLogAnnotation
;
import
cn.freemud.a
nnotations
.IgnoreFeignLogAnnotation
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.entities.dto.calculate.CalculationSharingDiscountRequestDto
;
import
cn.freemud.entities.dto.calculate.CalculationSharingDiscountRequestDto
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CardBinClient.java
View file @
e4f62a75
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.a
op
.IgnoreFeignLogAnnotation
;
import
cn.freemud.a
nnotations
.IgnoreFeignLogAnnotation
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto
;
import
cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomScoreClient.java
View file @
e4f62a75
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.a
op
.IgnoreFeignLogAnnotation
;
import
cn.freemud.a
nnotations
.IgnoreFeignLogAnnotation
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.entities.dto.user.GetUserScoreUseDetailRequest
;
import
cn.freemud.entities.dto.user.GetUserScoreUseDetailRequest
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerApplicationClient.java
View file @
e4f62a75
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.a
op
.IgnoreFeignLogAnnotation
;
import
cn.freemud.a
nnotations
.IgnoreFeignLogAnnotation
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.entities.dto.GetPaidRuleRequestDto
;
import
cn.freemud.entities.dto.GetPaidRuleRequestDto
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StockClient.java
View file @
e4f62a75
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
*/
*/
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.a
op
.IgnoreFeignLogAnnotation
;
import
cn.freemud.a
nnotations
.IgnoreFeignLogAnnotation
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StoreItemClient.java
View file @
e4f62a75
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
*/
*/
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.a
op
.IgnoreFeignLogAnnotation
;
import
cn.freemud.a
nnotations
.IgnoreFeignLogAnnotation
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.entities.dto.*
;
import
cn.freemud.entities.dto.*
;
...
...
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