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

Skip to content

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

去掉巡演跳转 票务更新新接口并特殊处理 去掉redis mongoupdate改成批量

parent cb21a86f
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 32 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersTargetType.java
View file @ 27676374
......@@ -19,7 +19,7 @@ public enum BannersTargetType {
TARGET_TYPE5("场地", 5),
TARGET_TYPE6("票务", 6),
TARGET_TYPE7("商品", 7),
TARGET_TYPE8("巡演", 8),
// TARGET_TYPE8("巡演", 8),
TARGET_TYPE12("活动跳转-可分享", 12),
TARGET_TYPE100("活动跳转", 100),
TARGET_TYPE13("积分商品", 13),
......
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 @ 27676374
......@@ -27,7 +27,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml
View file @ 27676374
......@@ -32,9 +32,9 @@ liquidnet:
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" #票务
url6: "https://devzuul.zhengzai.tv/kylin/performances/roadShow/performance/status?pageNum=1&pageSize=50&status=3,6,7,8,9,10&title=''" #票务
url7: "https://devmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://devmall.zhengzai.tv/admin/roadShowListForQuick?page=1&per_page=50" #巡演
url8: "https://devzuul.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=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" #音乐人
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml
View file @ 27676374
......@@ -32,9 +32,9 @@ liquidnet:
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" #票务
url6: "https://zuul.zhengzai.tv/kylin/performances/roadShow/performance/status?pageNum=1&pageSize=50&status=3,6,7,8,9,10&title=''" #票务
url7: "https://mall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://mall.zhengzai.tv/admin/roadShowListForQuick?page=1&per_page=50" #巡演
url8: "https://zuul.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=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" #音乐人
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml
View file @ 27676374
......@@ -32,9 +32,9 @@ liquidnet:
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" #票务
url6: "https://zuul.zhengzai.tv/kylin/kylin/performances/roadShow/performance/status?pageNum=1&pageSize=50&status=3,6,7,8,9,10&title=''" #票务
url7: "https://testmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://testmall.zhengzai.tv/admin/roadShowListForQuick?page=1&per_page=50" #巡演
url8: "https://zuul.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=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" #音乐人
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html
View file @ 27676374
......@@ -315,12 +315,24 @@
// $.modal.loading("正在处理中，请稍后...");
},
success: function (result) {
var data = result.data;
var data = [];
var html = '<option value="">--请选择--</option>';
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].id + '">' + data[i].title + '</option>';
if (6 == targetType) {
data = result.rows;
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].performancesId + '">' + data[i].title + '</option>';
}
} else if(8 == targetType) {
data = result.rows;
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].roadShowId + '">' + data[i].title + '</option>';
}
} else {
data = result.data
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].id + '">' + data[i].title + '</option>';
}
}
;
$("#targetObjSelectShow").show();
$("#targetObjInput").hide();
$("#targetObjSelect").html(html);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/update.html
View file @ 27676374
......@@ -4,7 +4,7 @@
<th:block th:include="include :: header('修改banner')"/>
<th:block th:include="include :: select2-css"/>
<th:block th:include="include :: datetimepicker-css"/>
<th:block th:include="include :: bootstrap-fileinput-css" />
<th:block th:include="include :: bootstrap-fileinput-css"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
......@@ -125,7 +125,7 @@
<th:block th:include="include :: footer"/>
<th:block th:include="include :: select2-js"/>
<th:block th:include="include :: datetimepicker-js"/>
<th:block th:include="include :: bootstrap-fileinput-js" />
<th:block th:include="include :: bootstrap-fileinput-js"/>
<script type="text/javascript">
var prefix = ctx + "kylin/banners";
var provinces = "[[${provinces}]]";
......@@ -260,10 +260,10 @@
form.render();*/
});
$('body').on('click', '.provincesDel', function (){
$('body').on('click', '.provincesDel', function () {
$(this).parents('.provincesAll').remove();
})
$('body').on('click', '.provincesAdd', function (){
$('body').on('click', '.provincesAdd', function () {
var selecthtml = $('.provincesList').eq(0).select2("destroy").html();
var html = '<div class="col-sm-12 provincesAll">' +
' <label class="col-sm-2 control-label"></label>' +
......@@ -332,12 +332,24 @@
// $.modal.loading("正在处理中，请稍后...");
},
success: function (result) {
var data = result.data;
var data = [];
var html = '<option value="">--请选择--</option>';
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].id + '">' + data[i].title + '</option>';
if (6 == targetType) {
data = result.rows;
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].performancesId + '">' + data[i].title + '</option>';
}
} else if(8 == targetType) {
data = result.rows;
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].roadShowId + '">' + data[i].title + '</option>';
}
} else {
data = result.data
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].id + '">' + data[i].title + '</option>';
}
}
;
$("#targetObjSelect").html(html);
$("#targetObjSelectShow").show();
$("#targetObjInput").hide();
......@@ -369,7 +381,7 @@
"https://img.zhengzai.tv/" + coverImg
]
});
$("#fileinput-demo-1").on("fileuploaded", function(event, data, previewId, index) {
$("#fileinput-demo-1").on("fileuploaded", function (event, data, previewId, index) {
$("#coverImg").val(data.response.uploadpath)
});
})
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performances.html
View file @ 27676374
......@@ -120,6 +120,10 @@
field: 'title',
title: '演出名称'
},
{
field: 'performancesId',
title: '演出id'
},
{
field: 'timeStart',
title: '开演时间'
......
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 @ 27676374
......@@ -11,7 +11,6 @@ import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
import com.liquidnet.service.kylin.dto.param.BannersParam;
import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
......@@ -36,8 +35,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -272,14 +269,11 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
map.put("updatedAt", updatedAtString);
map.put("isDeleted", 0);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
for (String id : bannersId) {
Document doc = mongoTemplate.getCollection(KylinBannersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("bannersId").is(id)).getQueryObject(),
object,
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
}
Document doc = mongoTemplate.getCollection(KylinBannersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("bannersId").in(bannersId)).getQueryObject(),
object,
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
return true;
} catch (Exception e) {
......
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