记得上下班打卡 | 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
e1452572
Commit
e1452572
authored
Aug 03, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
795abde5
48630286
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
1 deletion
+50
-1
KylinOrderRefundAdminController.java
...oller/zhengzai/kylin/KylinOrderRefundAdminController.java
+26
-0
refund.html
...ain/resources/templates/zhengzai/kylin/refund/refund.html
+22
-1
PerformanceVoUtils.java
...client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
+2
-0
No files found.
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 @
e1452572
...
...
@@ -14,12 +14,17 @@ import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
import
com.liquidnet.service.kylin.dto.param.RefundSearchParam
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.RefundOrderDetailsVo
;
import
com.liquidnet.service.kylin.service.IKylinOrderRefundsService
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.web.bind.annotation.*
;
import
javax.validation.constraints.NotNull
;
import
java.util.Map
;
/**
...
...
@@ -207,4 +212,25 @@ public class KylinOrderRefundAdminController extends BaseController {
}
}
@Autowired
IKylinOrderRefundsService
kylinOrderRefundsService
;
// @RequiresPermissions("order:switch:search:code")
@ApiOperation
(
value
=
"根据截取订单号获取全量订单号"
)
@GetMapping
(
"/search/code"
)
@ResponseBody
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"code"
,
value
=
"订单号"
,
example
=
""
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"int"
,
name
=
"type"
,
value
=
"1退款单号 2订单号"
,
example
=
""
),
})
public
AjaxResult
loginSmsSwitch
(
@NotNull
(
message
=
"订单号不能为空"
)
@RequestParam
String
code
,
@NotNull
(
message
=
"类型不能为空"
)
@RequestParam
int
type
)
{
String
codeNum
=
kylinOrderRefundsService
.
getOrderRefundCode
(
code
,
type
);
if
(
codeNum
==
null
){
return
error
(
"查询失败"
);
}
else
{
return
success
(
codeNum
);
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html
View file @
e1452572
...
...
@@ -42,6 +42,20 @@
</ul>
</div>
</form>
<form
id=
"formId2"
>
<div
class=
"select-list"
>
<ul>
<li>
<label>
短订单号:
</label>
<input
type=
"text"
name=
"findCode"
/>
</li>
<li>
<a
class=
"btn btn-primary btn-rounded btn-sm"
onclick=
"findCode()"
><i
class=
"fa fa-search"
></i>
查询
</a>
</li>
</ul>
</div>
</form>
</div>
<div
class=
"btn-group-sm"
id=
"toolbar"
role=
"group"
>
...
...
@@ -98,6 +112,13 @@
var
prefix
=
ctx
+
"kylin/refund"
;
function
findCode
()
{
var
shortCode
=
document
.
getElementsByName
(
"findCode"
)[
0
].
value
;
$
.
operate
.
get
(
prefix
+
"/search/code?code="
+
shortCode
+
"&type=2"
,
null
,
function
(
res
)
{
$
.
modal
.
alert
(
res
);
});
}
function
review
(
id
)
{
var
data
=
''
;
if
(
id
)
{
...
...
@@ -249,4 +270,4 @@
});
</script>
</body>
</html>
\ No newline at end of file
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @
e1452572
...
...
@@ -222,6 +222,8 @@ public class PerformanceVoUtils {
kylinPerformanceMisVo
.
setStopSellTime
(
StringList
.
get
(
0
));
kylinPerformanceMisVo
.
setTicketTimes
(
ticketTimesTicketCreatePartnerVoList
);
String
descibes
=
kylinPerformanceMisVo
.
getDetails
().
replace
(
"'"
,
""
);
kylinPerformanceMisVo
.
setDetails
(
descibes
);
kylinPerformanceMisVo
.
setIsDistribution
(
0
);
kylinPerformanceMisVo
.
setSyncAgent
(
0
);
kylinPerformanceMisVo
.
setNoticeImageList
(
JsonUtils
.
fromJson
(
kylinPerformanceMisVo
.
getNoticeImage
(),
new
TypeReference
<
List
<
KylinBuyNoticeVo
>>()
{
...
...
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