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

Skip to content

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

~券发放+复用逻辑;

parent 8ff35dfb
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 20 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html
View file @ fc10902e
......@@ -266,6 +266,17 @@
</body>
<script th:inline="javascript">
var phpMallUrl = [[${phpMallUrl}]];
var mgtCouponInfoDto = /*[[${mgtCouponInfoDto}]]*/{};
var couponRule = /*[[${couponRule}]]*/{};
var performanceSimpleAllDao = /*[[${performanceSimpleAllDao}]]*/{};
if (!$.isEmptyObject(mgtCouponInfoDto)) {// 非空表示复用
console.log(">>>复用");
console.log(mgtCouponInfoDto);
console.log(couponRule);
console.log(performanceSimpleAllDao);
}
var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
let prefix = ctx;
let typeOne = '0'; // 类别
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add101.html
View file @ fc10902e
......@@ -274,6 +274,17 @@
</body>
<script th:inline="javascript">
var phpMallUrl = [[${phpMallUrl}]];
var mgtCouponInfoDto = /*[[${mgtCouponInfoDto}]]*/{};
var couponRule = /*[[${couponRule}]]*/{};
var performanceSimpleAllDao = /*[[${performanceSimpleAllDao}]]*/{};
if (!$.isEmptyObject(mgtCouponInfoDto)) {// 非空表示复用
console.log(">>>复用");
console.log(mgtCouponInfoDto);
console.log(couponRule);
console.log(performanceSimpleAllDao);
}
var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
let prefix = ctx;
let typeOne = '3'; // 类别
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html
View file @ fc10902e
......@@ -268,6 +268,17 @@
</body>
<script th:inline="javascript">
var phpMallUrl = [[${phpMallUrl}]];
var mgtCouponInfoDto = /*[[${mgtCouponInfoDto}]]*/{};
var couponRule = /*[[${couponRule}]]*/{};
var performanceSimpleAllDao = /*[[${performanceSimpleAllDao}]]*/{};
if (!$.isEmptyObject(mgtCouponInfoDto)) {// 非空表示复用
console.log(">>>复用");
console.log(mgtCouponInfoDto);
console.log(couponRule);
console.log(performanceSimpleAllDao);
}
var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
let prefix = ctx;
let typeOne = '0'; // 类别
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add3.html
View file @ fc10902e
......@@ -201,6 +201,17 @@
</body>
<script th:inline="javascript">
var phpMallUrl = [[${phpMallUrl}]];
var mgtCouponInfoDto = /*[[${mgtCouponInfoDto}]]*/{};
var couponRule = /*[[${couponRule}]]*/{};
var performanceSimpleAllDao = /*[[${performanceSimpleAllDao}]]*/{};
if (!$.isEmptyObject(mgtCouponInfoDto)) {// 非空表示复用
console.log(">>>复用");
console.log(mgtCouponInfoDto);
console.log(couponRule);
console.log(performanceSimpleAllDao);
}
var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
let prefix = ctx;
let searchVal = ''; // 输入框内数据
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add4.html
View file @ fc10902e
......@@ -255,6 +255,17 @@
</body>
<script th:inline="javascript">
var phpMallUrl = [[${phpMallUrl}]];
var mgtCouponInfoDto = /*[[${mgtCouponInfoDto}]]*/{};
var couponRule = /*[[${couponRule}]]*/{};
var performanceSimpleAllDao = /*[[${performanceSimpleAllDao}]]*/{};
if (!$.isEmptyObject(mgtCouponInfoDto)) {// 非空表示复用
console.log(">>>复用");
console.log(mgtCouponInfoDto);
console.log(couponRule);
console.log(performanceSimpleAllDao);
}
var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
let prefix = ctx;
let typeOne = '2'; // 类别
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon1.html
View file @ fc10902e
......@@ -37,11 +37,11 @@
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 新增
<i class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
......@@ -53,7 +53,8 @@
var prefix = ctx + "candy/coupon/mgt";
var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var reuseMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:reuse')}]];
// var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var couType = [[${couType}]];
......@@ -129,6 +130,7 @@
// align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-default btn-xs ' + reuseMgtCouponFlag + '" href="javascript:void(0)" onclick="reuseMgtCoupon(\'' + row.mcouponId + '\')"><i class="fa fa-copy"></i>复用</a>');
actions.push('<a class="btn btn-warning btn-xs ' + viewMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.mcouponId + '\')"><i class="fa fa-search"></i>详情</a>');
// if (row.state === 0) {
// actions.push('<a class="btn btn-danger btn-xs ' + cancelMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mcouponId + '\')"><i class="fa fa-remove"></i>取消</a>');
......@@ -148,6 +150,11 @@
var url = 'candy/coupon/code?couponId=' + couponId;
$.modal.openTab("代金码列表", url);
}
/* 复用发放 */
function reuseMgtCoupon(mcouponId) {
var url = 'candy/coupon/mgt/reuse/' + couType + '/' + mcouponId;
$.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/candy/coupon/mgt/coupon101.html
View file @ fc10902e
<!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('兑换券')" />
<th:block th:include="include :: header('优先券')" />
</head>
<body class="gray-bg">
<div class="container-div">
......@@ -37,11 +37,11 @@
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 新增
<i class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
......@@ -51,7 +51,8 @@
var prefix = ctx + "candy/coupon/mgt";
var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var reuseMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:reuse')}]];
// var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var couType = [[${couType}]];
......@@ -110,6 +111,7 @@
// align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-default btn-xs ' + reuseMgtCouponFlag + '" href="javascript:void(0)" onclick="reuseMgtCoupon(\'' + row.mcouponId + '\')"><i class="fa fa-copy"></i>复用</a>');
actions.push('<a class="btn btn-warning btn-xs ' + viewMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.mcouponId + '\')"><i class="fa fa-search"></i>详情</a>');
// if (row.state === 0) {
// actions.push('<a class="btn btn-danger btn-xs ' + cancelMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mcouponId + '\')"><i class="fa fa-remove"></i>取消</a>');
......@@ -129,6 +131,11 @@
var url = 'candy/coupon/code?couponId=' + couponId;
$.modal.openTab("查看码列表", url);
}
/* 复用发放 */
function reuseMgtCoupon(mcouponId) {
var url = 'candy/coupon/mgt/reuse/' + couType + '/' + mcouponId;
$.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/candy/coupon/mgt/coupon2.html
View file @ fc10902e
......@@ -37,11 +37,11 @@
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 新增
<i class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
......@@ -53,7 +53,8 @@
var prefix = ctx + "candy/coupon/mgt";
var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var reuseMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:reuse')}]];
// var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var couType = [[${couType}]];
......@@ -129,6 +130,7 @@
// align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-default btn-xs ' + reuseMgtCouponFlag + '" href="javascript:void(0)" onclick="reuseMgtCoupon(\'' + row.mcouponId + '\')"><i class="fa fa-copy"></i>复用</a>');
actions.push('<a class="btn btn-warning btn-xs ' + viewMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.mcouponId + '\')"><i class="fa fa-search"></i>详情</a>');
// if (row.state === 0) {
// actions.push('<a class="btn btn-danger btn-xs ' + cancelMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mcouponId + '\')"><i class="fa fa-remove"></i>取消</a>');
......@@ -148,6 +150,11 @@
var url = 'candy/coupon/code?couponId=' + couponId;
$.modal.openTab("满减码列表", url);
}
/* 复用发放 */
function reuseMgtCoupon(mcouponId) {
var url = 'candy/coupon/mgt/reuse/' + couType + '/' + mcouponId;
$.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/candy/coupon/mgt/coupon3.html
View file @ fc10902e
......@@ -37,11 +37,11 @@
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 新增
<i class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
......@@ -51,7 +51,8 @@
var prefix = ctx + "candy/coupon/mgt";
var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var reuseMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:reuse')}]];
// var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var couType = [[${couType}]];
......@@ -110,6 +111,7 @@
// align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-default btn-xs ' + reuseMgtCouponFlag + '" href="javascript:void(0)" onclick="reuseMgtCoupon(\'' + row.mcouponId + '\')"><i class="fa fa-copy"></i>复用</a>');
actions.push('<a class="btn btn-warning btn-xs ' + viewMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.mcouponId + '\')"><i class="fa fa-search"></i>详情</a>');
// if (row.state === 0) {
// actions.push('<a class="btn btn-danger btn-xs ' + cancelMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mcouponId + '\')"><i class="fa fa-remove"></i>取消</a>');
......@@ -129,6 +131,11 @@
var url = 'candy/coupon/code?couponId=' + couponId;
$.modal.openTab("兑换码列表", url);
}
/* 复用发放 */
function reuseMgtCoupon(mcouponId) {
var url = 'candy/coupon/mgt/reuse/' + couType + '/' + mcouponId;
$.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/candy/coupon/mgt/coupon4.html
View file @ fc10902e
......@@ -37,11 +37,11 @@
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 新增
<i class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
......@@ -53,7 +53,8 @@
var prefix = ctx + "candy/coupon/mgt";
var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var reuseMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:reuse')}]];
// var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
var couType = [[${couType}]];
......@@ -129,6 +130,7 @@
// align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-default btn-xs ' + reuseMgtCouponFlag + '" href="javascript:void(0)" onclick="reuseMgtCoupon(\'' + row.mcouponId + '\')"><i class="fa fa-copy"></i>复用</a>');
actions.push('<a class="btn btn-warning btn-xs ' + viewMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.mcouponId + '\')"><i class="fa fa-search"></i>详情</a>');
// if (row.state === 0) {
// actions.push('<a class="btn btn-danger btn-xs ' + cancelMgtCouponFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mcouponId + '\')"><i class="fa fa-remove"></i>取消</a>');
......@@ -148,6 +150,11 @@
var url = 'candy/coupon/code?couponId=' + couponId;
$.modal.openTab("折扣码列表", url);
}
/* 复用发放 */
function reuseMgtCoupon(mcouponId) {
var url = 'candy/coupon/mgt/reuse/' + couType + '/' + mcouponId;
$.modal.openTab("添加折扣券", url);
}
</script>
</body>
</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 @ fc10902e
......@@ -16,7 +16,7 @@ public class CandyMgtCouponInfoDto implements Serializable {
private String title;
private String label;
private String notice;
private Integer exclusive;
// private Integer exclusive;
private Integer busiType;
private Integer couType;
private Integer bindType;
......@@ -45,6 +45,7 @@ public class CandyMgtCouponInfoDto implements Serializable {
private Integer eventType;
private String eventLimit;
private String eventAt;
private Integer exclusively;
private String operator;
private String createdAt;
private String updatedAt;
......
liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyCoupon.java
View file @ fc10902e
......@@ -60,7 +60,7 @@ public class CandyCoupon implements Serializable {
private Integer busiType;
/**
* 券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券|101-优先券]
* 券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券｜101-优先券]
*/
private Integer couType;
......
liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyMgtCouponMapper.xml
View file @ fc10902e
......@@ -8,7 +8,7 @@
<result column="title" jdbcType="VARCHAR" property="title"/>
<result column="label" jdbcType="VARCHAR" property="label"/>
<result column="notice" jdbcType="VARCHAR" property="notice"/>
<result column="exclusive" jdbcType="SMALLINT" property="exclusive"/>
<!-- <result column="exclusive" jdbcType="SMALLINT" property="exclusive"/>-->
<result column="busi_type" jdbcType="SMALLINT" property="busiType"/>
<result column="cou_type" jdbcType="SMALLINT" property="couType"/>
<result column="bind_type" jdbcType="SMALLINT" property="bindType"/>
......@@ -37,6 +37,7 @@
<result column="event_type" jdbcType="TINYINT" property="eventType"/>
<result column="event_limit" jdbcType="VARCHAR" property="eventLimit"/>
<result column="event_at" jdbcType="VARCHAR" property="eventAt"/>
<result column="exclusively" jdbcType="TINYINT" property="exclusively"/>
<result column="operator" jdbcType="VARCHAR" property="operator"/>
<result column="created_at" jdbcType="VARCHAR" property="createdAt"/>
<result column="updated_at" jdbcType="VARCHAR" property="updatedAt"/>
......@@ -89,7 +90,7 @@
cc.title,
cc.`label`,
cc.notice,
cc.`exclusive`,
# cc.`exclusive`,
cc.busi_type,
cc.cou_type,
cc.bind_type,
......@@ -113,6 +114,7 @@
cmc.event_type,
cmc.event_limit,
cmc.event_at,
cmc.exclusively,
cmc.`operator`,
cmc.created_at created_at,
cmc.updated_at
......
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