记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit d900e685 authored by 张国柄's avatar 张国柄
Browse files
Options

+兑换券列表页面;

parent 5826517d
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 99 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java
View file @ d900e685
package com.liquidnet.client.admin.web.controller.zhengzai.candy; package com.liquidnet.client.admin.web.controller.zhengzai.candy;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.liquidnet.client.admin.common.annotation.Log; import com.liquidnet.client.admin.common.annotation.Log;
import com.liquidnet.client.admin.common.core.controller.BaseController; import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult; import com.liquidnet.client.admin.common.core.domain.AjaxResult;
...@@ -8,6 +10,7 @@ import com.liquidnet.client.admin.common.enums.BusinessType; ...@@ -8,6 +10,7 @@ import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.common.utils.DateUtils; import com.liquidnet.client.admin.common.utils.DateUtils;
import com.liquidnet.client.admin.common.utils.ShiroUtils; import com.liquidnet.client.admin.common.utils.ShiroUtils;
import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponAdminService; import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponAdminService;
import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponRuleAdminService;
import com.liquidnet.client.admin.zhengzai.candy.service.ICandyMgtCouponAdminService; import com.liquidnet.client.admin.zhengzai.candy.service.ICandyMgtCouponAdminService;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.candy.dto.admin.CandyCouponRuleBuildParam; import com.liquidnet.service.candy.dto.admin.CandyCouponRuleBuildParam;
...@@ -45,6 +48,8 @@ public class CandyMgtCouponAdminController extends BaseController { ...@@ -45,6 +48,8 @@ public class CandyMgtCouponAdminController extends BaseController {
private final String prefix = "zhengzai/candy/coupon/mgt"; private final String prefix = "zhengzai/candy/coupon/mgt";
@Autowired @Autowired
private ICandyMgtCouponAdminService candyMgtCouponAdminService; private ICandyMgtCouponAdminService candyMgtCouponAdminService;
@Autowired
private ICandyCouponRuleAdminService candyCouponRuleAdminService;
@RequiresPermissions("candy:coupon:mgt:view") @RequiresPermissions("candy:coupon:mgt:view")
@GetMapping() @GetMapping()
...@@ -58,6 +63,26 @@ public class CandyMgtCouponAdminController extends BaseController { ...@@ -58,6 +63,26 @@ public class CandyMgtCouponAdminController extends BaseController {
public TableDataInfo list(CandyMgtCouponListParam listParam) { public TableDataInfo list(CandyMgtCouponListParam listParam) {
startPage(); startPage();
List<CandyMgtCouponInfoDto> list = candyMgtCouponAdminService.listForMgtCouponInfoDto(listParam); List<CandyMgtCouponInfoDto> list = candyMgtCouponAdminService.listForMgtCouponInfoDto(listParam);
if (CollectionUtils.isEmpty(list)) {
switch (listParam.getCouType()) {
case 3:
String[] couponIdArr = list.stream().map(CandyMgtCouponInfoDto::getCouponId).toArray(String[]::new);
LambdaQueryWrapper<CandyCouponRule> queryWrapper = Wrappers.lambdaQuery(CandyCouponRule.class);
queryWrapper.in(CandyCouponRule::getCouponId, couponIdArr);
queryWrapper.eq(CandyCouponRule::getState, 1);
queryWrapper.select(CandyCouponRule::getCruleId, CandyCouponRule::getCouponId, CandyCouponRule::getComment);
List<CandyCouponRule> couponRuleList = candyCouponRuleAdminService.list(queryWrapper);
list.stream().forEach(r->{
couponRuleList.forEach(cr -> {
if (r.getCouponId().equals(cr.getCouponId())) {
r.setCouponRuleScopeName(cr.getComment());
}
});
});
break;
}
}
return getDataTable(list); return getDataTable(list);
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon3.html
View file @ d900e685
coupon1.html<!DOCTYPE html> <!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" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('代金券')" /> <th:block th:include="include :: header('兑换券')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="coupon-form"> <form id="coupon-form">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<input type="hidden" name="couType" value="3" /> <input type="hidden" name="couType" value="1" />
<li> <li>
<input type="text" name="keyword" placeholder="搜索"/> <input type="text" name="keyword" placeholder="搜索"/>
</li> </li>
...@@ -36,8 +36,8 @@ coupon1.html<!DOCTYPE html> ...@@ -36,8 +36,8 @@ coupon1.html<!DOCTYPE html>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add(3)" shiro:hasPermission="candy:coupon:mgt:add"> <a class="btn btn-success" onclick="$.operate.addTab(3)" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 新增
</a> </a>
</div> </div>
...@@ -45,9 +45,9 @@ coupon1.html<!DOCTYPE html> ...@@ -45,9 +45,9 @@ coupon1.html<!DOCTYPE html>
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var couponCodeListFlag = [[${@permission.hasPermi('system:role:edit')}]]; var couponCodeListFlag = [[${@permission.hasPermi('system:role:edit')}]];
var prefix = ctx + "candy/coupon/mgt"; var prefix = ctx + "candy/coupon/mgt";
...@@ -64,23 +64,13 @@ coupon1.html<!DOCTYPE html> ...@@ -64,23 +64,13 @@ coupon1.html<!DOCTYPE html>
checkbox: true checkbox: true
}, },
{ {
field: 'valFace', field: 'couponRuleScopeName',
title: '金额' title: '适用演出'
}, },
{ {
field: 'eventAmt', field: 'eventAmt',
title: '数量', title: '数量',
}, },
{
field: 'bindType',
title: '类型',
sortable: true
},
{
field: 'busiType',
title: '适用范围',
sortable: true
},
{ {
field: 'title', field: 'title',
title: '标题', title: '标题',
...@@ -108,7 +98,7 @@ coupon1.html<!DOCTYPE html> ...@@ -108,7 +98,7 @@ coupon1.html<!DOCTYPE html>
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push("<a class='btn btn-default btn-xs " + couponCodeListFlag + "' href='javascript:void(0)' onclick='authUser(" + row.roleId + ")'><i class='fa fa-user'></i></a>"); actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="couponCodeList(\'' + row.couponId + '\')"><i class="fa fa-list-ul"></i>查看码列表</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
...@@ -116,11 +106,11 @@ coupon1.html<!DOCTYPE html> ...@@ -116,11 +106,11 @@ coupon1.html<!DOCTYPE html>
$.table.init(options); $.table.init(options);
}); });
/* 券码列表 */ /* 查看码列表 */
function couponCodeList(couponId) { function couponCodeList(couponId) {
var url = prefix + '/code/' + couponId; var url = 'candy/coupon/code?couponId=' + couponId;
$.modal.openTab("查看码列表", url); $.modal.openTab("查看码列表", url);
} }
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponInfoDto.java
View file @ d900e685
...@@ -49,4 +49,7 @@ public class CandyMgtCouponInfoDto implements Serializable { ...@@ -49,4 +49,7 @@ public class CandyMgtCouponInfoDto implements Serializable {
private LocalDateTime createdAt; private LocalDateTime createdAt;
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
//private String comment; //private String comment;
// 适用演出名称
private String couponRuleScopeName;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment