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
7ad343d8
Commit
7ad343d8
authored
Apr 30, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增不对外暴露接口操作退款
parent
3e18580c
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
114 additions
and
1 deletions
+114
-1
order-application-service/src/main/java/cn/freemud/controller/OrderDeveloperController.java
+40
-0
order-application-service/src/main/java/cn/freemud/entities/vo/OrderDevelopRefundVo.java
+43
-0
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
+7
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+0
-0
order-management/src/main/java/cn/freemud/management/enums/OperateType.java
+6
-1
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
+18
-0
No files found.
order-application-service/src/main/java/cn/freemud/controller/OrderDeveloperController.java
0 → 100644
View file @
7ad343d8
package
cn
.
freemud
.
controller
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.vo.OrderDevelopRefundVo
;
import
cn.freemud.entities.vo.OrderRefundVo
;
import
cn.freemud.service.Orderservice
;
import
com.freemud.application.sdk.api.log.ApiAnnotation
;
import
com.freemud.application.sdk.api.log.LogParams
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2022/4/30 14:55
* @description : 针对开发人员开放的接口操作, 不暴露给外部人员
*/
@RequestMapping
(
"/order/develop"
)
@RestController
public
class
OrderDeveloperController
{
@Autowired
private
Orderservice
orderservice
;
/**
* 订单内部人员操作 给订单退款, 使用该接口需要报备
* 1.生成售后单
* 2.直接调用oms进行退款处理
*/
@ApiAnnotation
(
logMessage
=
"/order/develop/refund"
)
@PostMapping
(
"/refund"
)
public
BaseResponse
developRefund
(
@Validated
@LogParams
@RequestBody
OrderDevelopRefundVo
orderRefundVo
)
{
return
orderservice
.
developRefund
(
orderRefundVo
);
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/OrderDevelopRefundVo.java
0 → 100644
View file @
7ad343d8
package
cn
.
freemud
.
entities
.
vo
;
import
com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2022/4/30 15:03
* @description :
*/
@Data
public
class
OrderDevelopRefundVo
{
/**
* 订单号
*/
@NotBlank
(
message
=
"订单编号不能为空"
)
private
String
orderCode
;
private
String
partnerId
;
/**
* 退款理由
*/
private
String
reason
;
/**
* 操作人,需要记录操作人
*/
@NotBlank
(
message
=
"请真实填写调动该接口的操作人"
)
private
String
operator
;
/**
* 微商城退款方式
*
* @see RefundModeEnum#getIndex()
*/
@ApiModelProperty
(
value
=
"微商城退款方式"
,
notes
=
RefundModeEnum
.
API_DOC
)
private
Byte
refundMode
;
}
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
View file @
7ad343d8
...
@@ -219,4 +219,11 @@ public interface Orderservice extends OrderFactoryService{
...
@@ -219,4 +219,11 @@ public interface Orderservice extends OrderFactoryService{
* @return
* @return
*/
*/
BaseResponse
couponOrderRefundRetry
(
OrderRefundRetryVo
orderRefundRetryVo
);
BaseResponse
couponOrderRefundRetry
(
OrderRefundRetryVo
orderRefundRetryVo
);
/**
* 开发人员 操作退款订单 该接口 生产使用请通知SE
* @param orderRefundVo
* @return
*/
BaseResponse
developRefund
(
OrderDevelopRefundVo
orderRefundVo
);
}
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
7ad343d8
This diff is collapsed.
Click to expand it.
order-management/src/main/java/cn/freemud/management/enums/OperateType.java
View file @
7ad343d8
...
@@ -13,7 +13,12 @@ public enum OperateType {
...
@@ -13,7 +13,12 @@ public enum OperateType {
ORDER_REJECT_REFUND
(
"orderRejectRefund"
,
"拒绝退款"
),
ORDER_REJECT_REFUND
(
"orderRejectRefund"
,
"拒绝退款"
),
ORDER_CANCEL
(
"orderCancel"
,
"订单取消"
),
ORDER_CANCEL
(
"orderCancel"
,
"订单取消"
),
ORDER_CREATE_DELIVERY
(
"orderCreateDelivery"
,
"创建配送"
),
ORDER_CREATE_DELIVERY
(
"orderCreateDelivery"
,
"创建配送"
),
ORDER_CANCEL_DELIVERY
(
"orderCancelDelivery"
,
"取消配送"
);
ORDER_CANCEL_DELIVERY
(
"orderCancelDelivery"
,
"取消配送"
),
/**
* 该操作无校验, 直接退款, 如果使用 请联系SE 进行报备,
* 该类型不给外部人员使用, 不对外部暴露接口
*/
ORDER_DEVELOPER_AGREE_REFUND
(
"orderDeveloperAgreeRefund"
,
"售后人员同意退款"
);
/**
/**
* 操作类型
* 操作类型
...
...
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
View file @
7ad343d8
...
@@ -353,4 +353,22 @@ public class OrderManagerAdapter {
...
@@ -353,4 +353,22 @@ public class OrderManagerAdapter {
BaseResponse
<
OrderManagerResponse
>
orderManagerResponse
=
orderBeanFactory
.
getOrderManagerService
(
orderBean
).
orderCancelDelivery
(
request
,
orderBean
);
BaseResponse
<
OrderManagerResponse
>
orderManagerResponse
=
orderBeanFactory
.
getOrderManagerService
(
orderBean
).
orderCancelDelivery
(
request
,
orderBean
);
return
handleResponse
(
request
,
orderBean
,
orderManagerResponse
);
return
handleResponse
(
request
,
orderBean
,
orderManagerResponse
);
}
}
/**
* @see OrderManagerAdapter#orderAgreeRefund(cn.freemud.management.entities.dto.request.order.OrderManagerRequest)
* @param request
* @return 改操作 无需校验订单参数 直接退款
* 使用该方法 请先进行报备, 因为不暴露给外部使用, 不属于业务代码
*/
public
BaseResponse
developRefund
(
OrderManagerRequest
request
)
{
//查询订单
OrderBeanV1
orderBean
=
orderBaseService
.
getByOrderCode
(
request
.
getOrderId
());
if
(
null
==
orderBean
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_NOT_EXIST
);
}
// 设置退款金额
orderBean
.
setAmount
(
orderVerifyHandle
.
getRefundAmount
(
orderBean
,
false
).
longValue
());
BaseResponse
<
OrderManagerResponse
>
orderManagerResponse
=
orderBeanFactory
.
getOrderManagerService
(
orderBean
).
orderAgreeRefund
(
request
,
orderBean
);
return
handleResponse
(
request
,
orderBean
,
orderManagerResponse
);
}
}
}
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