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
73c7ee60
Commit
73c7ee60
authored
Jul 07, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LogIgnore换ApiAnnotation注解
parent
81097277
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
76 deletions
+54
-76
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
+34
-36
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
+7
-14
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
+13
-26
No files found.
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
View file @
73c7ee60
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
package
cn
.
freemud
.
controller
;
package
cn
.
freemud
.
controller
;
import
cn.freemud.annotations.IsConvertEN
;
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.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.encircle.CreateReserveOrderVo
;
import
cn.freemud.entities.vo.encircle.CreateReserveOrderVo
;
...
@@ -64,7 +63,7 @@ public class OrderController {
...
@@ -64,7 +63,7 @@ public class OrderController {
/**
/**
* 创建订单之前校验前面排队的订单数
* 创建订单之前校验前面排队的订单数
*/
*/
@
LogIgnore
(
logMessage
=
"checkBeforeCreateOrder"
)
@
ApiAnnotation
(
logMessage
=
"checkBeforeCreateOrder"
)
@PostMapping
(
"/checkBeforeCreateOrder"
)
@PostMapping
(
"/checkBeforeCreateOrder"
)
public
BaseResponse
checkBeforeCreateOrder
(
@Validated
@LogParams
@RequestBody
CheckBeforeCreateOrderRequestVo
checkBeforeCreateOrderRequestVo
)
{
public
BaseResponse
checkBeforeCreateOrder
(
@Validated
@LogParams
@RequestBody
CheckBeforeCreateOrderRequestVo
checkBeforeCreateOrderRequestVo
)
{
long
start
=
System
.
currentTimeMillis
();
long
start
=
System
.
currentTimeMillis
();
...
@@ -81,7 +80,7 @@ public class OrderController {
...
@@ -81,7 +80,7 @@ public class OrderController {
* 创建订单
* 创建订单
*/
*/
@IsConvertEN
@IsConvertEN
@
LogIgnore
(
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
)
{
return
orderAdapterService
.
createOrderNew
(
createOrderVo
);
return
orderAdapterService
.
createOrderNew
(
createOrderVo
);
...
@@ -90,7 +89,7 @@ public class OrderController {
...
@@ -90,7 +89,7 @@ public class OrderController {
/**
/**
* 通用创建订单
* 通用创建订单
*/
*/
@
LogIgnore
(
logMessage
=
"createOrderUniversal"
)
@
ApiAnnotation
(
logMessage
=
"createOrderUniversal"
)
@PostMapping
(
"/createOrderUniversal"
)
@PostMapping
(
"/createOrderUniversal"
)
public
BaseResponse
createOrderUniversal
(
@Validated
@LogParams
@RequestBody
Map
<
String
,
Object
>
param
)
{
public
BaseResponse
createOrderUniversal
(
@Validated
@LogParams
@RequestBody
Map
<
String
,
Object
>
param
)
{
return
orderAdapterService
.
createOrderUniversal
(
param
);
return
orderAdapterService
.
createOrderUniversal
(
param
);
...
@@ -99,7 +98,7 @@ public class OrderController {
...
@@ -99,7 +98,7 @@ public class OrderController {
/**
/**
* 扫脸支付下单
* 扫脸支付下单
*/
*/
@
LogIgnore
(
logMessage
=
"scanFaceCreateOrder"
)
@
ApiAnnotation
(
logMessage
=
"scanFaceCreateOrder"
)
@PostMapping
(
"/scanFaceCreateOrder"
)
@PostMapping
(
"/scanFaceCreateOrder"
)
public
BaseResponse
scanFaceCreateOrder
(
@Validated
@LogParams
@RequestBody
CreateOrderVo
createOrderVo
)
{
public
BaseResponse
scanFaceCreateOrder
(
@Validated
@LogParams
@RequestBody
CreateOrderVo
createOrderVo
)
{
return
orderservice
.
scanFaceCreateOrder
(
createOrderVo
);
return
orderservice
.
scanFaceCreateOrder
(
createOrderVo
);
...
@@ -108,7 +107,7 @@ public class OrderController {
...
@@ -108,7 +107,7 @@ public class OrderController {
/**
/**
* APP下单,下单带商品信息,不经过购物车服务,不唤起支付
* APP下单,下单带商品信息,不经过购物车服务,不唤起支付
*/
*/
@
LogIgnore
(
logMessage
=
"appCreateOrder"
)
@
ApiAnnotation
(
logMessage
=
"appCreateOrder"
)
@PostMapping
(
"/app/create"
)
@PostMapping
(
"/app/create"
)
public
BaseResponse
appCreateOrder
(
@Validated
@LogParams
@RequestBody
AppCreateOrderVo
createOrderVo
,
BindingResult
bindingResult
)
{
public
BaseResponse
appCreateOrder
(
@Validated
@LogParams
@RequestBody
AppCreateOrderVo
createOrderVo
,
BindingResult
bindingResult
)
{
return
orderAdapterService
.
appCreateOrder
(
createOrderVo
);
return
orderAdapterService
.
appCreateOrder
(
createOrderVo
);
...
@@ -117,7 +116,7 @@ public class OrderController {
...
@@ -117,7 +116,7 @@ public class OrderController {
/**
/**
* 订单支付成功后通知
* 订单支付成功后通知
*/
*/
@
LogIgnore
(
logMessage
=
"paySuccessCallback"
)
@
ApiAnnotation
(
logMessage
=
"paySuccessCallback"
)
@PostMapping
(
"/paySuccessCallback"
)
@PostMapping
(
"/paySuccessCallback"
)
public
String
paySuccessCallback
(
@LogParams
@RequestBody
PaysuccessNoticeMessage
message
)
{
public
String
paySuccessCallback
(
@LogParams
@RequestBody
PaysuccessNoticeMessage
message
)
{
return
orderAdapterService
.
paySuccessCallback
(
message
);
return
orderAdapterService
.
paySuccessCallback
(
message
);
...
@@ -126,7 +125,7 @@ public class OrderController {
...
@@ -126,7 +125,7 @@ public class OrderController {
/**
/**
* 订单支付成功后通知
* 订单支付成功后通知
*/
*/
@
LogIgnore
(
logMessage
=
"newPaySuccessCallback"
)
@
ApiAnnotation
(
logMessage
=
"newPaySuccessCallback"
)
@PostMapping
({
"/newPaySuccessCallback"
,
"/openStoreQueryPaymentCallback"
})
@PostMapping
({
"/newPaySuccessCallback"
,
"/openStoreQueryPaymentCallback"
})
public
String
newPaySuccessCallback
(
@LogParams
@RequestBody
NewPaysuccessNoticeMessage
message
)
{
public
String
newPaySuccessCallback
(
@LogParams
@RequestBody
NewPaysuccessNoticeMessage
message
)
{
return
orderservice
.
newPaySuccessCallback
(
message
);
return
orderservice
.
newPaySuccessCallback
(
message
);
...
@@ -135,7 +134,7 @@ public class OrderController {
...
@@ -135,7 +134,7 @@ public class OrderController {
/**
/**
* 退款回掉通知
* 退款回掉通知
*/
*/
@
LogIgnore
(
logMessage
=
"refundNotifyCallback"
)
@
ApiAnnotation
(
logMessage
=
"refundNotifyCallback"
)
@PostMapping
(
"/refundNotifyCallback"
)
@PostMapping
(
"/refundNotifyCallback"
)
public
String
refundNotifyCallback
(
@LogParams
@RequestBody
RefundNotifyCallbackRequestVo
requestVo
)
{
public
String
refundNotifyCallback
(
@LogParams
@RequestBody
RefundNotifyCallbackRequestVo
requestVo
)
{
return
orderservice
.
refundNotifyCallback
(
requestVo
);
return
orderservice
.
refundNotifyCallback
(
requestVo
);
...
@@ -146,9 +145,8 @@ public class OrderController {
...
@@ -146,9 +145,8 @@ public class OrderController {
/**
/**
* 查询订单列表
* 查询订单列表
*/
*/
// @ApiAnnotation(logMessage = "queryOrders")
@PostMapping
(
"/queryOrders"
)
@PostMapping
(
"/queryOrders"
)
@
LogIgnore
(
logMessage
=
"queryOrders"
)
@
ApiAnnotation
(
logMessage
=
"queryOrders"
)
public
BaseResponse
queryOrders
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
)
{
public
BaseResponse
queryOrders
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
)
{
return
orderservice
.
queryOrders
(
queryOrderVo
);
return
orderservice
.
queryOrders
(
queryOrderVo
);
}
}
...
@@ -159,7 +157,7 @@ public class OrderController {
...
@@ -159,7 +157,7 @@ public class OrderController {
* @return
* @return
*/
*/
@IsConvertEN
@IsConvertEN
@
LogIgnore
(
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
){
CreateReserveOrderVo
createReserveOrderVo
=
new
CreateReserveOrderVo
();
CreateReserveOrderVo
createReserveOrderVo
=
new
CreateReserveOrderVo
();
...
@@ -176,7 +174,7 @@ public class OrderController {
...
@@ -176,7 +174,7 @@ public class OrderController {
* @return
* @return
*/
*/
@IsConvertEN
@IsConvertEN
@
LogIgnore
(
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
){
CreateReserveOrderVo
createReserveOrderVo
=
new
CreateReserveOrderVo
();
CreateReserveOrderVo
createReserveOrderVo
=
new
CreateReserveOrderVo
();
...
@@ -192,7 +190,7 @@ public class OrderController {
...
@@ -192,7 +190,7 @@ public class OrderController {
/**
/**
* 获取订单详情
* 获取订单详情
*/
*/
@
LogIgnore
(
logMessage
=
"queryOrderById"
)
@
ApiAnnotation
(
logMessage
=
"queryOrderById"
)
@PostMapping
(
"/queryOrderById"
)
@PostMapping
(
"/queryOrderById"
)
public
BaseResponse
queryOrderById
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
)
{
public
BaseResponse
queryOrderById
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
)
{
return
orderservice
.
queryOrderById
(
queryOrderVo
.
getOperation
(),
queryOrderVo
.
getSessionId
(),
queryOrderVo
.
getOid
(),
queryOrderVo
.
getPartnerId
(),
queryOrderVo
.
getChannelType
());
return
orderservice
.
queryOrderById
(
queryOrderVo
.
getOperation
(),
queryOrderVo
.
getSessionId
(),
queryOrderVo
.
getOid
(),
queryOrderVo
.
getPartnerId
(),
queryOrderVo
.
getChannelType
());
...
@@ -202,7 +200,7 @@ public class OrderController {
...
@@ -202,7 +200,7 @@ public class OrderController {
/**
/**
* 取消支付订单
* 取消支付订单
*/
*/
@
LogIgnore
(
logMessage
=
"cancelPayOrder"
)
@
ApiAnnotation
(
logMessage
=
"cancelPayOrder"
)
@PostMapping
(
"/cancelPayOrder"
)
@PostMapping
(
"/cancelPayOrder"
)
public
BaseResponse
cancelPayOrder
(
@Validated
@LogParams
@RequestBody
DeleteOrderVo
deleteOrderVo
)
{
public
BaseResponse
cancelPayOrder
(
@Validated
@LogParams
@RequestBody
DeleteOrderVo
deleteOrderVo
)
{
return
orderservice
.
cancelPayOrder
(
deleteOrderVo
);
return
orderservice
.
cancelPayOrder
(
deleteOrderVo
);
...
@@ -211,7 +209,7 @@ public class OrderController {
...
@@ -211,7 +209,7 @@ public class OrderController {
/**
/**
* 取消支付删除订单
* 取消支付删除订单
*/
*/
@
LogIgnore
(
logMessage
=
"deleteOrder"
)
@
ApiAnnotation
(
logMessage
=
"deleteOrder"
)
@PostMapping
(
"/deleteOrder"
)
@PostMapping
(
"/deleteOrder"
)
public
BaseResponse
deleteOrder
(
@Validated
@LogParams
@RequestBody
DeleteOrderVo
deleteOrderVo
)
{
public
BaseResponse
deleteOrder
(
@Validated
@LogParams
@RequestBody
DeleteOrderVo
deleteOrderVo
)
{
return
orderservice
.
deleteOrder
(
deleteOrderVo
);
return
orderservice
.
deleteOrder
(
deleteOrderVo
);
...
@@ -220,7 +218,7 @@ public class OrderController {
...
@@ -220,7 +218,7 @@ public class OrderController {
/**
/**
* 取消支付删除订单
* 取消支付删除订单
*/
*/
@
LogIgnore
(
logMessage
=
"deleteOrderById"
)
@
ApiAnnotation
(
logMessage
=
"deleteOrderById"
)
@PostMapping
(
"/deleteOrderById"
)
@PostMapping
(
"/deleteOrderById"
)
public
BaseResponse
deleteOrderById
(
@Validated
@LogParams
@RequestBody
DeleteOrderVo
deleteOrderVo
)
{
public
BaseResponse
deleteOrderById
(
@Validated
@LogParams
@RequestBody
DeleteOrderVo
deleteOrderVo
)
{
//return orderservice.deleteOrderById(deleteOrderVo);
//return orderservice.deleteOrderById(deleteOrderVo);
...
@@ -230,7 +228,7 @@ public class OrderController {
...
@@ -230,7 +228,7 @@ public class OrderController {
/**
/**
* 用户申请退款
* 用户申请退款
*/
*/
@
LogIgnore
(
logMessage
=
"refund"
)
@
ApiAnnotation
(
logMessage
=
"refund"
)
@PostMapping
(
"/refund"
)
@PostMapping
(
"/refund"
)
public
BaseResponse
refund
(
@Validated
@LogParams
@RequestBody
OrderRefundVo
orderRefundVo
)
{
public
BaseResponse
refund
(
@Validated
@LogParams
@RequestBody
OrderRefundVo
orderRefundVo
)
{
return
orderservice
.
orderRefund
(
orderRefundVo
);
return
orderservice
.
orderRefund
(
orderRefundVo
);
...
@@ -239,7 +237,7 @@ public class OrderController {
...
@@ -239,7 +237,7 @@ public class OrderController {
/**
/**
* 获取订单排队号
* 获取订单排队号
*/
*/
@
LogIgnore
(
logMessage
=
"queueIndex"
)
@
ApiAnnotation
(
logMessage
=
"queueIndex"
)
@PostMapping
(
"/queueIndex"
)
@PostMapping
(
"/queueIndex"
)
public
BaseResponse
getOrderQueueIndex
(
@Validated
@LogParams
@RequestBody
QueryOrderQueueIndexVo
queryOrderQueueIndexVo
)
{
public
BaseResponse
getOrderQueueIndex
(
@Validated
@LogParams
@RequestBody
QueryOrderQueueIndexVo
queryOrderQueueIndexVo
)
{
return
orderservice
.
queryOrderQueueIndex
(
queryOrderQueueIndexVo
);
return
orderservice
.
queryOrderQueueIndex
(
queryOrderQueueIndexVo
);
...
@@ -249,7 +247,7 @@ public class OrderController {
...
@@ -249,7 +247,7 @@ public class OrderController {
/**
/**
* 获取申请退款理由 1.9后作废
* 获取申请退款理由 1.9后作废
*/
*/
@
LogIgnore
(
logMessage
=
"getOrderRefundReason"
)
@
ApiAnnotation
(
logMessage
=
"getOrderRefundReason"
)
@ApiOperation
(
value
=
"获取申请退款理由"
,
notes
=
"获取申请退款理由"
,
produces
=
"application/json"
)
@ApiOperation
(
value
=
"获取申请退款理由"
,
notes
=
"获取申请退款理由"
,
produces
=
"application/json"
)
@PostMapping
(
"/getOrderRefundReason"
)
@PostMapping
(
"/getOrderRefundReason"
)
public
BaseResponse
getRefundReason
(
@LogParams
@RequestBody
GetRefundReasonVo
getRefundReasonVo
)
{
public
BaseResponse
getRefundReason
(
@LogParams
@RequestBody
GetRefundReasonVo
getRefundReasonVo
)
{
...
@@ -259,7 +257,7 @@ public class OrderController {
...
@@ -259,7 +257,7 @@ public class OrderController {
/**
/**
* 获取申请退款理由
* 获取申请退款理由
*/
*/
@
LogIgnore
(
logMessage
=
"getNewOrderRefundReason"
)
@
ApiAnnotation
(
logMessage
=
"getNewOrderRefundReason"
)
@ApiOperation
(
value
=
"获取申请退款理由"
,
notes
=
"获取申请退款理由"
,
produces
=
"application/json"
)
@ApiOperation
(
value
=
"获取申请退款理由"
,
notes
=
"获取申请退款理由"
,
produces
=
"application/json"
)
@PostMapping
(
"/getNewOrderRefundReason"
)
@PostMapping
(
"/getNewOrderRefundReason"
)
public
BaseResponse
getNewRefundReason
(
@LogParams
@RequestBody
GetRefundReasonVo
getRefundReasonVo
)
{
public
BaseResponse
getNewRefundReason
(
@LogParams
@RequestBody
GetRefundReasonVo
getRefundReasonVo
)
{
...
@@ -270,7 +268,7 @@ public class OrderController {
...
@@ -270,7 +268,7 @@ public class OrderController {
* 查询桌号是否开台
* 查询桌号是否开台
*/
*/
@IsConvertEN
@IsConvertEN
@
LogIgnore
(
logMessage
=
"queryTableNumberStatus"
)
@
ApiAnnotation
(
logMessage
=
"queryTableNumberStatus"
)
@ApiOperation
(
value
=
"查询桌号是否开台"
,
notes
=
"查询桌号是否开台"
,
produces
=
"application/json"
)
@ApiOperation
(
value
=
"查询桌号是否开台"
,
notes
=
"查询桌号是否开台"
,
produces
=
"application/json"
)
@PostMapping
(
"/queryTableNumberStatus"
)
@PostMapping
(
"/queryTableNumberStatus"
)
public
BaseResponse
queryTableNumberStatus
(
@LogParams
@RequestBody
EncircleReserveBaseVo
encircleReserveBaseVo
)
{
public
BaseResponse
queryTableNumberStatus
(
@LogParams
@RequestBody
EncircleReserveBaseVo
encircleReserveBaseVo
)
{
...
@@ -280,7 +278,7 @@ public class OrderController {
...
@@ -280,7 +278,7 @@ public class OrderController {
/**
/**
* 查询30分钟未支付的优惠券订单
* 查询30分钟未支付的优惠券订单
*/
*/
@
LogIgnore
(
logMessage
=
"queryOrderWithCoupon"
)
@
ApiAnnotation
(
logMessage
=
"queryOrderWithCoupon"
)
@ApiOperation
(
value
=
"查询30分钟未支付的优惠券订单"
,
notes
=
"查询30分钟未支付的优惠券订单"
,
produces
=
"application/json"
)
@ApiOperation
(
value
=
"查询30分钟未支付的优惠券订单"
,
notes
=
"查询30分钟未支付的优惠券订单"
,
produces
=
"application/json"
)
@PostMapping
(
"/queryOrderWithCoupon"
)
@PostMapping
(
"/queryOrderWithCoupon"
)
public
BaseResponse
queryOrderWithCoupon
(
@LogParams
@RequestBody
QueryOrderWithCouponVo
orderWithCouponVo
)
{
public
BaseResponse
queryOrderWithCoupon
(
@LogParams
@RequestBody
QueryOrderWithCouponVo
orderWithCouponVo
)
{
...
@@ -290,7 +288,7 @@ public class OrderController {
...
@@ -290,7 +288,7 @@ public class OrderController {
/**
/**
* 订单确认完成
* 订单确认完成
*/
*/
@
LogIgnore
(
logMessage
=
"affirm"
)
@
ApiAnnotation
(
logMessage
=
"affirm"
)
@PostMapping
(
"/affirm"
)
@PostMapping
(
"/affirm"
)
public
BaseResponse
orderAffirm
(
@Validated
@LogParams
@RequestBody
OrderAffirmRequestVO
request
)
{
public
BaseResponse
orderAffirm
(
@Validated
@LogParams
@RequestBody
OrderAffirmRequestVO
request
)
{
return
mallOrderService
.
orderAffirm
(
request
);
return
mallOrderService
.
orderAffirm
(
request
);
...
@@ -299,14 +297,14 @@ public class OrderController {
...
@@ -299,14 +297,14 @@ public class OrderController {
/**
/**
* 创建预支付
* 创建预支付
*/
*/
@
LogIgnore
(
logMessage
=
"createPrepay"
)
@
ApiAnnotation
(
logMessage
=
"createPrepay"
)
@PostMapping
(
"/createPrepay"
)
@PostMapping
(
"/createPrepay"
)
public
BaseResponse
createPrepay
(
@Validated
@LogParams
@RequestBody
CreatePrepayVo
request
)
{
public
BaseResponse
createPrepay
(
@Validated
@LogParams
@RequestBody
CreatePrepayVo
request
)
{
return
orderAdapterService
.
createPrepay
(
request
);
return
orderAdapterService
.
createPrepay
(
request
);
}
}
@ApiOperation
(
value
=
"创建积分订单"
,
notes
=
"创建积分订单"
,
produces
=
"application/json"
)
@ApiOperation
(
value
=
"创建积分订单"
,
notes
=
"创建积分订单"
,
produces
=
"application/json"
)
@
LogIgnore
(
logMessage
=
"createIntegralOrder"
)
@
ApiAnnotation
(
logMessage
=
"createIntegralOrder"
)
@PostMapping
(
"/createIntegralOrder"
)
@PostMapping
(
"/createIntegralOrder"
)
public
BaseResponse
createIntegralOrder
(
@Validated
@LogParams
@RequestBody
IntegralOrderVo
request
)
{
public
BaseResponse
createIntegralOrder
(
@Validated
@LogParams
@RequestBody
IntegralOrderVo
request
)
{
return
orderservice
.
createIntegralOrder
(
request
);
return
orderservice
.
createIntegralOrder
(
request
);
...
@@ -315,7 +313,7 @@ public class OrderController {
...
@@ -315,7 +313,7 @@ public class OrderController {
/**
/**
* 查询用户积分订单列表
* 查询用户积分订单列表
*/
*/
@
LogIgnore
(
logMessage
=
"queryOrderByConditions"
)
@
ApiAnnotation
(
logMessage
=
"queryOrderByConditions"
)
@PostMapping
(
"/queryOrderByConditions"
)
@PostMapping
(
"/queryOrderByConditions"
)
public
BaseResponse
queryOrderByConditions
(
@Validated
@LogParams
@RequestBody
QueryOrderByConditionsRequestVo
queryOrderByConditionsRequestVo
)
{
public
BaseResponse
queryOrderByConditions
(
@Validated
@LogParams
@RequestBody
QueryOrderByConditionsRequestVo
queryOrderByConditionsRequestVo
)
{
return
orderservice
.
queryOrderByConditions
(
queryOrderByConditionsRequestVo
);
return
orderservice
.
queryOrderByConditions
(
queryOrderByConditionsRequestVo
);
...
@@ -326,7 +324,7 @@ public class OrderController {
...
@@ -326,7 +324,7 @@ public class OrderController {
* @param timeOutOrderVo
* @param timeOutOrderVo
* @return
* @return
*/
*/
@
LogIgnore
(
logMessage
=
"timeOutOrderRefund"
)
@
ApiAnnotation
(
logMessage
=
"timeOutOrderRefund"
)
@PostMapping
(
"/timeOutOrderRefund"
)
@PostMapping
(
"/timeOutOrderRefund"
)
public
BaseResponse
timeOutOrderRefund
(
@Validated
@LogParams
@RequestBody
TimeOutOrderVo
timeOutOrderVo
){
public
BaseResponse
timeOutOrderRefund
(
@Validated
@LogParams
@RequestBody
TimeOutOrderVo
timeOutOrderVo
){
return
orderservice
.
timeOutOrderRefund
(
timeOutOrderVo
);
return
orderservice
.
timeOutOrderRefund
(
timeOutOrderVo
);
...
@@ -336,7 +334,7 @@ public class OrderController {
...
@@ -336,7 +334,7 @@ public class OrderController {
* @param requestVo
* @param requestVo
* @return
* @return
*/
*/
@
LogIgnore
(
logMessage
=
"queryOrderRider"
)
@
ApiAnnotation
(
logMessage
=
"queryOrderRider"
)
@PostMapping
(
"/queryOrderRider"
)
@PostMapping
(
"/queryOrderRider"
)
public
BaseResponse
queryOrderRider
(
@Validated
@LogParams
@RequestBody
OrderRiderRequestVo
requestVo
){
public
BaseResponse
queryOrderRider
(
@Validated
@LogParams
@RequestBody
OrderRiderRequestVo
requestVo
){
return
orderservice
.
queryOrderRider
(
requestVo
);
return
orderservice
.
queryOrderRider
(
requestVo
);
...
@@ -346,7 +344,7 @@ public class OrderController {
...
@@ -346,7 +344,7 @@ public class OrderController {
/**
/**
* 统计商户当日订单数
* 统计商户当日订单数
*/
*/
@
LogIgnore
(
logMessage
=
"queryTodayOrders"
)
@
ApiAnnotation
(
logMessage
=
"queryTodayOrders"
)
@PostMapping
(
"/queryTodayOrders"
)
@PostMapping
(
"/queryTodayOrders"
)
public
BaseResponse
queryTodayOrders
(
@Validated
@LogParams
@RequestBody
QueryOrderByConditionsRequestVo
queryOrderByConditionsRequestVo
)
{
public
BaseResponse
queryTodayOrders
(
@Validated
@LogParams
@RequestBody
QueryOrderByConditionsRequestVo
queryOrderByConditionsRequestVo
)
{
return
orderservice
.
queryTodayOrders
(
queryOrderByConditionsRequestVo
);
return
orderservice
.
queryTodayOrders
(
queryOrderByConditionsRequestVo
);
...
@@ -355,7 +353,7 @@ public class OrderController {
...
@@ -355,7 +353,7 @@ public class OrderController {
/**
/**
* 订单确认收货
* 订单确认收货
*/
*/
@
LogIgnore
(
logMessage
=
"receive"
)
@
ApiAnnotation
(
logMessage
=
"receive"
)
@PostMapping
(
"/receive"
)
@PostMapping
(
"/receive"
)
public
BaseResponse
orderReceive
(
@Validated
@LogParams
@RequestBody
OrderReceiveRequestVO
request
)
{
public
BaseResponse
orderReceive
(
@Validated
@LogParams
@RequestBody
OrderReceiveRequestVO
request
)
{
return
mallOrderService
.
orderReceive
(
request
);
return
mallOrderService
.
orderReceive
(
request
);
...
@@ -364,7 +362,7 @@ public class OrderController {
...
@@ -364,7 +362,7 @@ public class OrderController {
/**
/**
* 退货快递信息
* 退货快递信息
*/
*/
@
LogIgnore
(
logMessage
=
"refundExpress"
)
@
ApiAnnotation
(
logMessage
=
"refundExpress"
)
@PostMapping
(
"/refundExpress"
)
@PostMapping
(
"/refundExpress"
)
public
BaseResponse
refundExpress
(
@Validated
@LogParams
@RequestBody
EditAfterSalesExpressVo
editAfterSalesExpressVo
)
{
public
BaseResponse
refundExpress
(
@Validated
@LogParams
@RequestBody
EditAfterSalesExpressVo
editAfterSalesExpressVo
)
{
return
mallOrderService
.
saveAfterSalesExpress
(
editAfterSalesExpressVo
);
return
mallOrderService
.
saveAfterSalesExpress
(
editAfterSalesExpressVo
);
...
@@ -373,7 +371,7 @@ public class OrderController {
...
@@ -373,7 +371,7 @@ public class OrderController {
/**
/**
* 拼团失败批量退款
* 拼团失败批量退款
*/
*/
@
LogIgnore
(
logMessage
=
"spellGroupBatchRefund"
)
@
ApiAnnotation
(
logMessage
=
"spellGroupBatchRefund"
)
@PostMapping
(
"/spellGroupFailRefund"
)
@PostMapping
(
"/spellGroupFailRefund"
)
public
BaseResponse
spellGroupFailRefund
(
@Validated
@LogParams
@RequestBody
SpellGroupFailRefundVo
refundVo
)
{
public
BaseResponse
spellGroupFailRefund
(
@Validated
@LogParams
@RequestBody
SpellGroupFailRefundVo
refundVo
)
{
return
orderservice
.
spellGroupOrderFailRefund
(
refundVo
);
return
orderservice
.
spellGroupOrderFailRefund
(
refundVo
);
...
@@ -382,7 +380,7 @@ public class OrderController {
...
@@ -382,7 +380,7 @@ public class OrderController {
/**
/**
* 积分兑换记录查询(农工商)
* 积分兑换记录查询(农工商)
*/
*/
@
LogIgnore
(
logMessage
=
"scoreRecord"
)
@
ApiAnnotation
(
logMessage
=
"scoreRecord"
)
@PostMapping
(
"/scoreRecord"
)
@PostMapping
(
"/scoreRecord"
)
public
BaseResponse
scoreRecord
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
)
{
public
BaseResponse
scoreRecord
(
@Validated
@LogParams
@RequestBody
QueryOrderVo
queryOrderVo
)
{
return
orderservice
.
scoreRecord
(
queryOrderVo
);
return
orderservice
.
scoreRecord
(
queryOrderVo
);
...
@@ -394,7 +392,7 @@ public class OrderController {
...
@@ -394,7 +392,7 @@ public class OrderController {
* @param
* @param
* @return
* @return
*/
*/
@
LogIgnore
(
logMessage
=
"reportSendOrderCount"
)
@
ApiAnnotation
(
logMessage
=
"reportSendOrderCount"
)
@GetMapping
(
"/reportSendOrderCount"
)
@GetMapping
(
"/reportSendOrderCount"
)
public
BaseResponse
reportSendOrderCount
()
throws
Exception
{
public
BaseResponse
reportSendOrderCount
()
throws
Exception
{
AppLogUtil
.
infoLog
(
"触发订单上报"
,
null
,
null
);
AppLogUtil
.
infoLog
(
"触发订单上报"
,
null
,
null
);
...
@@ -406,7 +404,7 @@ public class OrderController {
...
@@ -406,7 +404,7 @@ public class OrderController {
/**
/**
* TLS定时器 每天凌晨 上报昨天 门店支付记录 到 门店服务去
* TLS定时器 每天凌晨 上报昨天 门店支付记录 到 门店服务去
*/
*/
@
LogIgnore
(
logMessage
=
"sendYesterDayStoreMsg"
)
@
ApiAnnotation
(
logMessage
=
"sendYesterDayStoreMsg"
)
@GetMapping
(
"/sendYesterDayStoreMsg"
)
@GetMapping
(
"/sendYesterDayStoreMsg"
)
public
BaseResponse
sendYesterDayStoreMsg
()
{
public
BaseResponse
sendYesterDayStoreMsg
()
{
orderReportJobHandler
.
sendYesterDayStoreMsg
();
orderReportJobHandler
.
sendYesterDayStoreMsg
();
...
...
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
View file @
73c7ee60
...
@@ -38,9 +38,8 @@ public class ShoppingCartCollageController {
...
@@ -38,9 +38,8 @@ public class ShoppingCartCollageController {
/**
/**
* 向拼单购物车中添加商品
* 向拼单购物车中添加商品
*/
*/
@ApiAnnotation
@PostMapping
(
value
=
"/addGoods"
)
@PostMapping
(
value
=
"/addGoods"
)
@
LogIgnore
(
logMessage
=
"addGoods"
)
@
ApiAnnotation
(
logMessage
=
"addGoods"
)
public
BaseResponse
addGoods
(
@Validated
@LogParams
@RequestBody
AddShoppingCartGoodsRequestVo
request
)
{
public
BaseResponse
addGoods
(
@Validated
@LogParams
@RequestBody
AddShoppingCartGoodsRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
addGoods
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
addGoods
(
request
);
}
}
...
@@ -48,8 +47,7 @@ public class ShoppingCartCollageController {
...
@@ -48,8 +47,7 @@ public class ShoppingCartCollageController {
/**
/**
* 修改拼单购物车中商品数量
* 修改拼单购物车中商品数量
*/
*/
@ApiAnnotation
@ApiAnnotation
(
logMessage
=
"updateGoodsQty"
)
@LogIgnore
(
logMessage
=
"updateGoodsQty"
)
@PostMapping
(
value
=
"/updateGoodsQty"
)
@PostMapping
(
value
=
"/updateGoodsQty"
)
public
BaseResponse
updateGoodsQty
(
@Validated
@LogParams
@RequestBody
UpdateShoppingCartGoodsQtyRequestVo
request
)
{
public
BaseResponse
updateGoodsQty
(
@Validated
@LogParams
@RequestBody
UpdateShoppingCartGoodsQtyRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
updateGoodsQty
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
updateGoodsQty
(
request
);
...
@@ -58,8 +56,7 @@ public class ShoppingCartCollageController {
...
@@ -58,8 +56,7 @@ public class ShoppingCartCollageController {
/**
/**
* 查询购物车信息
* 查询购物车信息
*/
*/
@ApiAnnotation
@ApiAnnotation
(
logMessage
=
"listCartGoods"
)
@LogIgnore
(
logMessage
=
"listCartGoods"
)
@PostMapping
(
value
=
"/listCartGoods"
)
@PostMapping
(
value
=
"/listCartGoods"
)
public
BaseResponse
listCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
public
BaseResponse
listCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
getGoodsList
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
getGoodsList
(
request
);
...
@@ -68,8 +65,7 @@ public class ShoppingCartCollageController {
...
@@ -68,8 +65,7 @@ public class ShoppingCartCollageController {
/**
/**
* 清空自己的购物车
* 清空自己的购物车
*/
*/
@ApiAnnotation
@ApiAnnotation
(
logMessage
=
"clearPartCartGoods"
)
@LogIgnore
(
logMessage
=
"clearPartCartGoods"
)
@PostMapping
(
value
=
"/clearPartCartGoods"
)
@PostMapping
(
value
=
"/clearPartCartGoods"
)
public
BaseResponse
clearPartCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartCollageClearRequestVo
request
)
{
public
BaseResponse
clearPartCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartCollageClearRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
clearPartCarGoods
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
clearPartCarGoods
(
request
);
...
@@ -78,8 +74,7 @@ public class ShoppingCartCollageController {
...
@@ -78,8 +74,7 @@ public class ShoppingCartCollageController {
/**
/**
* 清空购物车
* 清空购物车
*/
*/
@ApiAnnotation
@ApiAnnotation
(
logMessage
=
"clearCartGoods"
)
@LogIgnore
(
logMessage
=
"clearCartGoods"
)
@PostMapping
(
value
=
"/clearCartGoods"
)
@PostMapping
(
value
=
"/clearCartGoods"
)
public
BaseResponse
clearCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartClearRequestVo
request
)
{
public
BaseResponse
clearCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartClearRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
clear
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
clear
(
request
);
...
@@ -91,8 +86,7 @@ public class ShoppingCartCollageController {
...
@@ -91,8 +86,7 @@ public class ShoppingCartCollageController {
* @param getShoppingCartGoodsApportionRequestVo
* @param getShoppingCartGoodsApportionRequestVo
* @return
* @return
*/
*/
@ApiAnnotation
@ApiAnnotation
(
logMessage
=
"getShoppingCartGoodsApportion"
)
@LogIgnore
(
logMessage
=
"getShoppingCartGoodsApportion"
)
@PostMapping
(
value
=
"/getShoppingCartGoodsApportion"
)
@PostMapping
(
value
=
"/getShoppingCartGoodsApportion"
)
public
BaseResponse
getShoppingCartGoodsApportion
(
@Validated
@LogParams
@RequestBody
GetShoppingCartGoodsApportionRequestVo
getShoppingCartGoodsApportionRequestVo
)
{
public
BaseResponse
getShoppingCartGoodsApportion
(
@Validated
@LogParams
@RequestBody
GetShoppingCartGoodsApportionRequestVo
getShoppingCartGoodsApportionRequestVo
)
{
if
(
getShoppingCartGoodsApportionRequestVo
==
null
||
getShoppingCartGoodsApportionRequestVo
.
getShoppingCartInfoRequestVo
()
==
null
)
{
if
(
getShoppingCartGoodsApportionRequestVo
==
null
||
getShoppingCartGoodsApportionRequestVo
.
getShoppingCartInfoRequestVo
()
==
null
)
{
...
@@ -116,8 +110,7 @@ public class ShoppingCartCollageController {
...
@@ -116,8 +110,7 @@ public class ShoppingCartCollageController {
* 查询购车信息无配送费
* 查询购车信息无配送费
* SVC卡支付check,check购物车金额加配送费小于储值卡金额
* SVC卡支付check,check购物车金额加配送费小于储值卡金额
*/
*/
@ApiAnnotation
@ApiAnnotation
(
logMessage
=
"listCartGoodsCheck"
)
@LogIgnore
(
logMessage
=
"listCartGoodsCheck"
)
@PostMapping
(
value
=
"/listCartGoodsCheck"
)
@PostMapping
(
value
=
"/listCartGoodsCheck"
)
public
BaseResponse
listCartGoodsCheck
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
public
BaseResponse
listCartGoodsCheck
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
getGoodsListCheck
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
getGoodsListCheck
(
request
);
...
...
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
View file @
73c7ee60
...
@@ -76,9 +76,8 @@ public class ShoppingCartController {
...
@@ -76,9 +76,8 @@ public class ShoppingCartController {
/**
/**
* 从微信卡券向购物车中添加商品
* 从微信卡券向购物车中添加商品
*/
*/
@ApiAnnotation
@PostMapping
(
value
=
"/addGoodsByCard"
)
@PostMapping
(
value
=
"/addGoodsByCard"
)
@
LogIgnore
(
logMessage
=
"addGoodsByCard"
)
@
ApiAnnotation
(
logMessage
=
"addGoodsByCard"
)
public
BaseResponse
addGoodsByCard
(
@Validated
@LogParams
@RequestBody
AddGoodsByWeixinCardRequestVo
request
)
{
public
BaseResponse
addGoodsByCard
(
@Validated
@LogParams
@RequestBody
AddGoodsByWeixinCardRequestVo
request
)
{
return
getInstanceByRequest
(
request
).
addGoodsByCard
(
request
);
return
getInstanceByRequest
(
request
).
addGoodsByCard
(
request
);
}
}
...
@@ -86,10 +85,9 @@ public class ShoppingCartController {
...
@@ -86,10 +85,9 @@ public class ShoppingCartController {
/**
/**
* 向购物车中添加商品
* 向购物车中添加商品
*/
*/
@ApiAnnotation
@IsConvertEN
@IsConvertEN
@PostMapping
(
value
=
"/addGoods"
)
@PostMapping
(
value
=
"/addGoods"
)
@
LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"addGoods"
)
@
ApiAnnotation
(
logMessage
=
"addGoods"
)
public
BaseResponse
addGoods
(
@Validated
@LogParams
@RequestBody
AddShoppingCartGoodsRequestVo
request
)
{
public
BaseResponse
addGoods
(
@Validated
@LogParams
@RequestBody
AddShoppingCartGoodsRequestVo
request
)
{
ShoppingCartNewService
instanceByRequest
=
getInstanceByRequest
(
request
);
ShoppingCartNewService
instanceByRequest
=
getInstanceByRequest
(
request
);
if
(
instanceByRequest
instanceof
ShoppingCartNewServiceImpl
&&
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
newShoppingCartGray
(
request
.
getPartnerId
(),
request
.
getShopId
())){
if
(
instanceByRequest
instanceof
ShoppingCartNewServiceImpl
&&
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
newShoppingCartGray
(
request
.
getPartnerId
(),
request
.
getShopId
())){
...
@@ -103,10 +101,9 @@ public class ShoppingCartController {
...
@@ -103,10 +101,9 @@ public class ShoppingCartController {
/**
/**
* 修改购物车中商品数量
* 修改购物车中商品数量
*/
*/
@ApiAnnotation
@IsConvertEN
@IsConvertEN
@PostMapping
(
value
=
"/updateGoodsQty"
)
@PostMapping
(
value
=
"/updateGoodsQty"
)
@
LogIgnore
(
logMessage
=
"updateGoodsQty"
)
@
ApiAnnotation
(
logMessage
=
"updateGoodsQty"
)
public
BaseResponse
updateGoodsQty
(
@Validated
@LogParams
@RequestBody
UpdateShoppingCartGoodsQtyRequestVo
request
)
{
public
BaseResponse
updateGoodsQty
(
@Validated
@LogParams
@RequestBody
UpdateShoppingCartGoodsQtyRequestVo
request
)
{
ShoppingCartNewService
instanceByRequest
=
getInstanceByRequest
(
request
);
ShoppingCartNewService
instanceByRequest
=
getInstanceByRequest
(
request
);
if
(
instanceByRequest
instanceof
ShoppingCartNewServiceImpl
&&
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
newShoppingCartGray
(
request
.
getPartnerId
(),
request
.
getShopId
())){
if
(
instanceByRequest
instanceof
ShoppingCartNewServiceImpl
&&
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
newShoppingCartGray
(
request
.
getPartnerId
(),
request
.
getShopId
())){
...
@@ -120,10 +117,9 @@ public class ShoppingCartController {
...
@@ -120,10 +117,9 @@ public class ShoppingCartController {
/**
/**
* 查询购物车信息
* 查询购物车信息
*/
*/
@ApiAnnotation
@IsConvertEN
@IsConvertEN
@PostMapping
(
value
=
"/listCartGoods"
)
@PostMapping
(
value
=
"/listCartGoods"
)
@
LogIgnore
(
logMessage
=
"listCartGoods"
)
@
ApiAnnotation
(
logMessage
=
"listCartGoods"
)
public
BaseResponse
listCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
public
BaseResponse
listCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
// 代金券 & 折扣券互斥校验
// 代金券 & 折扣券互斥校验
BaseResponse
baseResponse
=
verifyCouponCodes
(
request
.
getCouponCodes
());
BaseResponse
baseResponse
=
verifyCouponCodes
(
request
.
getCouponCodes
());
...
@@ -143,9 +139,8 @@ public class ShoppingCartController {
...
@@ -143,9 +139,8 @@ public class ShoppingCartController {
* 查询购车信息无配送费
* 查询购车信息无配送费
* SVC卡支付check,check购物车金额加配送费小于储值卡金额
* SVC卡支付check,check购物车金额加配送费小于储值卡金额
*/
*/
@ApiAnnotation
@PostMapping
(
value
=
"/listCartGoodsCheck"
)
@PostMapping
(
value
=
"/listCartGoodsCheck"
)
@
LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"listCartGoodsCheck"
)
@
ApiAnnotation
(
logMessage
=
"listCartGoodsCheck"
)
public
BaseResponse
listCartGoodsCheck
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
public
BaseResponse
listCartGoodsCheck
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
// 代金券 & 折扣券互斥校验
// 代金券 & 折扣券互斥校验
BaseResponse
baseResponse
=
verifyCouponCodes
(
request
.
getCouponCodes
());
BaseResponse
baseResponse
=
verifyCouponCodes
(
request
.
getCouponCodes
());
...
@@ -166,10 +161,9 @@ public class ShoppingCartController {
...
@@ -166,10 +161,9 @@ public class ShoppingCartController {
/**
/**
* 清空购物车
* 清空购物车
*/
*/
@ApiAnnotation
@IsConvertEN
@IsConvertEN
@PostMapping
(
value
=
"/clearCartGoods"
)
@PostMapping
(
value
=
"/clearCartGoods"
)
@
LogIgnore
(
logMessage
=
"clearCartGoods"
)
@
ApiAnnotation
(
logMessage
=
"clearCartGoods"
)
public
BaseResponse
clearCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartClearRequestVo
request
)
{
public
BaseResponse
clearCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartClearRequestVo
request
)
{
String
sessionId
=
request
.
getSessionId
();
String
sessionId
=
request
.
getSessionId
();
if
(
StringUtils
.
isEmpty
(
sessionId
))
{
if
(
StringUtils
.
isEmpty
(
sessionId
))
{
...
@@ -188,10 +182,9 @@ public class ShoppingCartController {
...
@@ -188,10 +182,9 @@ public class ShoppingCartController {
* @param getShoppingCartGoodsApportionRequestVo
* @param getShoppingCartGoodsApportionRequestVo
* @return
* @return
*/
*/
@ApiAnnotation
@IsConvertEN
@IsConvertEN
@PostMapping
(
value
=
"/getShoppingCartGoodsApportion"
)
@PostMapping
(
value
=
"/getShoppingCartGoodsApportion"
)
@
LogIgnore
(
logMessage
=
"getShoppingCartGoodsApportion"
)
@
ApiAnnotation
(
logMessage
=
"getShoppingCartGoodsApportion"
)
public
BaseResponse
getShoppingCartGoodsApportion
(
@Validated
@LogParams
@RequestBody
GetShoppingCartGoodsApportionRequestVo
getShoppingCartGoodsApportionRequestVo
)
{
public
BaseResponse
getShoppingCartGoodsApportion
(
@Validated
@LogParams
@RequestBody
GetShoppingCartGoodsApportionRequestVo
getShoppingCartGoodsApportionRequestVo
)
{
if
(
getShoppingCartGoodsApportionRequestVo
==
null
||
getShoppingCartGoodsApportionRequestVo
.
getShoppingCartInfoRequestVo
()
==
null
)
{
if
(
getShoppingCartGoodsApportionRequestVo
==
null
||
getShoppingCartGoodsApportionRequestVo
.
getShoppingCartInfoRequestVo
()
==
null
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
...
@@ -246,9 +239,8 @@ public class ShoppingCartController {
...
@@ -246,9 +239,8 @@ public class ShoppingCartController {
/**
/**
* 线下订单查询接口
* 线下订单查询接口
*/
*/
@ApiAnnotation
@PostMapping
(
value
=
"/getMemberInfo"
)
@PostMapping
(
value
=
"/getMemberInfo"
)
@
LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"/getMemberInfo"
)
@
ApiAnnotation
(
logMessage
=
"/getMemberInfo"
)
public
BaseResponse
getMemberInfo
(
@LogParams
@RequestBody
GetMemberInfoRequestDto
request
)
{
public
BaseResponse
getMemberInfo
(
@LogParams
@RequestBody
GetMemberInfoRequestDto
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
getMemberInfo
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
getMemberInfo
(
request
);
}
}
...
@@ -256,9 +248,8 @@ public class ShoppingCartController {
...
@@ -256,9 +248,8 @@ public class ShoppingCartController {
/**
/**
* 结算页获取是否展示订单那备注配置
* 结算页获取是否展示订单那备注配置
*/
*/
@ApiAnnotation
@PostMapping
(
value
=
"/getOpenStoreIappWxappConfig"
)
@PostMapping
(
value
=
"/getOpenStoreIappWxappConfig"
)
@
LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"/getOpenStoreIappWxappConfig"
)
@
ApiAnnotation
(
logMessage
=
"/getOpenStoreIappWxappConfig"
)
public
BaseResponse
getOpenStoreIappWxappConfig
(
@LogParams
@RequestBody
OpenStoreIappWxappConfigRequestVo
request
)
{
public
BaseResponse
getOpenStoreIappWxappConfig
(
@LogParams
@RequestBody
OpenStoreIappWxappConfigRequestVo
request
)
{
return
openStoreIappWxappConfigService
.
getOpenStoreIappWxappConfig
(
request
);
return
openStoreIappWxappConfigService
.
getOpenStoreIappWxappConfig
(
request
);
}
}
...
@@ -266,18 +257,16 @@ public class ShoppingCartController {
...
@@ -266,18 +257,16 @@ public class ShoppingCartController {
/**
/**
* 结算页获取加价购活动商品列表
* 结算页获取加价购活动商品列表
*/
*/
@ApiAnnotation
@PostMapping
(
value
=
"/premiumExchange"
)
@PostMapping
(
value
=
"/premiumExchange"
)
@
LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"/premiumExchange"
)
@
ApiAnnotation
(
logMessage
=
"/premiumExchange"
)
public
BaseResponse
premiumExchange
(
@LogParams
@RequestBody
@Validated
PremiumExchangeRequestVo
request
)
{
public
BaseResponse
premiumExchange
(
@LogParams
@RequestBody
@Validated
PremiumExchangeRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
premiumExchange
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
premiumExchange
(
request
);
}
}
/**
/**
* 券码查询购物车商品信息(平台结算页可用券列表用)
* 券码查询购物车商品信息(平台结算页可用券列表用)
*/
*/
@ApiAnnotation
@PostMapping
(
value
=
"/getCartInfoByUser"
)
@PostMapping
(
value
=
"/getCartInfoByUser"
)
@
LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"/getCartInfoByUser"
)
@
ApiAnnotation
(
logMessage
=
"/getCartInfoByUser"
)
public
BaseResponse
getCartInfoByUser
(
@LogParams
@RequestBody
@Validated
CouponAvailableRequestVo
request
)
{
public
BaseResponse
getCartInfoByUser
(
@LogParams
@RequestBody
@Validated
CouponAvailableRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
getCartInfoByUser
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
getCartInfoByUser
(
request
);
}
}
...
@@ -286,9 +275,8 @@ public class ShoppingCartController {
...
@@ -286,9 +275,8 @@ public class ShoppingCartController {
* 【C端服务端】批量一键加购
* 【C端服务端】批量一键加购
* 替换老门店的商品到切换的门店下
* 替换老门店的商品到切换的门店下
*/
*/
@ApiAnnotation
@PostMapping
(
value
=
"/replaceGoodsByShop"
)
@PostMapping
(
value
=
"/replaceGoodsByShop"
)
@
LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"/replaceGoodsByShop"
)
@
ApiAnnotation
(
logMessage
=
"/replaceGoodsByShop"
)
public
BaseResponse
replaceGoodsByShop
(
@LogParams
@RequestBody
@Validated
ShopGoodsReplaceVo
request
)
{
public
BaseResponse
replaceGoodsByShop
(
@LogParams
@RequestBody
@Validated
ShopGoodsReplaceVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
replaceGoodsByShop
(
request
);
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
replaceGoodsByShop
(
request
);
}
}
...
@@ -301,9 +289,8 @@ public class ShoppingCartController {
...
@@ -301,9 +289,8 @@ public class ShoppingCartController {
/**
/**
* 测试用,后续删除
* 测试用,后续删除
*/
*/
@ApiAnnotation
@PostMapping
(
value
=
"/test/putCache"
)
@PostMapping
(
value
=
"/test/putCache"
)
@
LogIgnore
(
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
logMessage
=
"/putCache"
)
@
ApiAnnotation
(
logMessage
=
"/putCache"
)
public
BaseResponse
putCache
(
@LogParams
@RequestBody
@Validated
PutCacheVo
request
)
{
public
BaseResponse
putCache
(
@LogParams
@RequestBody
@Validated
PutCacheVo
request
)
{
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
domain
.
CartParamDto
cartParamDto
=
new
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
domain
.
CartParamDto
();
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
domain
.
CartParamDto
cartParamDto
=
new
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
domain
.
CartParamDto
();
...
...
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