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
c01c87b3
Commit
c01c87b3
authored
Aug 23, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单申诉
parent
9cfbe3d5
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
98 additions
and
0 deletions
+98
-0
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
+10
-0
order-application-service/src/main/java/cn/freemud/entities/vo/order/OrderAppealVo.java
+21
-0
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
+1
-0
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
+3
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+24
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
+6
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/SubmitAppealReq.java
+23
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
+10
-0
No files found.
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
View file @
c01c87b3
...
@@ -17,6 +17,7 @@ import cn.freemud.base.entity.BaseResponse;
...
@@ -17,6 +17,7 @@ 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
;
import
cn.freemud.entities.vo.encircle.EncircleReserveBaseVo
;
import
cn.freemud.entities.vo.encircle.EncircleReserveBaseVo
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
cn.freemud.handler.OrderReportJobHandler
;
import
cn.freemud.handler.OrderReportJobHandler
;
import
cn.freemud.monitorcenter.tools.HealthUtil
;
import
cn.freemud.monitorcenter.tools.HealthUtil
;
import
cn.freemud.service.EncircleOrderService
;
import
cn.freemud.service.EncircleOrderService
;
...
@@ -385,6 +386,15 @@ public class OrderController {
...
@@ -385,6 +386,15 @@ public class OrderController {
return
orderservice
.
scoreRecord
(
queryOrderVo
);
return
orderservice
.
scoreRecord
(
queryOrderVo
);
}
}
/**
* 订单申诉
*/
@ApiAnnotation
(
logMessage
=
"submitAppeal"
)
@PostMapping
(
"/submitAppeal"
)
public
BaseResponse
submitAppeal
(
@Validated
@LogParams
@RequestBody
OrderAppealVo
orderAppealVo
)
{
return
orderservice
.
submitAppeal
(
orderAppealVo
);
}
/**
/**
* 订单统计 上报数据
* 订单统计 上报数据
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/order/OrderAppealVo.java
0 → 100644
View file @
c01c87b3
package
cn
.
freemud
.
entities
.
vo
.
order
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.NotEmpty
;
@Data
public
class
OrderAppealVo
{
@NotEmpty
(
message
=
"sessionId 不能为空"
)
private
String
sessionId
;
/**
* 商户ID
*/
private
String
partnerId
;
/**
* 订单ID
*/
private
String
oid
;
private
String
content
;
}
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
View file @
c01c87b3
...
@@ -175,6 +175,7 @@ public enum ResponseResult {
...
@@ -175,6 +175,7 @@ public enum ResponseResult {
STORE_SELF_ERROR
(
"45069"
,
"请选择截止营业时间大于45分钟下单"
,
""
),
STORE_SELF_ERROR
(
"45069"
,
"请选择截止营业时间大于45分钟下单"
,
""
),
COUPON_INVALID
(
"45070"
,
"券已锁定,请先支付或取消待支付订单"
,
""
),
COUPON_INVALID
(
"45070"
,
"券已锁定,请先支付或取消待支付订单"
,
""
),
ORDER_RECEIVE_ERR
(
"45071"
,
"确认收货失败,请稍后再试"
,
""
),
ORDER_RECEIVE_ERR
(
"45071"
,
"确认收货失败,请稍后再试"
,
""
),
ORDER_APPEAL_ERR
(
"45072"
,
"申诉失败"
,
""
),
/**
/**
* 售后单
* 售后单
...
...
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
View file @
c01c87b3
...
@@ -4,6 +4,7 @@ import cn.freemud.base.entity.BaseResponse;
...
@@ -4,6 +4,7 @@ import cn.freemud.base.entity.BaseResponse;
import
cn.freemud.entities.dto.ConfirmOrderDto
;
import
cn.freemud.entities.dto.ConfirmOrderDto
;
import
cn.freemud.entities.dto.QueryOrdersResponseDto
;
import
cn.freemud.entities.dto.QueryOrdersResponseDto
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
com.freemud.application.sdk.api.ordercenter.response.OrderCountResp
;
import
com.freemud.application.sdk.api.ordercenter.response.OrderCountResp
;
import
java.util.List
;
import
java.util.List
;
...
@@ -180,4 +181,6 @@ public interface Orderservice {
...
@@ -180,4 +181,6 @@ public interface Orderservice {
* @return
* @return
*/
*/
BaseResponse
<
OrderStateMonitorInfoVo
>
queryOrderStateMonitorInfo
(
String
orderCode
,
String
partnerId
,
Byte
orderClient
);
BaseResponse
<
OrderStateMonitorInfoVo
>
queryOrderStateMonitorInfo
(
String
orderCode
,
String
partnerId
,
Byte
orderClient
);
BaseResponse
submitAppeal
(
OrderAppealVo
orderAppealVo
);
}
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
c01c87b3
...
@@ -45,6 +45,7 @@ import cn.freemud.entities.dto.shoppingCart.CollageOrderDto;
...
@@ -45,6 +45,7 @@ import cn.freemud.entities.dto.shoppingCart.CollageOrderDto;
import
cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto
;
import
cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto
;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request
;
import
cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request
;
...
@@ -4182,5 +4183,28 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -4182,5 +4183,28 @@ public class OrderServiceImpl implements Orderservice {
return
ResponseUtil
.
success
(
infoVo
);
return
ResponseUtil
.
success
(
infoVo
);
}
}
@Override
public
BaseResponse
submitAppeal
(
OrderAppealVo
orderAppealVo
)
{
String
sessionId
=
orderAppealVo
.
getSessionId
();
AssortmentCustomerInfoVo
userLoginInfoDto
=
customerInfoManager
.
getCustomerInfoByObject
(
sessionId
);
if
(
userLoginInfoDto
==
null
||
StringUtils
.
isEmpty
(
userLoginInfoDto
.
getMemberId
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
}
SubmitAppealReq
submitAppealReq
=
new
SubmitAppealReq
();
submitAppealReq
.
setPartnerId
(
userLoginInfoDto
.
getPartnerId
());
submitAppealReq
.
setOrderCode
(
orderAppealVo
.
getOid
());
submitAppealReq
.
setAppealContent
(
orderAppealVo
.
getContent
());
submitAppealReq
.
setMobile
(
userLoginInfoDto
.
getMobile
());
submitAppealReq
.
setOperator
(
userLoginInfoDto
.
getNickName
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
BaseResponse
baseResponse
=
orderSdkService
.
submitAppeal
(
submitAppealReq
,
LogThreadLocal
.
getTrackingNo
());
if
(
Objects
.
isNull
(
baseResponse
)
||
!
Objects
.
equals
(
RESPONSE_SUCCESS_CODE
,
baseResponse
.
getCode
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_APPEAL_ERR
);
}
return
ResponseUtil
.
success
();
}
}
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
View file @
c01c87b3
...
@@ -268,4 +268,10 @@ public class InterfaceAddressConstant {
...
@@ -268,4 +268,10 @@ public class InterfaceAddressConstant {
*/
*/
public
static
final
String
QUERY_ORDER_DAY_FROM_DB
=
"order/v2/db/queryOrderByConditions"
;
public
static
final
String
QUERY_ORDER_DAY_FROM_DB
=
"order/v2/db/queryOrderByConditions"
;
/**
* 订单申诉
*/
public
static
final
String
SUBMIT_APPEAL
=
"order/v2/submitAppeal"
;
}
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/SubmitAppealReq.java
0 → 100644
View file @
c01c87b3
package
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
request
;
import
lombok.Data
;
@Data
public
class
SubmitAppealReq
{
//商户号,确定商品归属权
private
String
partnerId
;
private
String
orderCode
;
private
String
appealContent
;
private
String
mobile
;
private
String
appealTime
;
private
String
operator
;
private
String
extParam
;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
View file @
c01c87b3
...
@@ -969,4 +969,14 @@ public class OrderSdkService {
...
@@ -969,4 +969,14 @@ public class OrderSdkService {
});
});
return
responseHandle
(
responseDTO
);
return
responseHandle
(
responseDTO
);
}
}
/**
* 订单申诉
*/
public
BaseResponse
submitAppeal
(
SubmitAppealReq
submitAppealReq
,
String
trackingNo
)
{
OrderBaseResp
responseDTO
=
RequestThirdPartyUtils
.
httpJsonReqComplexNew
(
restTemplate
,
SUBMIT_APPEAL
,
createBaseRequest
(
submitAppealReq
,
trackingNo
),
new
ParameterizedTypeReference
<
OrderBaseResp
>()
{
});
return
responseHandle
(
responseDTO
);
}
}
}
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