记得上下班打卡 | 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
025eb45b
Commit
025eb45b
authored
Jun 06, 2021
by
anjiabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交订单列表
parent
d89bf177
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
937 additions
and
363 deletions
+937
-363
IAdamMemberOrderAdminService.java
...vice/adam/service/admin/IAdamMemberOrderAdminService.java
+17
-0
RuoYiApplication.java
...ain/java/com/liquidnet/client/admin/RuoYiApplication.java
+1
-1
AdamMemberOrderController.java
...b/controller/zhengzai/adam/AdamMemberOrderController.java
+124
-0
AdamUserController.java
...dmin/web/controller/zhengzai/adam/AdamUserController.java
+2
-2
KylinOrderTicketsController.java
...ontroller/zhengzai/kylin/KylinOrderTicketsController.java
+4
-1
detail.html
...urces/templates/zhengzai/adam/order/orderList/detail.html
+184
-0
order.html
...ources/templates/zhengzai/adam/order/orderList/order.html
+238
-0
details.html
...ces/templates/zhengzai/kylin/order/orderList/details.html
+250
-46
orderList.html
...s/templates/zhengzai/kylin/order/orderList/orderList.html
+4
-8
pom.xml
...dnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml
+5
-0
AdamUser.java
...liquidnet/client/admin/zhengzai/adam/domain/AdamUser.java
+0
-168
AdamUserMapper.java
...net/client/admin/zhengzai/adam/mapper/AdamUserMapper.java
+0
-61
IAdamUserService.java
.../client/admin/zhengzai/adam/service/IAdamUserService.java
+4
-2
AdamMemberOrderAdminServiceImpl.java
...ai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java
+20
-0
AdamUserServiceImpl.java
...admin/zhengzai/adam/service/impl/AdamUserServiceImpl.java
+20
-18
KylinOrderTicketsAdminServiceImpl.java
...kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java
+5
-5
OrderTicketsListDao.java
.../com/liquidnet/service/kylin/dao/OrderTicketsListDao.java
+1
-0
KylinOrderTicketsMapper.xml
...iquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
+58
-51
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberOrderAdminService.java
0 → 100644
View file @
025eb45b
package
com
.
liquidnet
.
service
.
adam
.
service
.
admin
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.liquidnet.service.adam.entity.AdamMemberOrder
;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: IAdamMemberOrderAdminService
* @Package com.liquidnet.service.adam.service.admin
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/6 16:23
*/
public
interface
IAdamMemberOrderAdminService
extends
IService
<
AdamMemberOrder
>
{
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/RuoYiApplication.java
View file @
025eb45b
...
...
@@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* @author ruoyi
*/
@SpringBootApplication
(
exclude
=
{
DataSourceAutoConfiguration
.
class
},
scanBasePackages
=
{
"com.liquidnet"
})
@MapperScan
(
basePackages
=
{
"com.liquidnet.service.kylin.mapper"
})
//
@MapperScan
(
basePackages
=
{
"com.liquidnet.service.kylin.mapper"
,
"com.liquidnet.service.adam.mapper"
})
//
public
class
RuoYiApplication
{
public
static
void
main
(
String
[]
args
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberOrderController.java
0 → 100644
View file @
025eb45b
package
com
.
liquidnet
.
client
.
admin
.
web
.
controller
.
zhengzai
.
adam
;
import
com.liquidnet.client.admin.common.core.controller.BaseController
;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.service.adam.entity.AdamMemberOrder
;
import
com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
java.util.List
;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: 会员订单Controller
* @class: Test
* @Package com.liquidnet.client.admin.web.controller.zhengzai.adam
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/6 16:52
*/
@Controller
@RequestMapping
(
"/adam/order"
)
public
class
AdamMemberOrderController
extends
BaseController
{
private
String
prefix
=
"zhengzai/adam/order"
;
@Autowired
private
IAdamMemberOrderAdminService
adamMemberOrderAdminService
;
@RequiresPermissions
(
"adam:order:orderlist:view"
)
@GetMapping
(
"/orderList"
)
public
String
order
()
{
return
prefix
+
"/orderList/order"
;
}
/**
* 查询【请填写功能名称】列表
*/
@RequiresPermissions
(
"adam:order:orderlist:list"
)
@PostMapping
(
"/orderList/list"
)
@ResponseBody
public
TableDataInfo
list
(
AdamMemberOrder
adamMemberOrder
)
{
startPage
();
List
<
AdamMemberOrder
>
list
=
adamMemberOrderAdminService
.
list
();
return
getDataTable
(
list
);
}
// /**
// * 导出【请填写功能名称】列表
// */
// @RequiresPermissions("adam:order:export")
// @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
// @PostMapping("/export")
// @ResponseBody
// public AjaxResult export(AdamMemberOrder adamMemberOrder)
// {
// List<AdamMemberOrder> list = adamMemberOrderService.selectAdamMemberOrderList(adamMemberOrder);
// ExcelUtil<AdamMemberOrder> util = new ExcelUtil<AdamMemberOrder>(AdamMemberOrder.class);
// return util.exportExcel(list, "【请填写功能名称】数据");
// }
// /**
// * 新增【请填写功能名称】
// */
// @GetMapping("/add")
// public String add()
// {
// return prefix + "/add";
// }
// /**
// * 新增保存【请填写功能名称】
// */
// @RequiresPermissions("adam:order:add")
// @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
// @PostMapping("/add")
// @ResponseBody
// public AjaxResult addSave(AdamMemberOrder adamMemberOrder)
// {
// return toAjax(adamMemberOrderService.insertAdamMemberOrder(adamMemberOrder));
// }
// /**
// * 修改【请填写功能名称】
// */
// @GetMapping("/edit/{mid}")
// public String edit(@PathVariable("mid") String mid, ModelMap mmap)
// {
// AdamMemberOrder adamMemberOrder = adamMemberOrderService.selectAdamMemberOrderById(mid);
// mmap.put("adamMemberOrder", adamMemberOrder);
// return prefix + "/edit";
// }
//
// /**
// * 修改保存【请填写功能名称】
// */
// @RequiresPermissions("adam:order:edit")
// @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
// @PostMapping("/edit")
// @ResponseBody
// public AjaxResult editSave(AdamMemberOrder adamMemberOrder)
// {
// return toAjax(adamMemberOrderService.updateAdamMemberOrder(adamMemberOrder));
// }
//
// /**
// * 删除【请填写功能名称】
// */
// @RequiresPermissions("adam:order:remove")
// @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
// @PostMapping( "/remove")
// @ResponseBody
// public AjaxResult remove(String ids)
// {
// return toAjax(adamMemberOrderService.deleteAdamMemberOrderByIds(ids));
// }
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamUserController.java
View file @
025eb45b
...
...
@@ -6,8 +6,8 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.client.admin.common.enums.BusinessType
;
import
com.liquidnet.client.admin.common.utils.poi.ExcelUtil
;
import
com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser
;
import
com.liquidnet.client.admin.zhengzai.adam.service.IAdamUserService
;
import
com.liquidnet.service.adam.entity.AdamUser
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
...
...
@@ -26,7 +26,7 @@ import java.util.List;
@RequestMapping
(
"/adam/user"
)
public
class
AdamUserController
extends
BaseController
{
private
String
prefix
=
"adam/user"
;
private
String
prefix
=
"
zhengzai/
adam/user"
;
@Autowired
private
IAdamUserService
adamUserService
;
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderTicketsController.java
View file @
025eb45b
...
...
@@ -4,6 +4,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.service.kylin.dao.OrderTicketsListDao
;
import
com.liquidnet.service.kylin.dto.param.admin.OrderListReq
;
import
com.liquidnet.service.kylin.dto.vo.OrderDetailsVo
;
import
com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -51,9 +52,11 @@ public class KylinOrderTicketsController extends BaseController
/**
* 订单详情
*/
@RequiresPermissions
(
"kylin:order:orderlist:detail"
)
@GetMapping
(
"/orderList/detail/{orderId}"
)
public
String
addPerformance
(
@PathVariable
(
"orderId"
)
String
orderId
,
ModelMap
mmap
)
{
mmap
.
put
(
"roadShowId"
,
orderId
);
OrderDetailsVo
orderDetailsVo
=
iKylinOrderTicketsAdminService
.
orderDetails
(
orderId
);
mmap
.
put
(
"orderDetailsVo"
,
orderDetailsVo
);
return
prefix
+
"/orderList/details"
;
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html
0 → 100644
View file @
025eb45b
<!DOCTYPE html>
<html
lang=
"zh"
xmlns:th=
"http://www.thymeleaf.org"
>
<head>
<th:block
th:include=
"include :: header('修改【请填写功能名称】')"
/>
<th:block
th:include=
"include :: datetimepicker-css"
/>
</head>
<body
class=
"white-bg"
>
<div
class=
"wrapper wrapper-content animated fadeInRight ibox-content"
>
<form
class=
"form-horizontal m"
id=
"form-order-edit"
th:object=
"${adamMemberOrder}"
>
<input
name=
"mid"
th:field=
"*{mid}"
type=
"hidden"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付时间:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"orderNo"
th:field=
"*{orderNo}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付时间:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"uid"
th:field=
"*{uid}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
购买方式:0-购买会员 1-购买会员码,2-使用会员码:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"mode"
th:field=
"*{mode}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
原价:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"price"
th:field=
"*{price}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
实际支付:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"pricePaid"
th:field=
"*{pricePaid}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
实际支付:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"memberName"
th:field=
"*{memberName}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
会员id:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"memberId"
th:field=
"*{memberId}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
会员价格id:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"memberPriceId"
th:field=
"*{memberPriceId}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
购买天数:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"days"
th:field=
"*{days}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
订单状态:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"state"
th:field=
"*{state}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
会员号:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"memberNo"
th:field=
"*{memberNo}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付渠道:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"payChannel"
th:field=
"*{payChannel}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付订单:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"payNo"
th:field=
"*{payNo}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
用户生日:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"input-group date"
>
<input
name=
"birthday"
th:value=
"${#dates.format(adamMemberOrder.birthday, 'yyyy-MM-dd')}"
class=
"form-control"
placeholder=
"yyyy-MM-dd"
type=
"text"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付时间:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"input-group date"
>
<input
name=
"paymentAt"
th:value=
"${#dates.format(adamMemberOrder.paymentAt, 'yyyy-MM-dd')}"
class=
"form-control"
placeholder=
"yyyy-MM-dd"
type=
"text"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付时间:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"input-group date"
>
<input
name=
"createdAt"
th:value=
"${#dates.format(adamMemberOrder.createdAt, 'yyyy-MM-dd')}"
class=
"form-control"
placeholder=
"yyyy-MM-dd"
type=
"text"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付时间:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"input-group date"
>
<input
name=
"updatedAt"
th:value=
"${#dates.format(adamMemberOrder.updatedAt, 'yyyy-MM-dd')}"
class=
"form-control"
placeholder=
"yyyy-MM-dd"
type=
"text"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付时间:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"clientIp"
th:field=
"*{clientIp}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付时间:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"source"
th:field=
"*{source}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付时间:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"version"
th:field=
"*{version}"
class=
"form-control"
type=
"text"
>
</div>
</div>
</form>
</div>
<th:block
th:include=
"include :: footer"
/>
<th:block
th:include=
"include :: datetimepicker-js"
/>
<script
th:inline=
"javascript"
>
var
prefix
=
ctx
+
"kylin/order"
;
$
(
"#form-order-edit"
).
validate
({
focusCleanup
:
true
});
function
submitHandler
()
{
if
(
$
.
validate
.
form
())
{
$
.
operate
.
save
(
prefix
+
"/edit"
,
$
(
'#form-order-edit'
).
serialize
());
}
}
$
(
"input[name='birthday']"
).
datetimepicker
({
format
:
"yyyy-mm-dd"
,
minView
:
"month"
,
autoclose
:
true
});
$
(
"input[name='paymentAt']"
).
datetimepicker
({
format
:
"yyyy-mm-dd"
,
minView
:
"month"
,
autoclose
:
true
});
$
(
"input[name='createdAt']"
).
datetimepicker
({
format
:
"yyyy-mm-dd"
,
minView
:
"month"
,
autoclose
:
true
});
$
(
"input[name='updatedAt']"
).
datetimepicker
({
format
:
"yyyy-mm-dd"
,
minView
:
"month"
,
autoclose
:
true
});
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
0 → 100644
View file @
025eb45b
<!DOCTYPE html>
<html
lang=
"zh"
xmlns:th=
"http://www.thymeleaf.org"
xmlns:shiro=
"http://www.pollix.at/thymeleaf/shiro"
>
<head>
<th:block
th:include=
"include :: header('【请填写功能名称】列表')"
/>
</head>
<body
class=
"gray-bg"
>
<div
class=
"container-div"
>
<div
class=
"row"
>
<div
class=
"col-sm-12 search-collapse"
>
<form
id=
"formId"
>
<div
class=
"select-list"
>
<ul>
<li>
<label>
支付时间:
</label>
<input
type=
"text"
name=
"orderNo"
/>
</li>
<li>
<label>
支付时间:
</label>
<input
type=
"text"
name=
"uid"
/>
</li>
<li>
<label>
购买方式:0-购买会员 1-购买会员码,2-使用会员码:
</label>
<input
type=
"text"
name=
"mode"
/>
</li>
<li>
<label>
原价:
</label>
<input
type=
"text"
name=
"price"
/>
</li>
<li>
<label>
实际支付:
</label>
<input
type=
"text"
name=
"pricePaid"
/>
</li>
<li>
<label>
实际支付:
</label>
<input
type=
"text"
name=
"memberName"
/>
</li>
<li>
<label>
会员id:
</label>
<input
type=
"text"
name=
"memberId"
/>
</li>
<li>
<label>
会员价格id:
</label>
<input
type=
"text"
name=
"memberPriceId"
/>
</li>
<li>
<label>
购买天数:
</label>
<input
type=
"text"
name=
"days"
/>
</li>
<li>
<label>
订单状态:
</label>
<input
type=
"text"
name=
"state"
/>
</li>
<li>
<label>
会员号:
</label>
<input
type=
"text"
name=
"memberNo"
/>
</li>
<li>
<label>
支付渠道:
</label>
<input
type=
"text"
name=
"payChannel"
/>
</li>
<li>
<label>
支付订单:
</label>
<input
type=
"text"
name=
"payNo"
/>
</li>
<li>
<label>
用户生日:
</label>
<input
type=
"text"
class=
"time-input"
placeholder=
"请选择用户生日"
name=
"birthday"
/>
</li>
<li>
<label>
支付时间:
</label>
<input
type=
"text"
class=
"time-input"
placeholder=
"请选择支付时间"
name=
"paymentAt"
/>
</li>
<li>
<label>
支付时间:
</label>
<input
type=
"text"
class=
"time-input"
placeholder=
"请选择支付时间"
name=
"createdAt"
/>
</li>
<li>
<label>
支付时间:
</label>
<input
type=
"text"
class=
"time-input"
placeholder=
"请选择支付时间"
name=
"updatedAt"
/>
</li>
<li>
<label>
支付时间:
</label>
<input
type=
"text"
name=
"clientIp"
/>
</li>
<li>
<label>
支付时间:
</label>
<input
type=
"text"
name=
"source"
/>
</li>
<li>
<label>
支付时间:
</label>
<input
type=
"text"
name=
"version"
/>
</li>
<li>
<a
class=
"btn btn-primary btn-rounded btn-sm"
onclick=
"$.table.search()"
><i
class=
"fa fa-search"
></i>
搜索
</a>
<a
class=
"btn btn-warning btn-rounded btn-sm"
onclick=
"$.form.reset()"
><i
class=
"fa fa-refresh"
></i>
重置
</a>
</li>
</ul>
</div>
</form>
</div>
<div
class=
"btn-group-sm"
id=
"toolbar"
role=
"group"
>
<a
class=
"btn btn-success"
onclick=
"$.operate.add()"
shiro:hasPermission=
"kylin:order:add"
>
<i
class=
"fa fa-plus"
></i>
添加
</a>
<a
class=
"btn btn-primary single disabled"
onclick=
"$.operate.edit()"
shiro:hasPermission=
"kylin:order:edit"
>
<i
class=
"fa fa-edit"
></i>
修改
</a>
<a
class=
"btn btn-danger multiple disabled"
onclick=
"$.operate.removeAll()"
shiro:hasPermission=
"kylin:order:remove"
>
<i
class=
"fa fa-remove"
></i>
删除
</a>
<a
class=
"btn btn-warning"
onclick=
"$.table.exportExcel()"
shiro:hasPermission=
"kylin:order:export"
>
<i
class=
"fa fa-download"
></i>
导出
</a>
</div>
<div
class=
"col-sm-12 select-table table-striped"
>
<table
id=
"bootstrap-table"
></table>
</div>
</div>
</div>
<th:block
th:include=
"include :: footer"
/>
<script
th:inline=
"javascript"
>
var
editFlag
=
[[
$
{@
permission
.
hasPermi
(
'kylin:order:edit'
)}]];
var
removeFlag
=
[[
$
{@
permission
.
hasPermi
(
'kylin:order:remove'
)}]];
var
prefix
=
ctx
+
"adam/order/orderList"
;
$
(
function
()
{
var
options
=
{
url
:
prefix
+
"/list"
,
createUrl
:
prefix
+
"/add"
,
updateUrl
:
prefix
+
"/edit/{id}"
,
removeUrl
:
prefix
+
"/remove"
,
exportUrl
:
prefix
+
"/export"
,
modalName
:
"【请填写功能名称】"
,
columns
:
[{
checkbox
:
true
},
{
field
:
'mid'
,
title
:
'支付时间'
,
visible
:
false
},
{
field
:
'orderNo'
,
title
:
'支付时间'
},
{
field
:
'uid'
,
title
:
'支付时间'
},
{
field
:
'mode'
,
title
:
'购买方式:0-购买会员 1-购买会员码,2-使用会员码'
},
{
field
:
'price'
,
title
:
'原价'
},
{
field
:
'pricePaid'
,
title
:
'实际支付'
},
{
field
:
'memberName'
,
title
:
'实际支付'
},
{
field
:
'memberId'
,
title
:
'会员id'
},
{
field
:
'memberPriceId'
,
title
:
'会员价格id'
},
{
field
:
'days'
,
title
:
'购买天数'
},
{
field
:
'state'
,
title
:
'订单状态'
},
{
field
:
'memberNo'
,
title
:
'会员号'
},
{
field
:
'payChannel'
,
title
:
'支付渠道'
},
{
field
:
'payNo'
,
title
:
'支付订单'
},
{
field
:
'birthday'
,
title
:
'用户生日'
},
{
field
:
'paymentAt'
,
title
:
'支付时间'
},
{
field
:
'createdAt'
,
title
:
'支付时间'
},
{
field
:
'updatedAt'
,
title
:
'支付时间'
},
{
field
:
'clientIp'
,
title
:
'支付时间'
},
{
field
:
'source'
,
title
:
'支付时间'
},
{
field
:
'version'
,
title
:
'支付时间'
},
{
title
:
'操作'
,
align
:
'center'
,
formatter
:
function
(
value
,
row
,
index
)
{
var
actions
=
[];
actions
.
push
(
'<a class="btn btn-success btn-xs '
+
editFlag
+
'" href="javascript:void(0)" onclick="$.operate.edit(
\'
'
+
row
.
mid
+
'
\'
)"><i class="fa fa-edit"></i>编辑</a> '
);
actions
.
push
(
'<a class="btn btn-danger btn-xs '
+
removeFlag
+
'" href="javascript:void(0)" onclick="$.operate.remove(
\'
'
+
row
.
mid
+
'
\'
)"><i class="fa fa-remove"></i>删除</a>'
);
return
actions
.
join
(
''
);
}
}]
};
$
.
table
.
init
(
options
);
});
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/details.html
View file @
025eb45b
<!DOCTYPE html>
<html
lang=
"zh"
xmlns:th=
"http://www.thymeleaf.org"
xmlns:shiro=
"http://www.pollix.at/thymeleaf/shiro"
>
<html
lang=
"zh"
xmlns:th=
"http://www.thymeleaf.org"
>
<head>
<th:block
th:include=
"include :: header('巡演列表')"
/>
<th:block
th:include=
"include :: header('修改订单')"
/>
<th:block
th:include=
"include :: datetimepicker-css"
/>
</head>
<body
class=
"gray-bg"
>
<div
class=
"container-div"
>
<div
class=
"row"
>
<div
class=
"btn-group-sm"
id=
"toolbar"
role=
"group"
>
<a
class=
"btn btn-success"
onclick=
"$.operate.add()"
shiro:hasPermission=
"kylin:performances:roadShow:change:performance"
>
<i
class=
"fa fa-plus"
></i>
添加
</a>
</div>
<div
class=
"col-sm-12 select-table table-bordered"
>
<table
id=
"bootstrap-table"
></table>
</div>
</div>
<body
class=
"white-bg"
>
<div
class=
"wrapper wrapper-content animated fadeInRight ibox-content"
>
<form
class=
"form-horizontal m"
id=
"form-tickets-edit"
th:object=
"${orderDetailsVo.orderTicketVo}"
>
<input
name=
"mid"
th:field=
"*{mid}"
type=
"hidden"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
order_tickets_id:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"orderTicketsId"
th:field=
"*{orderTicketsId}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
用户id:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"userId"
th:field=
"*{userId}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
用户昵称:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"userName"
th:field=
"*{userName}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
用户手机号:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"userMobile"
th:field=
"*{userMobile}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
演出名称:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"performanceTitle"
th:field=
"*{performanceTitle}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
订单号:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"orderCode"
th:field=
"*{orderCode}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
支付单号:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"payCode"
th:field=
"*{payCode}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
二维码地址:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"qrCode"
th:field=
"*{qrCode}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
下单方式:
</label>
<div
class=
"col-sm-8"
>
<select
name=
"orderType"
class=
"form-control m-b"
required
>
<option
value=
""
>
所有
</option>
</select>
<span
class=
"help-block m-b-none"
><i
class=
"fa fa-info-circle"
></i>
代码生成请选择字典属性
</span>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
下单版本:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"orderVersion"
th:field=
"*{orderVersion}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
数量:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"number"
th:field=
"*{number}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
单价:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"price"
th:field=
"*{price}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
会员单价:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"priceMember"
th:field=
"*{priceMember}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
应付价格:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"priceTotal"
th:field=
"*{priceTotal}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
优惠价格:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"priceVoucher"
th:field=
"*{priceVoucher}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
实付价格:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"priceActual"
th:field=
"*{priceActual}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
快递价格:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"priceExpress"
th:field=
"*{priceExpress}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
退款价格:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"priceRefund"
th:field=
"*{priceRefund}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
退款张数:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"refundNumber"
th:field=
"*{refundNumber}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
选择支付方式:
</label>
<div
class=
"col-sm-8"
>
<select
name=
"payType"
class=
"form-control m-b"
required
>
<option
value=
""
>
所有
</option>
</select>
<span
class=
"help-block m-b-none"
><i
class=
"fa fa-info-circle"
></i>
代码生成请选择字典属性
</span>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
实际支付方式:
</label>
<div
class=
"col-sm-8"
>
<select
name=
"paymentType"
class=
"form-control m-b"
>
<option
value=
""
>
所有
</option>
</select>
<span
class=
"help-block m-b-none"
><i
class=
"fa fa-info-circle"
></i>
代码生成请选择字典属性
</span>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
支付时间:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"timePay"
th:field=
"*{timePay}"
class=
"form-control"
type=
"text"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
收货人:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"expressContacts"
th:field=
"*{expressContacts}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
收货地址:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"expressAddress"
th:field=
"*{expressAddress}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
收货人联系方式:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"expressPhone"
th:field=
"*{expressPhone}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
券使用类别:
</label>
<div
class=
"col-sm-8"
>
<select
name=
"couponType"
class=
"form-control m-b"
required
>
<option
value=
""
>
所有
</option>
</select>
<span
class=
"help-block m-b-none"
><i
class=
"fa fa-info-circle"
></i>
代码生成请选择字典属性
</span>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
取票方式 电子票electronic快递票express:
</label>
<div
class=
"col-sm-8"
>
<select
name=
"getTicketType"
class=
"form-control m-b"
required
>
<option
value=
""
>
所有
</option>
</select>
<span
class=
"help-block m-b-none"
><i
class=
"fa fa-info-circle"
></i>
代码生成请选择字典属性
</span>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
直播用取票观演码,隔开:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"getTicketDescribe"
th:field=
"*{getTicketDescribe}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
订单过期时间(分钟):
</label>
<div
class=
"col-sm-8"
>
<input
name=
"payCountdownMinute"
th:field=
"*{payCountdownMinute}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
comment:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"comment"
th:field=
"*{comment}"
class=
"form-control"
type=
"text"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
创建时间:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"input-group date"
>
<input
name=
"createdAt"
th:value=
"${#dates.format(kylinOrderTickets.createdAt, 'yyyy-MM-dd')}"
class=
"form-control"
placeholder=
"yyyy-MM-dd"
type=
"text"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
修改时间:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"input-group date"
>
<input
name=
"updatedAt"
th:value=
"${#dates.format(kylinOrderTickets.updatedAt, 'yyyy-MM-dd')}"
class=
"form-control"
placeholder=
"yyyy-MM-dd"
type=
"text"
>
<span
class=
"input-group-addon"
><i
class=
"fa fa-calendar"
></i></span>
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
修改时间:
</label>
<div
class=
"col-sm-8"
>
<input
name=
"orderSourece"
th:field=
"*{orderSourece}"
class=
"form-control"
type=
"text"
>
</div>
</div>
</form>
</div>
<th:block
th:include=
"include :: footer"
/>
<th:block
th:include=
"include :: footer"
/>
<th:block
th:include=
"include :: datetimepicker-js"
/>
<script
th:inline=
"javascript"
>
var
removeFlag
=
[[
$
{@
permission
.
hasPermi
(
'kylin:performances:roadShow:change:performance'
)}]];
var
prefix
=
ctx
+
"kylin/performances/roadShow"
;
$
(
function
()
{
var
options
=
{
url
:
prefix
+
"/performance/"
+
'[[${roadShowId}]]'
.
replaceAll
(
"
\"
"
,
""
),
removeUrl
:
prefix
+
"/roadShow/relation"
,
createUrl
:
prefix
+
"/addPerformances/"
+
'[[${roadShowId}]]'
.
replaceAll
(
"
\"
"
,
""
),
modalName
:
"巡演"
,
method
:
"get"
,
columns
:
[{
checkbox
:
true
},
{
field
:
'performancesId'
,
title
:
'演出id'
},
{
field
:
'title'
,
title
:
'巡演名称'
},
{
title
:
'操作'
,
align
:
'center'
,
formatter
:
function
(
value
,
row
,
index
)
{
var
actions
=
[];
actions
.
push
(
'<a class="btn btn-success btn-xs '
+
removeFlag
+
'" href="javascript:void(0)" onclick="$.operate.remove(
\'
'
+
row
.
performancesId
+
'
\'
)"><i class="fa fa-edit"></i>删除</a> '
);
return
actions
.
join
(
''
);
}
}]
};
$
.
table
.
init
(
options
);
var
prefix
=
ctx
+
"kylin/tickets"
;
$
(
"#form-tickets-edit"
).
validate
({
focusCleanup
:
true
});
function
submitHandler
()
{
if
(
$
.
validate
.
form
())
{
$
.
operate
.
save
(
prefix
+
"/edit"
,
$
(
'#form-tickets-edit'
).
serialize
());
}
}
$
(
"input[name='createdAt']"
).
datetimepicker
({
format
:
"yyyy-mm-dd"
,
minView
:
"month"
,
autoclose
:
true
});
$
(
"input[name='updatedAt']"
).
datetimepicker
({
format
:
"yyyy-mm-dd"
,
minView
:
"month"
,
autoclose
:
true
});
</script>
</body>
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @
025eb45b
...
...
@@ -107,16 +107,13 @@
</div>
<th:block
th:include=
"include :: footer"
/>
<script
th:inline=
"javascript"
>
var
editFlag
=
[[
$
{@
permission
.
hasPermi
(
'kylin:tickets:edit'
)}]];
var
removeFlag
=
[[
$
{@
permission
.
hasPermi
(
'kylin:tickets:remove'
)}]];
var
prefix
=
ctx
+
"kylin/tickets"
;
var
detailFlag
=
[[
$
{@
permission
.
hasPermi
(
'kylin:order:orderlist:detail'
)}]];
var
prefix
=
ctx
+
"kylin/order/orderList"
;
$
(
function
()
{
var
options
=
{
url
:
prefix
+
"/list"
,
createUrl
:
prefix
+
"/add"
,
updateUrl
:
prefix
+
"/edit/{id}"
,
removeUrl
:
prefix
+
"/remove"
,
detailUrl
:
prefix
+
"/detail/{id}"
,
exportUrl
:
prefix
+
"/export"
,
modalName
:
"订单"
,
columns
:
[{
...
...
@@ -179,8 +176,7 @@
align
:
'center'
,
formatter
:
function
(
value
,
row
,
index
)
{
var
actions
=
[];
actions
.
push
(
'<a class="btn btn-success btn-xs '
+
editFlag
+
'" href="javascript:void(0)" onclick="$.operate.edit(
\'
'
+
row
.
mid
+
'
\'
)"><i class="fa fa-edit"></i>编辑</a> '
);
actions
.
push
(
'<a class="btn btn-danger btn-xs '
+
removeFlag
+
'" href="javascript:void(0)" onclick="$.operate.remove(
\'
'
+
row
.
mid
+
'
\'
)"><i class="fa fa-remove"></i>删除</a>'
);
actions
.
push
(
'<a class="btn btn-warning btn-xs '
+
detailFlag
+
'" href="javascript:void(0)" onclick="$.operate.detail(
\'
'
+
row
.
orderTicketsId
+
'
\'
)"><i class="fa fa-search"></i>详细</a>'
);
return
actions
.
join
(
''
);
}
}]
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml
View file @
025eb45b
...
...
@@ -28,6 +28,11 @@
<artifactId>
liquidnet-service-kylin-api
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
com.liquidnet
</groupId>
<artifactId>
liquidnet-service-adam-api
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.liquidnet</groupId>-->
<!-- <artifactId>liquidnet-service-adam-api</artifactId>-->
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/domain/AdamUser.java
deleted
100644 → 0
View file @
d89bf177
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
adam
.
domain
;
import
java.util.Date
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
com.liquidnet.client.admin.common.annotation.Excel
;
import
com.liquidnet.client.admin.common.core.domain.BaseEntity
;
/**
* 用户对象 adam_user
*
* @author ruoyi
* @date 2021-05-24
*/
public
class
AdamUser
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Integer
mid
;
/** $column.columnComment */
@Excel
(
name
=
"${comment}"
,
readConverterExp
=
"$column.readConverterExp()"
)
private
String
uid
;
/** $column.columnComment */
@Excel
(
name
=
"${comment}"
,
readConverterExp
=
"$column.readConverterExp()"
)
private
String
mobile
;
/** $column.columnComment */
@Excel
(
name
=
"${comment}"
,
readConverterExp
=
"$column.readConverterExp()"
)
private
String
passwd
;
/** $column.columnComment */
@Excel
(
name
=
"${comment}"
,
readConverterExp
=
"$column.readConverterExp()"
)
private
String
payCode
;
/** 1-NORMAL,2-INVALID */
@Excel
(
name
=
"1-NORMAL,2-INVALID"
)
private
Integer
state
;
/** $column.columnComment */
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"1-NORMAL,2-INVALID"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
createdAt
;
/** $column.columnComment */
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"1-NORMAL,2-INVALID"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
updatedAt
;
/** $column.columnComment */
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"1-NORMAL,2-INVALID"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
closedAt
;
/** $column.columnComment */
@Excel
(
name
=
"1-NORMAL,2-INVALID"
)
private
String
comment
;
public
void
setMid
(
Integer
mid
)
{
this
.
mid
=
mid
;
}
public
Integer
getMid
()
{
return
mid
;
}
public
void
setUid
(
String
uid
)
{
this
.
uid
=
uid
;
}
public
String
getUid
()
{
return
uid
;
}
public
void
setMobile
(
String
mobile
)
{
this
.
mobile
=
mobile
;
}
public
String
getMobile
()
{
return
mobile
;
}
public
void
setPasswd
(
String
passwd
)
{
this
.
passwd
=
passwd
;
}
public
String
getPasswd
()
{
return
passwd
;
}
public
void
setPayCode
(
String
payCode
)
{
this
.
payCode
=
payCode
;
}
public
String
getPayCode
()
{
return
payCode
;
}
public
void
setState
(
Integer
state
)
{
this
.
state
=
state
;
}
public
Integer
getState
()
{
return
state
;
}
public
void
setCreatedAt
(
Date
createdAt
)
{
this
.
createdAt
=
createdAt
;
}
public
Date
getCreatedAt
()
{
return
createdAt
;
}
public
void
setUpdatedAt
(
Date
updatedAt
)
{
this
.
updatedAt
=
updatedAt
;
}
public
Date
getUpdatedAt
()
{
return
updatedAt
;
}
public
void
setClosedAt
(
Date
closedAt
)
{
this
.
closedAt
=
closedAt
;
}
public
Date
getClosedAt
()
{
return
closedAt
;
}
public
void
setComment
(
String
comment
)
{
this
.
comment
=
comment
;
}
public
String
getComment
()
{
return
comment
;
}
@Override
public
String
toString
()
{
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"mid"
,
getMid
())
.
append
(
"uid"
,
getUid
())
.
append
(
"mobile"
,
getMobile
())
.
append
(
"passwd"
,
getPasswd
())
.
append
(
"payCode"
,
getPayCode
())
.
append
(
"state"
,
getState
())
.
append
(
"createdAt"
,
getCreatedAt
())
.
append
(
"updatedAt"
,
getUpdatedAt
())
.
append
(
"closedAt"
,
getClosedAt
())
.
append
(
"comment"
,
getComment
())
.
toString
();
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/mapper/AdamUserMapper.java
deleted
100644 → 0
View file @
d89bf177
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
adam
.
mapper
;
import
java.util.List
;
import
com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser
;
/**
* 用户Mapper接口
*
* @author ruoyi
* @date 2021-05-24
*/
public
interface
AdamUserMapper
{
/**
* 查询用户
*
* @param mid 用户ID
* @return 用户
*/
public
AdamUser
selectAdamUserById
(
Integer
mid
);
/**
* 查询用户列表
*
* @param adamUser 用户
* @return 用户集合
*/
public
List
<
AdamUser
>
selectAdamUserList
(
AdamUser
adamUser
);
/**
* 新增用户
*
* @param adamUser 用户
* @return 结果
*/
public
int
insertAdamUser
(
AdamUser
adamUser
);
/**
* 修改用户
*
* @param adamUser 用户
* @return 结果
*/
public
int
updateAdamUser
(
AdamUser
adamUser
);
/**
* 删除用户
*
* @param mid 用户ID
* @return 结果
*/
public
int
deleteAdamUserById
(
Integer
mid
);
/**
* 批量删除用户
*
* @param mids 需要删除的数据ID
* @return 结果
*/
public
int
deleteAdamUserByIds
(
String
[]
mids
);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/IAdamUserService.java
View file @
025eb45b
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
adam
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.liquidnet.service.adam.entity.AdamUser
;
import
java.util.List
;
import
com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser
;
/**
* 用户Service接口
...
...
@@ -9,7 +11,7 @@ import com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser;
* @author ruoyi
* @date 2021-05-24
*/
public
interface
IAdamUserService
public
interface
IAdamUserService
extends
IService
<
AdamUser
>
{
/**
* 查询用户
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java
0 → 100644
View file @
025eb45b
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
adam
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.service.adam.entity.AdamMemberOrder
;
import
com.liquidnet.service.adam.mapper.AdamMemberOrderMapper
;
import
com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService
;
import
org.springframework.stereotype.Service
;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: AdamMemberOrderAdminServiceImpl
* @Package com.liquidnet.client.admin.zhengzai.adam.service.impl
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/6 16:25
*/
@Service
public
class
AdamMemberOrderAdminServiceImpl
extends
ServiceImpl
<
AdamMemberOrderMapper
,
AdamMemberOrder
>
implements
IAdamMemberOrderAdminService
{
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamUserServiceImpl.java
View file @
025eb45b
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
adam
.
service
.
impl
;
import
java.util.List
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.client.admin.common.core.text.Convert
;
import
com.liquidnet.client.admin.zhengzai.adam.service.IAdamUserService
;
import
com.liquidnet.service.adam.entity.AdamUser
;
import
com.liquidnet.service.adam.mapper.AdamUserMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.liquidnet.client.admin.zhengzai.adam.mapper.AdamUserMapper
;
import
com.liquidnet.client.admin.zhengzai.adam.domain.AdamUser
;
import
com.liquidnet.client.admin.zhengzai.adam.service.IAdamUserService
;
import
com.liquidnet.client.admin.common.core.text.Convert
;
import
java.util.List
;
/**
* 用户Service业务层处理
...
...
@@ -15,80 +17,80 @@ import com.liquidnet.client.admin.common.core.text.Convert;
* @date 2021-05-24
*/
@Service
public
class
AdamUserServiceImpl
implements
IAdamUserService
public
class
AdamUserServiceImpl
extends
ServiceImpl
<
AdamUserMapper
,
AdamUser
>
implements
IAdamUserService
{
@Autowired
private
AdamUserMapper
adamUserMapper
;
/**
* 查询用户
*
*
* @param mid 用户ID
* @return 用户
*/
@Override
public
AdamUser
selectAdamUserById
(
Integer
mid
)
{
return
adamUserMapper
.
select
AdamUser
ById
(
mid
);
return
adamUserMapper
.
selectById
(
mid
);
}
/**
* 查询用户列表
*
*
* @param adamUser 用户
* @return 用户
*/
@Override
public
List
<
AdamUser
>
selectAdamUserList
(
AdamUser
adamUser
)
{
return
adamUserMapper
.
select
AdamUserList
(
adamUser
);
return
adamUserMapper
.
select
List
(
null
);
}
/**
* 新增用户
*
*
* @param adamUser 用户
* @return 结果
*/
@Override
public
int
insertAdamUser
(
AdamUser
adamUser
)
{
return
adamUserMapper
.
insert
AdamUser
(
adamUser
);
return
adamUserMapper
.
insert
(
adamUser
);
}
/**
* 修改用户
*
*
* @param adamUser 用户
* @return 结果
*/
@Override
public
int
updateAdamUser
(
AdamUser
adamUser
)
{
return
adamUserMapper
.
update
AdamUser
(
adamUser
);
return
adamUserMapper
.
update
ById
(
adamUser
);
}
/**
* 删除用户对象
*
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public
int
deleteAdamUserByIds
(
String
ids
)
{
return
adamUserMapper
.
delete
AdamUserByIds
(
Convert
.
toStrArray
(
ids
));
return
adamUserMapper
.
delete
ById
(
Convert
.
toStrArray
(
ids
));
}
/**
* 删除用户信息
*
*
* @param mid 用户ID
* @return 结果
*/
@Override
public
int
deleteAdamUserById
(
Integer
mid
)
{
return
adamUserMapper
.
delete
AdamUser
ById
(
mid
);
return
adamUserMapper
.
deleteById
(
mid
);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java
View file @
025eb45b
...
...
@@ -66,14 +66,14 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
try
{
//查询条件
LambdaQueryWrapper
<
KylinOrderTickets
>
wrapper
=
new
LambdaQueryWrapper
<>();
if
(
!
StringUtils
.
isNotNull
(
orderId
))
{
if
(
StringUtils
.
isNotNull
(
orderId
))
{
wrapper
.
eq
(
KylinOrderTickets:
:
getOrderTicketsId
,
orderId
);
}
KylinOrderTicketVo
orderTicketVo
=
new
KylinOrderTicketVo
();
KylinOrderTickets
kylinOrderTickets
=
kylinOrderTicketsMapper
.
selectOne
(
wrapper
);
//获取订单关联关系
LambdaQueryWrapper
<
KylinOrderTicketRelations
>
relWrapper
=
new
LambdaQueryWrapper
<>();
if
(
!
StringUtils
.
isNotNull
(
orderId
))
{
if
(
StringUtils
.
isNotNull
(
orderId
))
{
relWrapper
.
eq
(
KylinOrderTicketRelations:
:
getOrderId
,
orderId
);
}
KylinOrderTicketRelations
kylinOrderTicketRelations
=
kylinOrderTicketRelationsMapper
.
selectOne
(
relWrapper
);
...
...
@@ -84,7 +84,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
Expresses
expresses
=
expressesMapper
.
selectOne
(
new
UpdateWrapper
<
Expresses
>().
eq
(
"order_id"
,
orderId
).
eq
(
"order_type"
,
"order_ticket"
));
//获取演出信息
LambdaQueryWrapper
<
KylinPerformances
>
perWrapper
=
new
LambdaQueryWrapper
<>();
if
(
!
StringUtils
.
isNotNull
(
orderTicketVo
.
getPerformanceId
()))
{
if
(
StringUtils
.
isNotNull
(
orderTicketVo
.
getPerformanceId
()))
{
perWrapper
.
eq
(
KylinPerformances:
:
getPerformancesId
,
orderTicketVo
.
getPerformanceId
());
}
KylinPerformances
kylinPerformances
=
kylinPerformancesMapper
.
selectOne
(
perWrapper
);
...
...
@@ -92,7 +92,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
BeanUtil
.
copy
(
kylinPerformances
,
performanceVo
);
//获取票种信息
LambdaQueryWrapper
<
KylinTickets
>
ticketsWrapper
=
new
LambdaQueryWrapper
<>();
if
(
!
StringUtils
.
isNotNull
(
orderTicketVo
.
getTicketId
()))
{
if
(
StringUtils
.
isNotNull
(
orderTicketVo
.
getTicketId
()))
{
ticketsWrapper
.
eq
(
KylinTickets:
:
getTicketsId
,
orderTicketVo
.
getTicketId
());
}
KylinTickets
kylinTickets
=
kylinTicketsMapper
.
selectOne
(
ticketsWrapper
);
...
...
@@ -101,7 +101,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
//获取订单持票实体信息
LambdaQueryWrapper
<
KylinOrderTicketEntities
>
ticketsEntitiesWrapper
=
new
LambdaQueryWrapper
<>();
if
(
!
StringUtils
.
isNotNull
(
orderTicketVo
.
getOrderTicketsId
()))
{
if
(
StringUtils
.
isNotNull
(
orderTicketVo
.
getOrderTicketsId
()))
{
ticketsEntitiesWrapper
.
eq
(
KylinOrderTicketEntities:
:
getOrderId
,
orderTicketVo
.
getOrderTicketsId
());
}
List
<
KylinOrderTicketEntitiesVo
>
kylinOrderTicketEntitiesVoList
=
new
ArrayList
<>();
...
...
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderTicketsListDao.java
View file @
025eb45b
...
...
@@ -34,4 +34,5 @@ public class OrderTicketsListDao {
String
userId
;
String
userName
;
String
userMobile
;
String
orderSource
;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @
025eb45b
...
...
@@ -2,22 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper"
>
<resultMap
id=
"orderTicketsListDaoResult"
type=
"com.liquidnet.service.kylin.dao.OrderTicketsListDao"
>
<result
column=
"performances_id"
property=
"performancesId"
/>
<result
column=
"tickets_id"
property=
"ticketsId"
/>
<result
column=
"order_tickets_id"
property=
"orderTicketsId"
/>
<result
column=
"sponsor"
property=
"sponsor"
/>
<result
column=
"order_code"
property=
"orderCode"
/>
<result
column=
"title"
property=
"title"
/>
<result
column=
"status"
property=
"status"
/>
<result
column=
"get_ticket_type"
property=
"getTicketType"
/>
<result
column=
"pay_type"
property=
"payType"
/>
<result
column=
"payment_type"
property=
"paymentType"
/>
<result
column=
"tied"
property=
"tied"
/>
<result
column=
"price"
property=
"price"
/>
<result
column=
"
type"
property=
"type
"
/>
<result
column=
"
use_start"
property=
"useStart
"
/>
<result
column=
"
total_general"
property=
"totalGener
al"
/>
<result
column=
"
sale_general"
property=
"saleGeneral
"
/>
<result
column=
"
surplus_general"
property=
"surplusGener
al"
/>
<result
column=
"
total_sale_price"
property=
"totalSalePrice
"
/>
<result
column=
"
total_exchange"
property=
"totalExchange
"
/>
<result
column=
"
total_refund_general"
property=
"totalRefundGeneral
"
/>
<result
column=
"
total_refund_price"
property=
"totalRefundPrice
"
/>
<result
column=
"
total_member_number"
property=
"totalMemberNumber
"
/>
<result
column=
"
total_paying_number"
property=
"totalPayingNumber
"
/>
<result
column=
"
total_buy_users"
property=
"totalBuyUsers
"
/>
<result
column=
"
number"
property=
"number
"
/>
<result
column=
"
price_member"
property=
"priceMember
"
/>
<result
column=
"
price_total"
property=
"priceTot
al"
/>
<result
column=
"
price_voucher"
property=
"priceVoucher
"
/>
<result
column=
"
price_actual"
property=
"priceActu
al"
/>
<result
column=
"
price_express"
property=
"priceExpress
"
/>
<result
column=
"
price_refund"
property=
"priceRefund
"
/>
<result
column=
"
refund_number"
property=
"refundNumber
"
/>
<result
column=
"
user_id"
property=
"userId
"
/>
<result
column=
"
user_name"
property=
"userName
"
/>
<result
column=
"
user_mobile"
property=
"userMobile
"
/>
<result
column=
"
order_source"
property=
"orderSource
"
/>
</resultMap>
<select
id=
"getPriceNum"
resultType=
"java.util.HashMap"
>
SELECT SUM(o.price_actual) as total_price, SUM(o.number) as total_num
...
...
@@ -84,48 +90,49 @@
kot.refund_number,
kot.user_id,
kot.user_name,
kot.user_mobile
kot.user_mobile,
kot.order_source
FROM kylin_order_tickets kot
inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id
inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
inner join kylin_performances kp on kotr.performance_id = kp.performances_id
<where>
<if
test=
"orderTicketsId != null and orderTicketsId != ''"
>
and order_tickets_id = #{orderTicketsId}
</if>
<if
test=
"userId != null and userId != ''"
>
and user_id = #{userId}
</if>
<if
test=
"userName != null and userName != ''"
>
and user_name like concat('%', #{userName}, '%')
</if>
<if
test=
"userMobile != null and userMobile != ''"
>
and user_mobile = #{userMobile}
</if>
<if
test=
"performanceTitle != null and performanceTitle != ''"
>
and performance_title = #{performanceTitle}
</if>
<if
test=
"orderCode != null and orderCode != ''"
>
and order_code = #{orderCode}
</if>
<if
test=
"payCode != null and payCode != ''"
>
and pay_code = #{payCode}
</if>
<if
test=
"qrCode != null and qrCode != ''"
>
and qr_code = #{qrCode}
</if>
<if
test=
"orderType != null and orderType != ''"
>
and order_type = #{orderType}
</if>
<if
test=
"orderVersion != null and orderVersion != ''"
>
and order_version = #{orderVersion}
</if>
<if
test=
"number != null "
>
and number = #{number}
</if>
<if
test=
"price != null "
>
and price = #{price}
</if>
<if
test=
"priceMember != null "
>
and price_member = #{priceMember}
</if>
<if
test=
"priceTotal != null "
>
and price_total = #{priceTotal}
</if>
<if
test=
"priceVoucher != null "
>
and price_voucher = #{priceVoucher}
</if>
<if
test=
"priceActual != null "
>
and price_actual = #{priceActual}
</if>
<if
test=
"priceExpress != null "
>
and price_express = #{priceExpress}
</if>
<if
test=
"priceRefund != null "
>
and price_refund = #{priceRefund}
</if>
<if
test=
"refundNumber != null "
>
and refund_number = #{refundNumber}
</if>
<if
test=
"payType != null and payType != ''"
>
and pay_type = #{payType}
</if>
<if
test=
"paymentType != null and paymentType != ''"
>
and payment_type = #{paymentType}
</if>
<if
test=
"timePay != null and timePay != ''"
>
and time_pay = #{timePay}
</if>
<if
test=
"expressContacts != null and expressContacts != ''"
>
and express_contacts = #{expressContacts}
</if>
<if
test=
"expressAddress != null and expressAddress != ''"
>
and express_address = #{expressAddress}
</if>
<if
test=
"expressPhone != null and expressPhone != ''"
>
and express_phone = #{expressPhone}
</if>
<if
test=
"couponType != null and couponType != ''"
>
and coupon_type = #{couponType}
</if>
<if
test=
"getTicketType != null and getTicketType != ''"
>
and get_ticket_type = #{getTicketType}
</if>
<if
test=
"getTicketDescribe != null and getTicketDescribe != ''"
>
and get_ticket_describe = #{getTicketDescribe}
</if>
<if
test=
"payCountdownMinute != null "
>
and pay_countdown_minute = #{payCountdownMinute}
</if>
<if
test=
"comment != null and comment != ''"
>
and comment = #{comment}
</if>
<if
test=
"createdAt != null "
>
and created_at = #{createdAt}
</if>
<if
test=
"updatedAt != null "
>
and updated_at = #{updatedAt}
</if>
<if
test=
"orderSour
ece != null and orderSourece != ''"
>
and order_sourece = #{orderSoure
ce}
</if>
<if
test=
"orderTicketsId != null and orderTicketsId != ''"
>
and
kot.
order_tickets_id = #{orderTicketsId}
</if>
<if
test=
"userId != null and userId != ''"
>
and
kot.
user_id = #{userId}
</if>
<if
test=
"userName != null and userName != ''"
>
and
kot.
user_name like concat('%', #{userName}, '%')
</if>
<if
test=
"userMobile != null and userMobile != ''"
>
and
kot.
user_mobile = #{userMobile}
</if>
<if
test=
"performanceTitle != null and performanceTitle != ''"
>
and
kot.
performance_title = #{performanceTitle}
</if>
<if
test=
"orderCode != null and orderCode != ''"
>
and
kot.
order_code = #{orderCode}
</if>
<if
test=
"payCode != null and payCode != ''"
>
and
kot.
pay_code = #{payCode}
</if>
<if
test=
"qrCode != null and qrCode != ''"
>
and
kot.
qr_code = #{qrCode}
</if>
<if
test=
"orderType != null and orderType != ''"
>
and
kot.
order_type = #{orderType}
</if>
<if
test=
"orderVersion != null and orderVersion != ''"
>
and
kot.
order_version = #{orderVersion}
</if>
<if
test=
"number != null "
>
and
kot.
number = #{number}
</if>
<if
test=
"price != null "
>
and
kot.
price = #{price}
</if>
<if
test=
"priceMember != null "
>
and
kot.
price_member = #{priceMember}
</if>
<if
test=
"priceTotal != null "
>
and
kot.
price_total = #{priceTotal}
</if>
<if
test=
"priceVoucher != null "
>
and
kot.
price_voucher = #{priceVoucher}
</if>
<if
test=
"priceActual != null "
>
and
kot.
price_actual = #{priceActual}
</if>
<if
test=
"priceExpress != null "
>
and
kot.
price_express = #{priceExpress}
</if>
<if
test=
"priceRefund != null "
>
and
kot.
price_refund = #{priceRefund}
</if>
<if
test=
"refundNumber != null "
>
and
kot.
refund_number = #{refundNumber}
</if>
<if
test=
"payType != null and payType != ''"
>
and
kot.
pay_type = #{payType}
</if>
<if
test=
"paymentType != null and paymentType != ''"
>
and
kot.
payment_type = #{paymentType}
</if>
<if
test=
"timePay != null and timePay != ''"
>
and
kot.
time_pay = #{timePay}
</if>
<if
test=
"expressContacts != null and expressContacts != ''"
>
and
kot.
express_contacts = #{expressContacts}
</if>
<if
test=
"expressAddress != null and expressAddress != ''"
>
and
kot.
express_address = #{expressAddress}
</if>
<if
test=
"expressPhone != null and expressPhone != ''"
>
and
kot.
express_phone = #{expressPhone}
</if>
<if
test=
"couponType != null and couponType != ''"
>
and
kot.
coupon_type = #{couponType}
</if>
<if
test=
"getTicketType != null and getTicketType != ''"
>
and
kot.
get_ticket_type = #{getTicketType}
</if>
<if
test=
"getTicketDescribe != null and getTicketDescribe != ''"
>
and
kot.
get_ticket_describe = #{getTicketDescribe}
</if>
<if
test=
"payCountdownMinute != null "
>
and
kot.
pay_countdown_minute = #{payCountdownMinute}
</if>
<if
test=
"comment != null and comment != ''"
>
and
kot.
comment = #{comment}
</if>
<if
test=
"createdAt != null "
>
and
kot.
created_at = #{createdAt}
</if>
<if
test=
"updatedAt != null "
>
and
kot.
updated_at = #{updatedAt}
</if>
<if
test=
"orderSour
ce != null and orderSource != ''"
>
and kot.order_source = #{orderSour
ce}
</if>
</where>
<if
test=
"orderItem!=''"
>
ORDER BY ${orderItem} ${orderSc}
</if
>
<!-- <if test="orderItem!=''">--
>
<!-- ORDER BY ${orderItem} ${orderSc}-->
<!-- </if>--
>
</select>
</mapper>
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