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

Skip to content

L
liquidnet-bus-v1
Commit e920c7e1 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

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

parents 540f71ed cb4bbe8a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1036 additions and 6 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/LocalAdminController.java
View file @ e920c7e1
......@@ -26,16 +26,16 @@ import java.util.List;
@RequestMapping("local")
public class LocalAdminController extends BaseController
{
private String prefix = "zhengzai/integral";
private String prefix = "zhengzai/stone";
@Autowired
private IAdamUserAdminService adamUserService;
@GetMapping("/integralDetail")
public String integralDetail()
@GetMapping("/integralList")
public String integralList()
{
return prefix + "/integralDetail";
return prefix + "/integralList";
}
@GetMapping("/integralStore")
public String integralStore()
......@@ -52,5 +52,10 @@ public class LocalAdminController extends BaseController
{
return prefix + "/integralOrder";
}
@GetMapping("/integralDetail")
public String integralDetail()
{
return prefix + "/integralDetail";
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html
View file @ e920c7e1
......@@ -239,7 +239,7 @@
</div>
<div class="bottom_btn">
<!-- <button type="button" class="layui-btn btn btn-primary" lay-filter="formDemo" onclick="create()">创建代金券</button> -->
<button type="button" class="btn btn-primary" onclick="create()">创建代金券111</button>
<button type="button" class="btn btn-primary" onclick="create()">创建代金券</button>
</div>
</div>
</form>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralDetail.html 0 → 100644
View file @ e920c7e1
<!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('积分详情')" />
<style>
#toolbar p {
margin: 0;
padding: 0;
padding-bottom: 12px;
border-bottom: 2px solid skyblue;
}
.top_data {
display: flex;
padding: 20px;
}
.top_data_img span {
display: inline-block;
width: 70px;
height: 70px;
background: #ccc;
border-radius: 50%;
}
.top_data_right {
margin-left: 12px;
display: flex;
flex-direction: column;
justify-content: center;
}
.top_data_right .name .nameSp{
margin-left: 12px;
}
.userData {
margin-top: 14px;
display: flex;
}
.userData p {
margin-right: 12px;
}
</style>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<div class="top_data">
<div class="top_data_img">
<span></span>
</div>
<div class="top_data_right">
<div class="name"><span id="name">张三</span><span class="nameSp">17788774478</span></div>
<div class="userData">
<p>积分状态：<span id="status">正常</span></p>
<p>总积分：<span id="scoreAll">1000</span></p>
<p>已使用积分：<span id="scoreUse">300</span></p>
<p>剩余积分：<span id="scoreRest">700</span></p>
</div>
</div>
</div>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<p>积分变更记录</p>
</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 dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
var prefix = ctx + "stone/logs";
var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var couType = [[${couType}]];
$(function () {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add/{id}",
removeUrl: prefix + "/cancel/{id}",
// updateUrl: prefix + "/edit/{id}",
// exportUrl: prefix + "/export",
sortName: "createdAt",
sortOrder: "desc",
modalName: "积分",
columns: [
{
field: 'valFace',
title: '时间',
formatter: function (value, row, index) {
return '¥' + value;
}
},
{
field: 'eventAmt',
title: '类型'
},
{
field: 'bindType',
title: '任务名称',
formatter: function(value, row, index) {
return $.table.selectDictLabel(dicCouponBindType, value);
}
},
{
field: 'busiType',
title: '获得积分',
formatter: function(value, row, index) {
return $.table.selectDictLabel(dicCouponBusiType, value);
}
},
{
field: 'title',
title: '变更原因'
}
]
};
$.table.init(options);
});
getAllData();
function getAllData() {
let uid = getUrlParms('id');
let data = {
uid
}
$.ajax({
type: 'get',
url: prefix + '/details',
data,
success:function(e) {
console.log(e)
if (e.code == 0) {
const { dto } = e.data;
$('#name').text(dto.nickName);
let statusName = '';
$('#scoreAll').text(dto.scoreAll);
$('#scoreUse').text(dto.scoreUse);
$('#scoreRest').text(dto.scoreRest);
if (dto.status == 1) {
statusName = '正常'
} else {
statusName = '冻结'
}
$('#status').text(statusName);
}
}
})
}
function getUrlParms(name){
var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
var r = window.location.search.substr(1).match(reg);
if(r!=null)
return unescape(r[2]);
return null;
}
/* 查看码列表 */
function couponCodeList(couponId) {
var url = 'candy/coupon/code?couponId=' + couponId;
$.modal.openTab("积分明细列表", url);
}
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralList.html 0 → 100644
View file @ e920c7e1
<!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="coupon-form">
<div class="select-list">
<ul>
<input type="hidden" name="couType" th:value="${couType}"/>
<li>
<input type="text" name="mobile" placeholder="请输入手机号码"/>
</li>
<li>
状态：
<select name="status" id="">
<option value="0">全部</option>
<option value="1">正常</option>
<option value="2">冻结</option>
</select>
</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="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-warning" onclick="exportSelected()" shiro:hasPermission="monitor:job: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 dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
var prefix = ctx + "stone/logs";
var prefix2 = ctx + "local";
var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var couType = [[${couType}]];
$(function () {
var options = {
url: prefix + "/list",
detailUrl: prefix + "/integralStoreEdit?id={id}",
removeUrl: prefix + "/cancel/{id}",
// updateUrl: prefix + "/edit/{id}",
// exportUrl: prefix + "/export",
sortName: "createdAt",
sortOrder: "desc",
modalName: "积分",
columns: [
{
checkbox: true
},
{
field: 'nickName',
title: '呢称'
},
{
field: 'mobile',
title: '手机号'
},
{
field: 'scoreAll',
title: '总积分'
},
{
field: 'scoreUse',
title: '已使用积分'
},
{
field: 'scoreRest',
title: '剩余积分'
},
{
field: 'status',
title: '积分状态',
formatter: function (value, row, index) {
if (value == 0) {
return "全部"
} else if (value == 1) {
return "正常"
} else {
return "冻结"
}
}
},
{
title: '操作',
// align: 'center',
formatter: function (value, row, index) {
let dataArr = [];
dataArr.push(`<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="$.operate.detailTab('${row.uid}')"><i class="fa fa-search"></i>查看</span>`)
if (row.status == 1) {
dataArr.push(`<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openModal('${row.uid}', 2, '冻结后，用户将不可使用积分功能')">冻结</span>`)
} else if (row.status == 2) {
dataArr.push(`<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openModal('${row.uid}', 1, '移除冻结后，用户积分账户立即恢复正常使用')">移除冻结</span>`)
}
return dataArr.join(' ')
}
}]
};
$.table.init(options);
});
function openModal(uid, status, title) {
$.modal.confirm(title, function() {
let data = {
status,
uid
}
$.ajax({
type: 'put',
url: prefix + '/change/status',
data,
success:function(e) {
console.log(e)
}
})
});
}
// 导出数据
function exportSelected() {
var userIds = $.table.selectColumns("uid");
var dataParam = $("#export-form").serializeArray();
var tipMsg = "确定导出所有数据吗？";
if($.common.isNotEmpty(userIds)){
tipMsg = "确定导出勾选" + userIds.length + "条数据吗？";
dataParam.push({ "name": "uid", "value": userIds });
}
$.modal.confirm(tipMsg, function() {
$.post('demo/table/exportData', dataParam, function(result) {
if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
} else {
$.modal.alertError(result.msg);
}
});
});
}
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/integral/integralDetail.html → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStore.html
View file @ e920c7e1
......@@ -12,7 +12,24 @@
<ul>
<input type="hidden" name="couType" th:value="${couType}"/>
<li>
<input type="text" name="keyword" placeholder="搜索"/>
<input type="text" name="title" placeholder="请输入商品名称"/>
</li>
<li>
状态：
<select name="state" id="">
<option value="">全部</option>
<option value="">上架中</option>
<option value="">待上架</option>
<option value="">已下架</option>
</select>
</li>
<li>
类型：
<select name="type" id="">
<option value="">全部</option>
<option value="">券</option>
<option value="">商品</option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
......@@ -24,8 +41,8 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:job:export">
<i class="fa fa-download"></i> 导出
<a class="btn btn-warning" th:onclick="$.operate.addTab(1)">
<i class="fa fa-download"></i> 添加商品
</a>
</div>
......@@ -38,84 +55,107 @@
<script th:inline="javascript">
var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
var prefix = ctx + "candy/coupon/mgt";
var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var prefix = ctx + "stone/item";
var prefix2 = ctx;
var couType = [[${couType}]];
$(function () {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add/{id}",
detailUrl: prefix + "/detail/" + couType + "/{id}",
removeUrl: prefix + "/cancel/{id}",
// updateUrl: prefix + "/edit/{id}",
url: prefix2 + "stone/item/list",
createUrl: prefix + "/integralStoreEdit",
detailUrl: prefix + "/integralStoreEdit/${id}",
removeUrl: prefix2 + "cancel/{id}",
updateUrl: prefix + "/integralStoreEdit?id={id}",
// exportUrl: prefix + "/export",
sortName: "createdAt",
sortOrder: "desc",
modalName: "代金券",
modalName: "商品",
columns: [
{
checkbox: true
},
{
field: 'valFace',
title: '呢称',
field: '',
title: '序号',
formatter: function (value, row, index) {
return '¥' + value;
return index + 1
}
},
{
field: 'eventAmt',
title: '手机号'
field: 'targetTitle',
title: '商品名称'
},
{
field: 'bindType',
title: '总积分',
field: 'status',
title: '状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(dicCouponBindType, value);
if (value == 1) {
return "不限"
} else if (value == 2) {
return "定时"
} else {
return "下线"
}
}
},
{
field: 'busiType',
title: '已使用积分',
title: '类型',
formatter: function(value, row, index) {
return $.table.selectDictLabel(dicCouponBusiType, value);
return '券'
}
},
{
field: 'title',
title: '剩余积分'
field: 'score',
title: '所需积分'
},
{
field: 'notice',
title: '积分状态'
field: 'limitCount',
title: '每人限兑次数'
},
{
field: 'generalSurplus',
title: '已兑换数量'
},
{
field: 'generalTotal',
title: '剩余库存'
},
{
field: 'createdAt',
title: '创建时间'
},
{
title: '操作',
// align: 'center',
formatter: function (value, row, index) {
let dataArr = [];
return `<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openModal('${index}')"><i class="fa fa-search"></i>查看</span>
<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openModal('${index}')"><i class="fa fa-search"></i>加入黑名单</span>`
return `<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="$.operate.editTab('${row.itemId}')">编辑</span>
<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', 7, '确定下架此商品吗？')">下架</span>
<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', '-1', '确定删除此商品吗？')">删除</span>`
}
}]
};
$.table.init(options);
});
/* 查看码列表 */
function couponCodeList(couponId) {
var url = 'candy/coupon/code?couponId=' + couponId;
$.modal.openTab("积分明细列表", url);
}
function openModal(id) {
function openShelvesModal(id, status, notice) {
// console.log('111111')
$.modal.confirm("加入黑名单后，用户将不可使用积分功能", function() {
console.log(12121212)
// $.operate.post(prefix + "/edit_onsale", { "memberId": memberId, "onsale": 2 });
$.modal.confirm(notice, function() {
console.log(id, status)
$.ajax({
type: 'put',
url: '/stone/item/change/status',
data: {
itemId: id,
status
},
success:function(e) {
console.log(e)
layer.msg("操作成功！")
$("button[name=refresh]").click()
}
})
});
}
</script>
......
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