记得上下班打卡 | 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
9345cf1c
Commit
9345cf1c
authored
Jul 06, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test'
parents
de57a5bc
e38c122d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
58 additions
and
3 deletions
+58
-3
IKylinOrderRefundsService.java
...dnet/service/kylin/service/IKylinOrderRefundsService.java
+1
-3
OrderSwitchAdminController.java
...controller/zhengzai/order/OrderSwitchAdminController.java
+43
-0
KylinOrderRefundsServiceImpl.java
...gzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
+10
-0
KylinOrderTicketsServiceImpl.java
...vice/kylin/service/impl/KylinOrderTicketsServiceImpl.java
+4
-0
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderRefundsService.java
View file @
9345cf1c
package
com
.
liquidnet
.
service
.
kylin
.
service
;
package
com
.
liquidnet
.
service
.
kylin
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.liquidnet.service.kylin.entity.KylinOrderRefunds
;
/**
/**
* <p>
* <p>
...
@@ -12,5 +10,5 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
...
@@ -12,5 +10,5 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
* @since 2021-05-26
* @since 2021-05-26
*/
*/
public
interface
IKylinOrderRefundsService
{
public
interface
IKylinOrderRefundsService
{
String
getOrderRefundCode
(
String
orderRefundCode
);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/order/OrderSwitchAdminController.java
0 → 100644
View file @
9345cf1c
package
com
.
liquidnet
.
client
.
admin
.
web
.
controller
.
zhengzai
.
order
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.kylin.service.IKylinOrderRefundsService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
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.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.validation.constraints.NotNull
;
@Api
(
tags
=
"ORDER 订单号"
)
@Slf4j
@Validated
@RestController
@RequestMapping
(
"order/switch"
)
public
class
OrderSwitchAdminController
{
@Autowired
IKylinOrderRefundsService
kylinOrderRefundsService
;
@RequiresPermissions
(
"order:switch:search:code"
)
@ApiOperation
(
value
=
"开放/限制校验证码"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"orderRefundCode"
,
value
=
"退款编号"
,
example
=
""
),
})
@PostMapping
(
"search/code"
)
public
ResponseDto
<
Object
>
loginSmsSwitch
(
@RequestParam
@NotNull
String
orderRefundCode
)
{
String
code
=
kylinOrderRefundsService
.
getOrderRefundCode
(
orderRefundCode
);
if
(
code
==
null
){
return
ResponseDto
.
success
(
"未查询到"
);
}
else
{
return
ResponseDto
.
success
(
code
);
}
}
}
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 @
9345cf1c
...
@@ -466,4 +466,14 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
...
@@ -466,4 +466,14 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
return
refundOrderDetailsVo
;
return
refundOrderDetailsVo
;
}
}
@Override
public
String
getOrderRefundCode
(
String
orderRefundCode
)
{
KylinOrderRefunds
data
=
kylinOrderRefundsMapper
.
selectOne
(
new
UpdateWrapper
<
KylinOrderRefunds
>().
like
(
"order_refund_code"
,
orderRefundCode
));
if
(
data
==
null
){
return
null
;
}
else
{
return
data
.
getOrderRefundCode
();
}
}
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @
9345cf1c
...
@@ -297,6 +297,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
...
@@ -297,6 +297,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
kylinOrderTicketEntitiesPreRefundVos
.
add
(
refundVo
);
kylinOrderTicketEntitiesPreRefundVos
.
add
(
refundVo
);
}
}
orderTicketVo
.
setFieldName
(
performanceVo
.
getFieldName
());
orderTicketVo
.
setFieldName
(
performanceVo
.
getFieldName
());
orderTicketVo
.
setOrderCode
(
orderTicketVo
.
getOrderCode
().
substring
(
orderTicketVo
.
getOrderCode
().
length
()-
10
));
BeanUtils
.
copyProperties
(
orderTicketVo
,
vo
);
BeanUtils
.
copyProperties
(
orderTicketVo
,
vo
);
vo
.
setIsTrueName
(
performanceVo
.
getIsTrueName
());
vo
.
setIsTrueName
(
performanceVo
.
getIsTrueName
());
...
@@ -320,7 +321,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
...
@@ -320,7 +321,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20003"
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20003"
));
}
}
orderTicketVo
.
setFieldName
(
performanceVo
.
getFieldName
());
orderTicketVo
.
setFieldName
(
performanceVo
.
getFieldName
());
orderTicketVo
.
setOrderCode
(
orderTicketVo
.
getOrderCode
().
substring
(
orderTicketVo
.
getOrderCode
().
length
()-
10
));
KylinOrderRefundsVo
kylinOrderRefundsVoBase
=
dataUtils
.
getOrderRefundVo
(
orderRefundId
);
KylinOrderRefundsVo
kylinOrderRefundsVoBase
=
dataUtils
.
getOrderRefundVo
(
orderRefundId
);
kylinOrderRefundsVoBase
.
setOrderRefundCode
(
kylinOrderRefundsVoBase
.
getOrderRefundCode
().
substring
(
kylinOrderRefundsVoBase
.
getOrderRefundCode
().
length
()-
10
));
kylinOrderRefundsVoBase
.
setRefundCode
(
kylinOrderRefundsVoBase
.
getRefundCode
().
substring
(
kylinOrderRefundsVoBase
.
getRefundCode
().
length
()-
10
));
vo
.
setKylinOrderRefundsVoBaseList
(
kylinOrderRefundsVoBase
);
vo
.
setKylinOrderRefundsVoBaseList
(
kylinOrderRefundsVoBase
);
vo
.
setOrderTicketVo
(
orderTicketVo
);
vo
.
setOrderTicketVo
(
orderTicketVo
);
return
ResponseDto
.
success
(
vo
);
return
ResponseDto
.
success
(
vo
);
...
...
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