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

Skip to content

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

banner 页面 type enum url配置

parent 6d45a994
Show whitespace changes
Inline Side-by-side
Showing with 407 additions and 139 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersDisplayLocation.java 0 → 100644
View file @ 2bcbcf3e
package com.liquidnet.client.admin.common.enums;
import java.util.*;
/**
* <p>
* banner展示位置
* </p>
*
* @author jiangxiulong
* @since 2021-06-08 12:21 下午
*/
public enum BannersDisplayLocation {
DISPLAY_LOCATION1("首页", 1),
DISPLAY_LOCATION4("演出", 4),
DISPLAY_LOCATION3("周边", 3),
DISPLAY_LOCATION5("积分商城", 5),
DISPLAY_LOCATION6("YOUNG BLOOD", 6),
DISPLAY_LOCATION8("视频", 8);
private String name;
private int index;
BannersDisplayLocation(String name, int index) {
this.name = name;
this.index = index;
}
public String getName() {
return this.name;
}
public int getIndex() {
return this.index;
}
private static List<Object> resultTypeListR = null;
static {
ArrayList<Object> resultTypeList = new ArrayList<>();
for (BannersDisplayLocation resultType : BannersDisplayLocation.values()) {
Map<String, Object> mapTemp = new HashMap<>();
mapTemp.put("id", resultType.index);
mapTemp.put("name", resultType.name);
resultTypeList.add(mapTemp);
}
resultTypeListR = Collections.unmodifiableList(resultTypeList);
}
public static List<Object> getResultType() {
return resultTypeListR;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersTargetType.java 0 → 100644
View file @ 2bcbcf3e
package com.liquidnet.client.admin.common.enums;
import org.apache.ibatis.annotations.ResultType;
import java.util.*;
/**
* <p>
* banner跳转类型
* </p>
*
* @author jiangxiulong
* @since 2021-06-08 11:23 上午
*/
public enum BannersTargetType {
TARGET_TYPE1("PGC点播", 1),
TARGET_TYPE2("PGC直播", 2),
TARGET_TYPE5("场地", 5),
TARGET_TYPE6("票务", 6),
TARGET_TYPE7("商品", 7),
TARGET_TYPE8("巡演", 8),
TARGET_TYPE12("活动跳转-可分享", 12),
TARGET_TYPE100("活动跳转", 100),
TARGET_TYPE13("积分商品", 13),
TARGET_TYPE14("商品集合", 14),
TARGET_TYPE20("音乐人", 20),
TARGET_TYPE21("歌曲", 21),
TARGET_TYPE22("专辑", 22),
TARGET_TYPE23("视频播单", 23),
TARGET_TYPE24("音乐人集合", 24),
TARGET_TYPE26("摩登会员", 26),
TARGET_TYPE201("youngBlood报名跳转", 201),
TARGET_TYPE0("不跳转", 0);
private String name;
private int index;
BannersTargetType(String name, int index) {
this.name = name;
this.index = index;
}
public String getName() {
return this.name;
}
public int getIndex() {
return this.index;
}
private static List<Object> resultTypeListR = null;
static {
ArrayList<Object> resultTypeList = new ArrayList<>();
for (BannersTargetType resultType : BannersTargetType.values()) {
Map<String, Object> mapTemp = new HashMap<>();
mapTemp.put("id", resultType.index);
mapTemp.put("name", resultType.name);
resultTypeList.add(mapTemp);
}
resultTypeListR = Collections.unmodifiableList(resultTypeList);
}
public static List<Object> getResultType() {
return resultTypeListR;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java
View file @ 2bcbcf3e
...@@ -4,19 +4,23 @@ import com.github.pagehelper.PageInfo; ...@@ -4,19 +4,23 @@ import com.github.pagehelper.PageInfo;
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;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BannersDisplayLocation;
import com.liquidnet.client.admin.common.enums.BannersTargetType;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinBannersServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinBannersServiceImpl;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.BannerDetailsListDao; import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
import com.liquidnet.service.kylin.dto.param.BannersParam; import com.liquidnet.service.kylin.dto.param.BannersParam;
import com.liquidnet.service.kylin.dto.param.BannersSearchParam; import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
import com.liquidnet.service.kylin.dto.vo.KylinBannersVo; import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* <p> * <p>
* 轮播图 后端管理控制器 * 轮播图 后端管理控制器
...@@ -32,6 +36,37 @@ public class KylinBannersAdminController extends BaseController { ...@@ -32,6 +36,37 @@ public class KylinBannersAdminController extends BaseController {
private String prefix = "zhengzai/kylin/banners"; private String prefix = "zhengzai/kylin/banners";
@Value("${liquidnet.url-banner.provinces}")
private String provinces;
@Value("${liquidnet.url-banner.url1}")
private String url1;
@Value("${liquidnet.url-banner.url2}")
private String url2;
@Value("${liquidnet.url-banner.url5}")
private String url5;
@Value("${liquidnet.url-banner.url6}")
private String url6;
@Value("${liquidnet.url-banner.url7}")
private String url7;
@Value("${liquidnet.url-banner.url8}")
private String url8;
@Value("${liquidnet.url-banner.url13}")
private String url13;
@Value("${liquidnet.url-banner.url14}")
private String url14;
@Value("${liquidnet.url-banner.url20}")
private String url20;
@Value("${liquidnet.url-banner.url21}")
private String url21;
@Value("${liquidnet.url-banner.url22}")
private String url22;
@Value("${liquidnet.url-banner.url23}")
private String url23;
@Value("${liquidnet.url-banner.url24}")
private String url24;
@Value("${liquidnet.url-banner.url26}")
private String url26;
@Autowired @Autowired
private KylinBannersServiceImpl kylinBannersServiceImpl; private KylinBannersServiceImpl kylinBannersServiceImpl;
...@@ -42,8 +77,28 @@ public class KylinBannersAdminController extends BaseController { ...@@ -42,8 +77,28 @@ public class KylinBannersAdminController extends BaseController {
} }
@GetMapping("/create") @GetMapping("/create")
public String create() public String create(ModelMap mmap) {
{ List<Object> bannersTargetType = BannersTargetType.getResultType();
List<Object> bannersDisplayLocation = BannersDisplayLocation.getResultType();
mmap.put("BannersTargetType", bannersTargetType);
mmap.put("BannersDisplayLocation", bannersDisplayLocation);
mmap.put("provinces", provinces);
mmap.put("url1", url1);
mmap.put("url2", url2);
mmap.put("url5", url5);
mmap.put("url6", url6);
mmap.put("url7", url7);
mmap.put("url8", url8);
mmap.put("url13", url13);
mmap.put("url14", url14);
mmap.put("url20", url20);
mmap.put("url21", url21);
mmap.put("url22", url22);
mmap.put("url23", url23);
mmap.put("url24", url24);
mmap.put("url26", url26);
return prefix + "/create"; return prefix + "/create";
} }
...@@ -60,8 +115,7 @@ public class KylinBannersAdminController extends BaseController { ...@@ -60,8 +115,7 @@ public class KylinBannersAdminController extends BaseController {
} }
@GetMapping("/update/{bannersId}") @GetMapping("/update/{bannersId}")
public String update(@PathVariable("bannersId") String bannersId, ModelMap mmap) public String update(@PathVariable("bannersId") String bannersId, ModelMap mmap) {
{
KylinBannersVo result = null; KylinBannersVo result = null;
result = kylinBannersServiceImpl.detail(bannersId); result = kylinBannersServiceImpl.detail(bannersId);
mmap.put("KylinBannersVo", result); mmap.put("KylinBannersVo", result);
...@@ -80,14 +134,14 @@ public class KylinBannersAdminController extends BaseController { ...@@ -80,14 +134,14 @@ public class KylinBannersAdminController extends BaseController {
} }
} }
@RequiresPermissions("kylin:banners:detail") /*@RequiresPermissions("kylin:banners:detail")
@GetMapping("/details/{bannersId}") @GetMapping("/details/{bannersId}")
public String detail(@PathVariable("bannersId") String bannersId, ModelMap mmap) { public String detail(@PathVariable("bannersId") String bannersId, ModelMap mmap) {
KylinBannersVo result = null; KylinBannersVo result = null;
result = kylinBannersServiceImpl.detail(bannersId); result = kylinBannersServiceImpl.detail(bannersId);
mmap.put("KylinBannersVo", result); mmap.put("KylinBannersVo", result);
return prefix + "/details"; return prefix + "/details";
} }*/
@RequiresPermissions("kylin:banners:list") @RequiresPermissions("kylin:banners:list")
@PostMapping("list") @PostMapping("list")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml
View file @ 2bcbcf3e
...@@ -27,6 +27,22 @@ liquidnet: ...@@ -27,6 +27,22 @@ liquidnet:
url-refund: url-refund:
apply: "http://devpay.zhengzai.tv/refund/single" apply: "http://devpay.zhengzai.tv/refund/single"
notify: "https://devzuul.zhengzai.tv/kylin/refund/callback" notify: "https://devzuul.zhengzai.tv/kylin/refund/callback"
url-banner:
provinces: "https://devservice.zhengzai.tv/provinces" #省份
url1: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "https://devmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "https://devmall.zhengzai.tv/admin/performanceListForQuick?page=1&per_page=50&status=3,6,7,8,9,10" #票务
url7: "https://devmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://devmall.zhengzai.tv/admin/roadShowListForQuick?page=1&per_page=50" #巡演
url13: "https://devmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "https://devmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "https://devmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "https://devmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "https://devmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "https://devmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
url24: "https://devmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "https://devpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml
View file @ 2bcbcf3e
...@@ -27,6 +27,22 @@ liquidnet: ...@@ -27,6 +27,22 @@ liquidnet:
url-refund: url-refund:
apply: "http://pay.zhengzai.tv/refund/single" apply: "http://pay.zhengzai.tv/refund/single"
notify: "https://zuul.zhengzai.tv/kylin/refund/callback" notify: "https://zuul.zhengzai.tv/kylin/refund/callback"
url-banner:
provinces: "https://service.zhengzai.tv/provinces" #省份
url1: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "https://mall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "https://mall.zhengzai.tv/admin/performanceListForQuick?page=1&per_page=50&status=3,6,7,8,9,10" #票务
url7: "https://mall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://mall.zhengzai.tv/admin/roadShowListForQuick?page=1&per_page=50" #巡演
url13: "https://mall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "https://mall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "https://merchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "https://merchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "https://merchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "https://mediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
url24: "https://merchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "https://passport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml
View file @ 2bcbcf3e
...@@ -27,6 +27,22 @@ liquidnet: ...@@ -27,6 +27,22 @@ liquidnet:
url-refund: url-refund:
apply: "http://testpay.zhengzai.tv/refund/single" apply: "http://testpay.zhengzai.tv/refund/single"
notify: "https://zuul.zhengzai.tv/kylin/refund/callback" notify: "https://zuul.zhengzai.tv/kylin/refund/callback"
url-banner:
provinces: "https://testservice.zhengzai.tv/provinces" #省份
url1: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "https://testmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "https://testmall.zhengzai.tv/admin/performanceListForQuick?page=1&per_page=50&status=3,6,7,8,9,10" #票务
url7: "https://testmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://testmall.zhengzai.tv/admin/roadShowListForQuick?page=1&per_page=50" #巡演
url13: "https://testmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "https://testmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "https://testmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "https://testmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "https://testmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
url24: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "https://testpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/banners.html
View file @ 2bcbcf3e
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<script th:inline="javascript"> <script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:banners:detail')}]];
var updateFlag = [[${@permission.hasPermi('kylin:banners:update')}]]; var updateFlag = [[${@permission.hasPermi('kylin:banners:update')}]];
var deleteFlag = [[${@permission.hasPermi('kylin:banners:delete')}]]; var deleteFlag = [[${@permission.hasPermi('kylin:banners:delete')}]];
...@@ -73,9 +72,9 @@ ...@@ -73,9 +72,9 @@
$(function () { $(function () {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
updateFlag: prefix + "/update", updateUrl: prefix + "/update",
detailUrl: prefix + "/details/{id}", createUrl: prefix + "/create",
deleteFlag: prefix + "/delete", deleteUrl: prefix + "/delete",
modalName: "-Banner", modalName: "-Banner",
columns: [{ columns: [{
checkbox: true checkbox: true
...@@ -90,7 +89,14 @@ ...@@ -90,7 +89,14 @@
}, },
{ {
field: 'coverImg', field: 'coverImg',
title: '封面图' title: '封面图',
formatter: function(value, row, index) {
return $.table.imageView(value,"300", "600");
}
},
{
field: 'promotionTypeName',
title: '推广类型'
}, },
{ {
field: 'targetType', field: 'targetType',
...@@ -101,7 +107,7 @@ ...@@ -101,7 +107,7 @@
title: '跳转目标' title: '跳转目标'
}, },
{ {
field: 'isOnline', field: 'isOnlineName',
title: '是否上线' title: '是否上线'
}, },
{ {
...@@ -112,10 +118,6 @@ ...@@ -112,10 +118,6 @@
field: 'onlineEndTime', field: 'onlineEndTime',
title: '上线结束时间' title: '上线结束时间'
}, },
{
field: 'promotionType',
title: '推广类型'
},
{ {
field: 'createdAt', field: 'createdAt',
title: '创建时间' title: '创建时间'
...@@ -125,7 +127,6 @@ ...@@ -125,7 +127,6 @@
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-info btn-xs' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="review(\'' + row.orderRefundsId + '\')"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="review(\'' + row.orderRefundsId + '\')"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + deleteFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>删除</a> '); actions.push('<a class="btn btn-danger btn-xs ' + deleteFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>删除</a> ');
return actions.join(''); return actions.join('');
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html
View file @ 2bcbcf3e
...@@ -2,39 +2,101 @@ ...@@ -2,39 +2,101 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org"> <html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<th:block th:include="include :: header('提交订单退款')"/> <th:block th:include="include :: header('提交订单退款')"/>
<th:block th:include="include :: select2-css"/>
<th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-post-add"> <form class="form-horizontal m" id="form-post-add">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">订单id：</label> <label class="col-sm-2 control-label is-required">标题：</label>
<div class="col-sm-8"> <div class="col-sm-10">
<input class="form-control" type="text" name="orderTicketsId" id="orderTicketsId" required> <input class="form-control" type="text" name="banners_id" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">快递费：</label> <label class="col-sm-2 control-label is-required">展示位置</label>
<div class="col-sm-8"> <div class="col-sm-10">
<input class="form-control" type="text" name="RefundPriceExpress"> <label th:each="type : ${BannersDisplayLocation}" class="checkbox-inline">
<input name="positionList[]" th:text="${type.name}" th:value="${type.id}" type="checkbox">
</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">入场人：</label> <label class="col-sm-2 control-label">请选择跳转类型</label>
<div class="col-sm-8"> <div class="col-sm-5">
<div class="col-sm-12 select-table table-bordered"> <select class="form-control" name="target_type">
<table id="bootstrap-table"></table> <option value="">--请选择跳转类型--</option>
<option th:each="type : ${BannersTargetType}" th:text="${type.name}" th:value="${type.id}"></option>
</select>
</div> </div>
<div class="col-sm-5">
<input class="form-control" type="text" name="target_obj" placeholder="请填写url">
<select class="form-control" name="target_obj">
<option value="">--请选择--</option>
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label layui-required is-required">备注：</label> <label class="col-sm-2 control-label">推广省份</label>
<div class="col-sm-8"> <div class="col-sm-10">
<textarea name="reason" maxlength="500" class="form-control layui-required" rows="3"></textarea> <div class="radio check-box">
<label>
<input type="radio" value="1" name="promotionType" checked=""> 全国
</label>
</div>
<div class="radio check-box">
<label>
<input type="radio" value="2" name="promotionType"> 省份
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">请选择省份</label>
<div class="col-sm-5">
<select class="form-control" name="provincesList[]">
<option value="">--请选择省份--</option>
<option value=".NET">.NET</option>
</select>
</div>
<div class="col-sm-5">
<button type="button" class="btn btn-w-m btn-danger">删除</button>
<button type="button" class="btn btn-w-m btn-success">添加</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">是否上线</label>
<div class="col-sm-10">
<div class="radio check-box">
<label>
<input type="radio" value="1" name="is_online" checked=""> <i></i> 上线
</label>
</div>
<div class="radio check-box">
<label>
<input type="radio" value="0" name="is_online"> <i></i> 下线
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">上线开始/结束时间</label>
<div class="col-sm-10">
<div class="input-daterange input-group">
<input name="online_start_time" type="text" class="input-sm form-control" id="laydate-startTime"
placeholder="yyyy-MM-dd HH:mm:ss"/>
<span class="input-group-addon">到</span>
<input name="online_end_time" type="text" class="input-sm form-control" id="laydate-endTime"
placeholder="yyyy-MM-dd HH:mm:ss"/>
</div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: select2-js"/>
<th:block th:include="include :: datetimepicker-js" />
<script type="text/javascript"> <script type="text/javascript">
var prefix = ctx + "kylin/refund"; var prefix = ctx + "kylin/refund";
...@@ -89,11 +151,56 @@ ...@@ -89,11 +151,56 @@
} }
if ($.validate.form()) { if ($.validate.form()) {
var data = $('#form-post-add').serializeArray(); var data = $('#form-post-add').serializeArray();
data.push({"ticketEntityIds":rows.join()}); data.push({"ticketEntityIds": rows.join()});
data.push({"name":"ticketEntityIds","value":rows}); data.push({"name": "ticketEntityIds", "value": rows});
$.operate.save(prefix + "/apply", data); $.operate.save(prefix + "/apply", data);
} }
} }
$(function (){
layui.use('laydate', function(){
var laydate = layui.laydate;
var startDate = laydate.render({
elem: '#laydate-startTime',
type: 'datetime',
max: $('#laydate-endTime').val(),
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// 结束时间大于开始时间
if (value !== '') {
endDate.config.min.year = date.year;
endDate.config.min.month = date.month - 1;
endDate.config.min.date = date.date;
} else {
endDate.config.min.year = '';
endDate.config.min.month = '';
endDate.config.min.date = '';
}
}
});
var endDate = laydate.render({
elem: '#laydate-endTime',
type: 'datetime',
min: $('#laydate-startTime').val(),
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// 开始时间小于结束时间
if (value !== '') {
startDate.config.max.year = date.year;
startDate.config.max.month = date.month - 1;
startDate.config.max.date = date.date;
} else {
startDate.config.max.year = '';
startDate.config.max.month = '';
startDate.config.max.date = '';
}
}
});
});
})
</script> </script>
</body> </body>
</html> </html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/details.html deleted 100644 → 0
View file @ 6d45a994
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('退款详情')"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m-t" id="signupForm">
<div class="form-group">
<label class="col-sm-2 control-label">退款单id：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.orderRefundsId}"></div>
<label class="col-sm-2 control-label">票务订单id：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.orderTicketsId}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">退款编号：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.orderRefundCode}"></div>
<label class="col-sm-2 control-label">退款中心退款编号：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundCode}"></div>
<label class="col-sm-2 control-label">第三方退款编号：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundId}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">退款总金额：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.price}"></div>
<label class="col-sm-2 control-label">退款状态：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.statusName}"></div>
<label class="col-sm-2 control-label">成功退款时间：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundAt}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">申请人名称：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.applicantName}"></div>
<label class="col-sm-2 control-label">申请时间：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.applicantAt}"></div>
<label class="col-sm-2 control-label">申请备注：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.reason}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">审核人名称：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.auditorName}"></div>
<label class="col-sm-2 control-label">审核时间：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.auditorAt}"></div>
<label class="col-sm-2 control-label">审核备注：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.reject}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">执行人名称：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.executorName}"></div>
<label class="col-sm-2 control-label">执行时间：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.executorAt}"></div>
<label class="col-sm-2 control-label">执行备注：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.refuse}"></div>
</div>
<div class="form-group">
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<legend>票种</legend>
</fieldset>
<table class="col-sm-8 select-table table-bordered">
<thead>
<tr>
<th>票种名称</th>
<th>适用日期</th>
<th>入场人</th>
<th>状态</th>
<th>价格</th>
</tr>
</thead>
<tbody>
<tr th:each="v : ${KylinOrderRefundsVo.entities}">
<td th:text="${v.title}"></td>
<td th:text="${v.useStart}"></td>
<td th:text="${v.enterName}"></td>
<td th:text="${v.isPaymentName}"></td>
<td th:text="${v.price}"></td>
</tr>
</tbody>
</table>
</div>
</form>
</div>
<th:block th:include="include :: footer"/>
</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/KylinBannersServiceImpl.java
View file @ 2bcbcf3e
...@@ -219,6 +219,10 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl ...@@ -219,6 +219,10 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
try { try {
PageHelper.startPage(bannersSearchParam.getPageNum(), bannersSearchParam.getPageSize()); PageHelper.startPage(bannersSearchParam.getPageNum(), bannersSearchParam.getPageSize());
List<BannerDetailsListDao> voList = bannersMapper.searchBannersList(BeanUtil.convertBeanToMap(bannersSearchParam)); List<BannerDetailsListDao> voList = bannersMapper.searchBannersList(BeanUtil.convertBeanToMap(bannersSearchParam));
for (BannerDetailsListDao item : voList) {
item.setIsOnlineName(item.getIsOnline());
item.setPromotionTypeName(item.getPromotionType());
}
pageInfoTmp = new PageInfo(voList); pageInfoTmp = new PageInfo(voList);
} catch (Exception e) { } catch (Exception e) {
return new PageInfo(); return new PageInfo();
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/BannerDetailsListDao.java
View file @ 2bcbcf3e
...@@ -19,12 +19,14 @@ public class BannerDetailsListDao implements Serializable { ...@@ -19,12 +19,14 @@ public class BannerDetailsListDao implements Serializable {
private String targetObj; private String targetObj;
private Integer isOnline; private Integer isOnline;
private String isOnlineName;
private String onlineStartTime; private String onlineStartTime;
private String onlineEndTime; private String onlineEndTime;
private Integer promotionType; private Integer promotionType;
private String promotionTypeName;
private Integer bannersSort; private Integer bannersSort;
...@@ -33,4 +35,34 @@ public class BannerDetailsListDao implements Serializable { ...@@ -33,4 +35,34 @@ public class BannerDetailsListDao implements Serializable {
private String createdAt; private String createdAt;
private String updatedAt; private String updatedAt;
public void setIsOnlineName(Integer isOnline){
this.isOnline=isOnline;
switch (isOnline){
case 0:
this.isOnlineName="下线";
break;
case 1:
this.isOnlineName="上线";
break;
default:
this.isOnlineName="--";
break;
}
}
public void setPromotionTypeName(Integer promotionType){
this.promotionType=promotionType;
switch (promotionType){
case 1:
this.promotionTypeName="全国";
break;
case 2:
this.promotionTypeName="省份";
break;
default:
this.promotionTypeName="--";
break;
}
}
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinBannersMapper.xml
View file @ 2bcbcf3e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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.KylinBannersMapper"> <mapper namespace="com.liquidnet.service.kylin.mapper.KylinBannersMapper">
<!-- 详情 --> <select id="detail" parameterType="java.lang.String">
<resultMap id="bannerDetailsResult" type="com.liquidnet.service.kylin.dao.BannerDetailsDao">
<result column="banners_id" property="bannersId"/>
<result column="banners_name" property="bannersName"/>
<result column="cover_img" property="coverImg"/>
<result column="target_type" property="targetType"/>
<result column="target_obj" property="targetObj"/>
<result column="is_online" property="isOnline"/>
<result column="online_start_time" property="onlineStartTime"/>
<result column="online_end_time" property="onlineEndTime"/>
<result column="promotion_type" property="promotionType"/>
<result column="banners_sort" property="bannersSort"/>
<result column="remarks" property="remarks"/>
<result column="created_at" property="createdAt"/>
<result column="updated_at" property="updatedAt"/>
</resultMap>
<select id="detail" parameterType="java.lang.String" resultMap="bannerDetailsResult">
SELECT SELECT
* *
FROM kylin_banners FROM kylin_banners
...@@ -27,7 +11,7 @@ ...@@ -27,7 +11,7 @@
</select> </select>
<!-- admin banner列表 --> <!-- admin banner列表 -->
<select id="searchBannersList" parameterType="java.util.Map" resultType="com.liquidnet.service.kylin.dao.BannerDetailsListDao" resultMap="bannerDetailsResult"> <select id="searchBannersList" parameterType="java.util.Map" resultType="com.liquidnet.service.kylin.dao.BannerDetailsListDao">
SELECT * SELECT *
FROM kylin_banners FROM kylin_banners
<where> <where>
......
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