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

Skip to content

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

Merge remote-tracking branch 'origin/dev' into dev

parents 6ad097b7 f08f55b9
Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 7 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @ 015d178a
......@@ -135,7 +135,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
* @param status 状态
* @return sql 数据
*/
PerformanceMemberAuditDao performanceMemberAuditInfo(String performanceId, int status);
PerformanceMemberAuditDao performanceMemberAuditInfo(String performanceId, Integer status);
//审核 会员信息
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinMemberAuditController.java 0 → 100644
View file @ 015d178a
package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
import com.github.pagehelper.PageInfo;
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.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
import com.liquidnet.service.kylin.dao.PerformanceRecommendDao;
import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
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 java.util.List;
/**
* 演出Controller
*
* @author anjiabin
* @date 2021-05-24
*/
@Controller
@RequestMapping("/kylin/performances/memberAudit")
public class KylinMemberAuditController extends BaseController {
private String prefix = "zhengzai/kylin/performances/memberAudit";
@Autowired
private KylinPerformancesAdminServiceImpl kylinPerformancesService;
@RequiresPermissions("kylin:performances:memberAudit")
@GetMapping()
public String memberAudit() {
return prefix + "/memberAudit";
}
/**
* 会员待审核列表
*/
@RequiresPermissions("kylin:performances:recommend:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(@RequestParam("title") String title, @RequestParam("pageNum") int page, @RequestParam("pageSize") int size) {
startPage();
List<PerformanceTitleDao> result = kylinPerformancesService.performanceMemberList(title, page, size).getList();
return getDataTable(result);
}
@RequiresPermissions("kylin:performances:memberAudit:edit")
@GetMapping("/edit/{performancesId}")
public String edit(@PathVariable("performancesId") String performancesId, Integer status, ModelMap mmap) {
PerformanceMemberAuditDao result = kylinPerformancesService.performanceMemberAuditInfo(performancesId, status);
mmap.put("performanceMemberAuditDao", result);
return prefix + "/edit";
}
@RequiresPermissions("kylin:performances:memberAudit:save")
@PostMapping("/save")
@ResponseBody
public AjaxResult save(@RequestParam("performancesId") String performancesId, @RequestParam("status")Integer status, @RequestParam("rejectTxt")String rejectTxt) {
boolean result = kylinPerformancesService.performanceMemberAudit(performancesId, status, rejectTxt);
return toAjax(result);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/memberAudit/edit.html 0 → 100644
View file @ 015d178a
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('审核演出会员信息')"/>
</head>
<style>
td {
horiz-align: center;
text-align: left;
padding: 10px;
}
</style>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-member-audit" th:object="${performanceMemberAuditDao}">
<div class="form-group">
<div class="col-sm-8">
<input name="performancesId" th:field="*{performancesId}" class="form-control" type="hidden" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">演出名称：</label>
<div class="col-sm-8">
<input th:field="*{title}" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">该演出是否关联会员：</label>
<div class="col-sm-8" th:if="*{isMember==1}">
<div class="radio check-box">
<input type="radio" value="1" checked disabled> 关联会员</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" disabled> 不关联会员</label>
</div>
</div>
<div class="col-sm-8" th:if="*{isMember==0}">
<div class="radio check-box">
<input type="radio" value="1" disabled> 关联会员</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" checked disabled> 不关联会员</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">该演出是否会员专属：</label>
<div class="col-sm-8" th:if="*{isExclusive==1}">
<div class="radio check-box">
<input type="radio" value=1 checked disabled> 会员专属</label>
</div>
<div class="radio check-box">
<input type="radio" value=0 disabled> 不专属</label>
</div>
</div>
<div class="col-sm-8" th:if="*{isExclusive==0}">
<div class="radio check-box">
<input type="radio" value=1 disabled> 会员专属</label>
</div>
<div class="radio check-box">
<input type="radio" value=0 checked disabled> 不专属</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">票种列表：（限购数量0为不限购）：</label>
</div>
<div class="form-group">
<table id="ticket-table" th:border="1">
<tr>
<td>票种名</td>
<td>适用时间</td>
<td>售票状态</td>
<td>开售时间</td>
<td>普通票价</td>
<td>会员优惠</td>
<td>限购数</td>
<td>提前分钟</td>
<tr/>
<div th:each="ticket : ${performanceMemberAuditDao.ticketMemberAudit}">
<tr class="content-tr">
<td th:value="${ticket.title}" th:text="${ticket.title}">
</td>
<td th:value="${ticket.useStart}" th:text="${ticket.useStart}">
</td>
<td th:if="${ticket.status == 1}">审核中</td>
<td th:if="${ticket.status == 3}">审核通过</td>
<td th:if="${ticket.status == 4}">未通过</td>
<td th:if="${ticket.status == 6}">在售</td>
<td th:if="${ticket.status == 7}">下架</td>
<td th:if="${ticket.status == 8}">售罄</td>
<td th:if="${ticket.status == 9}">未开始</td>
<td th:if="${ticket.status == 10}">已结束</td>
<td th:value="${ticket.timeStart}" th:text="${ticket.timeStart}">
</td>
<td th:value="${ticket.price}" th:text="${ticket.price}">
</td>
<td th:text="${ticket.priceDiscountMember}">
</td>
<td th:text="${ticket.memberLimitCount}">
</td>
<td th:text="${ticket.advanceMinuteMember}">
</td>
</tr>
</div>
</table>
<div class="panel-body" th:width="max" style="margin-top: 10px" name="auditBtn">
<div class="radio check-box">
<input type="radio" value="3" name="status"> 同意</label>
</div>
<div class="radio check-box">
<input type="radio" value="4" name="status"> 拒绝</label>
</div>
<input name="rejectTxt" class="form-control" type="text" style="margin-top: 5px"/>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var prefix = ctx + "kylin/performances/memberAudit";
$("#form-performances-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/save", $('#form-member-audit').serialize());
}
}
</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/performances/memberAudit/memberAudit.html 0 → 100644
View file @ 015d178a
<!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="title"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var updateFlag = [[${@permission.hasPermi('kylin:performances:recommend:change')}]];
var removeFlag = [[${@permission.hasPermi('kylin:performances:recommend:change')}]];
var prefix = ctx + "kylin/performances/memberAudit";
$(function () {
var options = {
url: prefix + "/list",
updateUrl: prefix + "/edit/{id}",
modalName: "演出",
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 ' + updateFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.performancesId + '\')"><i class="fa fa-edit"></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-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
View file @ 015d178a
......@@ -422,7 +422,10 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
}
@Override
public PerformanceMemberAuditDao performanceMemberAuditInfo(String performanceId, int status) {
public PerformanceMemberAuditDao performanceMemberAuditInfo(String performanceId, Integer status) {
if(null==status){
status=1;
}
PerformanceMemberAuditParam memberAuditVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(status)), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
if (memberAuditVo == null) {
return null;
......@@ -497,7 +500,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
HashMap<String, Object> map = new HashMap<>();
map.put("isMember", memberAuditVo.getIsMember());
map.put("isExclusive", memberAuditVo.getIsExclusive());
map.put("updatedAt", updatedAt);
map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
map.put("memberPrice", ticketsTime.getPrice().subtract(item.getPriceDiscountMember()));
map.put("memberTimeStart", ticketsTime.getTimeStart().plusMinutes(-ticketsTime.getAdvanceMinuteMember()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
map.put("limitCountMember", item.getMemberLimitCount());
......@@ -520,11 +523,11 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
HashMap<String, Object> map2 = new HashMap<>();
map2.put("status", 3);
map2.put("updatedAt", updatedAt);
map2.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
map2.put("rejectTxt", "");
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map2));
mongoTemplate.getCollection(PerformanceMemberAuditParam.class.getSimpleName()).updateOne(
Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(1)).getQueryObject(),
object);
performanceVoUtils.performanceVoStatus(performanceId);
......@@ -532,15 +535,16 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
} else {
HashMap<String, Object> map2 = new HashMap<>();
map2.put("status", 2);
map2.put("updatedAt", updatedAt);
map2.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
map2.put("rejectTxt", rejectTxt);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map2));
mongoTemplate.getCollection(PerformanceMemberAuditParam.class.getSimpleName()).updateOne(
Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(1)).getQueryObject(),
object);
}
return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
}
......
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