记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
375a9bb3
Commit
375a9bb3
authored
Oct 29, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
详情加取票方式 申请退款类型
parent
a2f2ab12
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
258 additions
and
31 deletions
+258
-31
KylinOrderRefundsAdminVo.java
...ervice/kylin/dto/vo/returns/KylinOrderRefundsAdminVo.java
+199
-0
KylinOrderRefundAdminController.java
...oller/zhengzai/kylin/KylinOrderRefundAdminController.java
+3
-2
details.html
...in/resources/templates/zhengzai/kylin/refund/details.html
+28
-24
KylinOrderRefundsServiceImpl.java
...gzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
+28
-5
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsAdminVo.java
0 → 100644
View file @
375a9bb3
package
com
.
liquidnet
.
service
.
kylin
.
dto
.
vo
.
returns
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundEntitiesVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundPicVo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.List
;
/**
* <p>
* refund返回给前端的数据字段
* </p>
*
* @author jiangxiulong
* @since 2021-05-31 11:19 上午
*/
@Data
@ApiModel
public
class
KylinOrderRefundsAdminVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
-
7910948111093638877L
;
@ApiModelProperty
(
value
=
"主键ID"
)
private
String
orderRefundsId
;
@ApiModelProperty
(
value
=
"票务订单id"
)
private
String
orderTicketsId
;
@ApiModelProperty
(
value
=
"退款编号"
)
private
String
orderRefundCode
;
@ApiModelProperty
(
value
=
"批量退款id"
)
private
String
orderRefundBatchesId
;
@ApiModelProperty
(
value
=
"退款中心退款编号"
)
private
String
refundCode
;
@ApiModelProperty
(
value
=
"成功退款时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
refundAt
;
@ApiModelProperty
(
value
=
"第三方退款编号"
)
private
String
refundId
;
@ApiModelProperty
(
value
=
"退款失败原因"
)
private
String
refundError
;
@ApiModelProperty
(
value
=
"退款票总金额"
)
private
BigDecimal
price
;
@ApiModelProperty
(
value
=
"退款快递总金额"
)
private
BigDecimal
priceExpress
;
@ApiModelProperty
(
value
=
"退款扣除的手续费金额"
)
private
BigDecimal
priceCharges
;
@ApiModelProperty
(
value
=
"退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败"
)
private
Integer
status
;
private
String
statusName
;
private
Integer
refundCate
;
@ApiModelProperty
(
value
=
"退款差异: 0申请退款返还库存 1自动退款无法取消退款不返还库存"
)
private
Integer
type
;
@ApiModelProperty
(
value
=
"退款差异: 0申请退款返还库存 1自动退款无法取消退款不返还库存"
)
private
String
typeName
;
@ApiModelProperty
(
value
=
"申请人id"
)
private
String
applicantId
;
@ApiModelProperty
(
value
=
"申请人名称"
)
private
String
applicantName
;
@ApiModelProperty
(
value
=
"申请时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
applicantAt
;
@ApiModelProperty
(
value
=
"退款原因"
)
private
String
reason
;
@ApiModelProperty
(
value
=
"审核人id"
)
private
String
auditorId
;
@ApiModelProperty
(
value
=
"审核人名称"
)
private
String
auditorName
;
@ApiModelProperty
(
value
=
"审核时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
auditorAt
;
@ApiModelProperty
(
value
=
"驳回原因"
)
private
String
reject
;
@ApiModelProperty
(
value
=
"执行人id"
)
private
String
executorId
;
@ApiModelProperty
(
value
=
"执行人名称"
)
private
String
executorName
;
@ApiModelProperty
(
value
=
"执行时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
executorAt
;
@ApiModelProperty
(
value
=
"回绝原因"
)
private
String
refuse
;
@ApiModelProperty
(
value
=
"票务审核人id"
)
private
String
ticketAuditId
;
@ApiModelProperty
(
value
=
"票务审核人名称"
)
private
String
ticketAuditName
;
@ApiModelProperty
(
value
=
"票务审核时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
ticketAuditAt
;
@ApiModelProperty
(
value
=
"票务审核备注"
)
private
String
ticketAuditRemark
;
@ApiModelProperty
(
value
=
"票务/快递费/票和快递费"
)
private
String
refundType
;
@ApiModelProperty
(
value
=
"添加时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
createdAt
;
@ApiModelProperty
(
value
=
"更新时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
updatedAt
;
List
<
KylinOrderRefundsEntitiesDao
>
entities
;
private
List
<
KylinOrderRefundEntitiesVo
>
orderRefundEntitiesVoList
;
private
List
<
KylinOrderRefundPicVo
>
orderRefundPicVos
;
private
List
<
String
>
picList
;
private
String
payType
;
private
String
getTicketType
;
public
void
setStatus
(
Integer
status
){
try
{
this
.
status
=
status
;
switch
(
status
)
{
case
0
:
this
.
statusName
=
"请求退款"
;
break
;
case
1
:
this
.
statusName
=
"运营审核通过"
;
break
;
case
2
:
this
.
statusName
=
"取消退款"
;
break
;
case
3
:
this
.
statusName
=
"正在退款"
;
break
;
case
4
:
this
.
statusName
=
"完成退款"
;
break
;
case
5
:
this
.
statusName
=
"运营审核驳回退款"
;
break
;
case
6
:
this
.
statusName
=
"退款失败"
;
break
;
case
7
:
this
.
statusName
=
"财务通过等待退款"
;
break
;
case
8
:
this
.
statusName
=
"财务驳回退款"
;
break
;
default
:
this
.
statusName
=
"其他"
;
break
;
}
}
catch
(
Exception
e
){
e
.
printStackTrace
();
this
.
statusName
=
"其他"
;
}
}
private
static
final
KylinOrderRefundsAdminVo
obj
=
new
KylinOrderRefundsAdminVo
();
public
static
KylinOrderRefundsAdminVo
getNew
()
{
try
{
return
(
KylinOrderRefundsAdminVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
KylinOrderRefundsAdminVo
();
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java
View file @
375a9bb3
...
...
@@ -15,6 +15,7 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import
com.liquidnet.service.kylin.dao.OrderRefundDao
;
import
com.liquidnet.service.kylin.dto.param.RefundApplyParam
;
import
com.liquidnet.service.kylin.dto.param.RefundSearchParam
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsAdminVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo
;
import
com.liquidnet.service.kylin.service.IKylinOrderRefundsService
;
import
io.swagger.annotations.ApiImplicitParam
;
...
...
@@ -59,9 +60,9 @@ public class KylinOrderRefundAdminController extends BaseController {
@RequiresPermissions
(
"kylin:refund:detail"
)
@GetMapping
(
value
=
"/details/{orderRefundId}"
)
public
String
detail
(
@PathVariable
(
"orderRefundId"
)
String
orderRefundId
,
ModelMap
mmap
)
{
KylinOrderRefundsVo
result
=
null
;
KylinOrderRefunds
Admin
Vo
result
=
null
;
result
=
kylinOrderRefundsServiceImpl
.
detail
(
orderRefundId
);
mmap
.
put
(
"KylinOrderRefundsVo"
,
result
);
mmap
.
put
(
"KylinOrderRefunds
Admin
Vo"
,
result
);
return
prefix
+
"/details"
;
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/details.html
View file @
375a9bb3
...
...
@@ -8,61 +8,65 @@
<form
class=
"form-horizontal m-t"
id=
"signupForm"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
退款单id:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.orderRefundsId}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.orderRefundsId}"
></div>
<label
class=
"col-sm-2 control-label"
>
票务订单id:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.orderTicketsId}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.orderTicketsId}"
></div>
<label
class=
"col-sm-2 control-label"
>
实际支付方式:
</label>
<div
class=
"form-control-static"
th:text=
"*{@dict.getLabel('zhengzai_pay_type',KylinOrderRefundsVo.payType)}"
/>
<div
class=
"form-control-static"
th:text=
"*{@dict.getLabel('zhengzai_pay_type',KylinOrderRefundsAdminVo.payType)}"
/>
<label
class=
"col-sm-2 control-label"
>
取票方式:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsAdminVo.typeName}"
></div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
申请退款类型:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsAdminVo.getTicketType}"
></div>
<label
class=
"col-sm-2 control-label"
>
退款编号:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.orderRefundCode}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.orderRefundCode}"
></div>
<label
class=
"col-sm-2 control-label"
>
退款中心退款编号:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.RefundCode}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.RefundCode}"
></div>
<label
class=
"col-sm-2 control-label"
>
第三方退款编号:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.RefundId}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.RefundId}"
></div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
退款票总金额:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.price}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.price}"
></div>
<label
class=
"col-sm-2 control-label"
>
退款快递费总金额:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.priceExpress}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.priceExpress}"
></div>
<label
class=
"col-sm-2 control-label"
>
退款状态:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.statusName}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.statusName}"
></div>
<label
class=
"col-sm-2 control-label"
>
成功退款时间:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.RefundAt}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.RefundAt}"
></div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
申请人名称:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.applicantName}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.applicantName}"
></div>
<label
class=
"col-sm-2 control-label"
>
申请时间:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.applicantAt}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.applicantAt}"
></div>
<label
class=
"col-sm-2 control-label"
>
申请备注:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.reason}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.reason}"
></div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
审核人名称:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.auditorName}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.auditorName}"
></div>
<label
class=
"col-sm-2 control-label"
>
审核时间:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.auditorAt}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.auditorAt}"
></div>
<label
class=
"col-sm-2 control-label"
>
审核备注:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.reject}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.reject}"
></div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
确认收货人名称:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.ticketAuditName}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.ticketAuditName}"
></div>
<label
class=
"col-sm-2 control-label"
>
确认收货执行时间:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.ticketAuditAt}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.ticketAuditAt}"
></div>
<label
class=
"col-sm-2 control-label"
>
确认收货执行备注:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.ticketAuditRemark}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.ticketAuditRemark}"
></div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
执行人名称:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.executorName}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.executorName}"
></div>
<label
class=
"col-sm-2 control-label"
>
执行时间:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.executorAt}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.executorAt}"
></div>
<label
class=
"col-sm-2 control-label"
>
执行备注:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsVo.refuse}"
></div>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefunds
Admin
Vo.refuse}"
></div>
</div>
<div
class=
"form-group"
>
...
...
@@ -72,7 +76,7 @@
<table
class=
"col-sm-8 select-table table-bordered"
>
<tbody>
<tr>
<td
th:each=
"str : ${KylinOrderRefundsVo.picList}"
style=
"float: left"
>
<td
th:each=
"str : ${KylinOrderRefunds
Admin
Vo.picList}"
style=
"float: left"
>
<img
th:src=
"${str}"
width=
"25%"
>
</td>
</tr>
...
...
@@ -95,7 +99,7 @@
</tr>
</thead>
<tbody>
<tr
th:each=
"v : ${KylinOrderRefundsVo.entities}"
>
<tr
th:each=
"v : ${KylinOrderRefunds
Admin
Vo.entities}"
>
<td
th:text=
"${v.title}"
></td>
<td
th:text=
"${v.useStart}"
></td>
<td
th:text=
"${v.enterName}"
></td>
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
View file @
375a9bb3
...
...
@@ -24,6 +24,7 @@ import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
import
com.liquidnet.service.kylin.dto.param.RefundSearchParam
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsAdminVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.RefundOrderDetailsVo
;
import
com.liquidnet.service.kylin.entity.*
;
...
...
@@ -370,12 +371,13 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
}
}
public
KylinOrderRefundsVo
detail
(
String
orderRefundId
)
{
public
KylinOrderRefundsAdminVo
detail
(
String
orderRefundId
)
{
// 退款订单数据
KylinOrderRefunds
data
=
kylinOrderRefundsMapper
.
selectOne
(
new
QueryWrapper
<
KylinOrderRefunds
>()
.
eq
(
"order_refunds_id"
,
orderRefundId
)
);
// 退款票种
List
<
KylinOrderRefundEntities
>
refundEntities
=
kylinOrderRefundsEntitiesMapper
.
selectList
(
new
QueryWrapper
<
KylinOrderRefundEntities
>().
eq
(
"order_refunds_id"
,
orderRefundId
)
);
...
...
@@ -384,8 +386,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
for
(
KylinOrderRefundsEntitiesDao
item
:
entities
)
{
item
.
setPaymentName
(
item
.
getIsPayment
());
}
KylinOrderRefunds
Vo
kylinOrderRefundsVo
=
new
KylinOrderRefundsVo
();
// 退款申请图片
KylinOrderRefunds
AdminVo
kylinOrderRefundsVo
=
KylinOrderRefundsAdminVo
.
getNew
();
kylinOrderRefundsVo
.
setEntities
(
entities
);
BeanUtils
.
copyProperties
(
data
,
kylinOrderRefundsVo
);
KylinOrderRefundPic
kylinOrderRefundPic
=
kylinOrderRefundPicMapper
.
selectOne
(
new
UpdateWrapper
<
KylinOrderRefundPic
>().
eq
(
"order_refunds_id"
,
orderRefundId
));
...
...
@@ -395,10 +397,31 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
});
kylinOrderRefundsVo
.
setPicList
(
strList
);
}
// 订单表
KylinOrderTickets
kylinOrderTickets
=
kylinOrderTicketsMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
KylinOrderTickets
.
class
).
eq
(
KylinOrderTickets:
:
getOrderTicketsId
,
data
.
getOrderTicketsId
())
);
if
(
kylinOrderTickets
.
getGetTicketType
().
equals
(
"express"
))
{
kylinOrderRefundsVo
.
setGetTicketType
(
"快递票"
);
}
else
{
kylinOrderRefundsVo
.
setGetTicketType
(
"电子票"
);
}
String
typeName
=
""
;
switch
(
kylinOrderRefundsVo
.
getType
())
{
case
0
:
typeName
=
"客服申请"
;
break
;
case
1
:
typeName
=
"超时退款"
;
break
;
case
2
:
typeName
=
"用户申请普通退款"
;
break
;
case
3
:
typeName
=
"用户申请快递退款"
;
break
;
}
kylinOrderRefundsVo
.
setTypeName
(
typeName
);
kylinOrderRefundsVo
.
setPayType
(
kylinOrderTickets
.
getPayType
());
return
kylinOrderRefundsVo
;
...
...
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