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

Skip to content

L
liquidnet-bus-v1
Commit 24c69e11 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'dev' into test

parents 4074fc09 3ce4eb7c
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 82 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/admin/OrderListReq.java
View file @ 24c69e11
......@@ -19,6 +19,7 @@ public class OrderListReq {
private String timePayStart;
private String timePayEnd;
private String sponsorId;
private String sponsor;
private String paymentType;
private String orderStatus;
private String orderSource;
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @ 24c69e11
......@@ -175,4 +175,6 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
KylinPerformanceDamaiVo getPerformanceDamai(String performancesId);
List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);
List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType);
}
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 @ 24c69e11
......@@ -261,6 +261,7 @@ public class KylinBannersAdminController extends BaseController {
ossClient.putObject(putObjectRequest);
ossClient.shutdown();
file.delete();
HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("uploadpath", uploadpath);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderTicketsController.java
View file @ 24c69e11
package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
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.service.kylin.dao.OrderTicketsListDao;
import com.liquidnet.service.kylin.dao.PerformanceSponsorDao;
import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -29,6 +32,9 @@ public class KylinOrderTicketsController extends BaseController
@Autowired
private IKylinOrderTicketsAdminService iKylinOrderTicketsAdminService;
@Autowired
private IKylinPerformancesAdminService kylinPerformancesService;
@RequiresPermissions("kylin:order:orderlist:view")
@GetMapping("/orderList")
public String tickets()
......@@ -60,4 +66,17 @@ public class KylinOrderTicketsController extends BaseController
return prefix + "/orderList/details";
}
/**
* 获取第三方列表
*/
@GetMapping("/orderList/getSponsorList")
@ResponseBody
public AjaxResult getSponsorList() {
List<PerformanceSponsorDao> performanceSponsorList = kylinPerformancesService.getPerformanceSponsorList(null);
AjaxResult ajax = new AjaxResult();
ajax.put("code", 200);
ajax.put("value", performanceSponsorList);
return ajax;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml
View file @ 24c69e11
......@@ -39,7 +39,7 @@ 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://devkylin.zhengzai.tv/kylin/performances/roadShow/performance/status?pageNum=1&pageSize=50&status=3,6,7,8,9,10&title=''" #票务
url6: "/kylin/performances/recommend/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://devkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
url13: "https://devmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml
View file @ 24c69e11
......@@ -32,7 +32,7 @@ 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://kylin.zhengzai.tv/kylin/performances/roadShow/performance/status?pageNum=1&pageSize=50&status=3,6,7,8,9,10&title=''" #票务
url6: "/kylin/performances/recommend/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://kylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
url13: "https://mall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml
View file @ 24c69e11
......@@ -39,7 +39,7 @@ 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://testkylin.zhengzai.tv/kylin/kylin/performances/roadShow/performance/status?pageNum=1&pageSize=50&status=3,6,7,8,9,10&title=''" #票务
url6: "/kylin/performances/recommend/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://testkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
url13: "https://testmall.zhengzai.tv/admin/integrationListForQuick?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 @ 24c69e11
......@@ -305,6 +305,8 @@
} else {
var urlVarName = 'url' + targetType;
var url = eval(urlVarName);
var arrEntities = {'lt':'<','gt':'>','nbsp':' ','amp':'&','quot':'"'};
url = url.replace(/&(lt|gt|nbsp|amp|quot);/ig,function(all,t){return arrEntities[t];});
// 获取相关数据
var configUrl = {
url: url,
......@@ -318,7 +320,7 @@
var data = [];
var html = '<option value="">--请选择--</option>';
if (6 == targetType) {
data = result.rows;
data = result.value;
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].performancesId + '">' + data[i].title + '</option>';
}
......@@ -327,6 +329,16 @@
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].roadShowId + '">' + data[i].title + '</option>';
}
} else if(24 == targetType) {
data = result.data;
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].id + '">' + data[i].collect_name + '</option>';
}
} else if(26 == targetType) {
data = result.data;
for (var i = 0, l = data.length; i < l; i++) {
html += '<option value="' + data[i].id + '">' + data[i].name + '</option>';
}
} else {
data = result.data
for (var i = 0, l = data.length; i < l; i++) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @ 24c69e11
......@@ -30,10 +30,32 @@
</li>
<li>
<label>第三方：</label>
<select name="sponsorId">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
<div class="col-lg-3">
<div class="input-group">
<input type="text" class="form-control" id="sponsorSelectDiv" name="sponsor">
<div class="input-group-btn">
<button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
</ul>
</div>
</div>
</div>
<!-- <div class="input-group">-->
<!-- <input type="text" class="form-control" id="sponsorSelectDiv">-->
<!-- <div class="input-group-btn">-->
<!-- <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">-->
<!-- <span class="caret"></span>-->
<!-- </button>-->
<!-- <ul class="dropdown-menu dropdown-menu-right" role="menu">-->
<!-- </ul>-->
<!-- </div>-->
<!-- </div>-->
<!-- <select name="sponsorId">-->
<!-- <option value="">所有</option>-->
<!-- <option value="-1">代码生成请选择字典属性</option>-->
<!-- </select>-->
</li>
<li>
<label>支付方式：</label>
......@@ -104,6 +126,8 @@
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-suggest-js" />
<th:block th:include="include :: bootstrap-typeahead-js" />
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]];
var prefix = ctx + "kylin/order/orderList";
......@@ -121,7 +145,7 @@
checkbox: true
},
{
field: '-',
field: 'sponsor',
title: '第三方'
},
{
......@@ -193,6 +217,18 @@
};
$.table.init(options);
});
var sponsorSelectDiv = $("#sponsorSelectDiv").bsSuggest({
url: prefix + "/getSponsorList",
idField: "sponsorId",
keyField: "sponsorName"
}).on('onDataRequestSuccess', function (e, result) {
console.log('onDataRequestSuccess: ', result);
}).on('onSetSelectValue', function (e, keyword) {
console.log('onSetSelectValue: ', keyword);
}).on('onUnsetSelectValue', function (e) {
console.log("onUnsetSelectValue");
});
</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/KylinOrderRefundsServiceImpl.java
View file @ 24c69e11
......@@ -120,7 +120,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
// todo 出票未出票
// 选择退款的入场人是否正确
Integer[] entitiesStatus = new Integer[]{KylinTableStatusConst.ENTITIES_IS_PAYMENT1, KylinTableStatusConst.ENTITIES_IS_PAYMENT2};
Integer[] entitiesStatus = new Integer[]{KylinTableStatusConst.ENTITIES_IS_PAYMENT1, KylinTableStatusConst.ENTITIES_IS_PAYMENT2, KylinTableStatusConst.ENTITIES_IS_PAYMENT4};
int choiceCount = kylinOrderTicketEntitiesMapper.selectCount(
new QueryWrapper<KylinOrderTicketEntities>()
.eq("order_id", orderTicketsId)
......@@ -250,7 +250,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
case "approved":
res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
break;
case "Reject":
case "reject":
res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
break;
case "unfilled":
......@@ -369,8 +369,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
new QueryWrapper<KylinPerformances>().eq("performances_id", kylinOrderTicketRelations.getPerformanceId())
);
List<KylinOrderTicketEntitiesDao> entitiesList = kylinOrderTicketEntitiesMapper.getRefundEntitiesList(kylinOrderTickets.getOrderTicketsId());
if(entitiesList.size() > 0) {
List<KylinOrderTicketEntitiesDao> entitiesListTemp = kylinOrderTicketEntitiesMapper.getRefundEntitiesList(kylinOrderTickets.getOrderTicketsId());
List<KylinOrderTicketEntitiesDao> entitiesList = new ArrayList<>();
if(entitiesListTemp.size() > 0) {
double priceActual = kylinOrderTickets.getPriceActual().doubleValue();
double priceExpress = kylinOrderTickets.getPriceExpress().doubleValue();
int allEntitiesCount = kylinOrderTicketEntitiesMapper.selectCount(// 总入场人数量 排出未付款的 用来计算单入场人的价格
......@@ -379,7 +380,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
.ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
);
double onePrice = (priceActual - priceExpress) / allEntitiesCount;//单价
for (KylinOrderTicketEntitiesDao entities : entitiesList) {
for (KylinOrderTicketEntitiesDao entities : entitiesListTemp) {
Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退 包含退款中
kylinOrderTickets.getOrderTicketsId(),
KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL,
......@@ -392,6 +393,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
canRefundedPrice = onePrice;
}
entities.setCanRefundedPrice(BigDecimal.valueOf(canRefundedPrice));
if (canRefundedPrice > 0) { // 退款中但是可退款金额为0不展示
entitiesList.add(entities);
}
}
}
......
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 @ 24c69e11
......@@ -11,8 +11,6 @@ import com.liquidnet.service.kylin.dao.*;
import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceMemberHistoryVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
......@@ -605,4 +603,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
dtoList.add(countBean);
return dtoList;
}
@Override
public List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType) {
return performancesMapper.getPerformanceSponsorList(sponsorType);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @ 24c69e11
......@@ -206,7 +206,7 @@ public class KylinRefundsStatusServiceImpl {
KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
);
if (orderInfo.getRefundNumber() > 0) { // 已经有退完的 那就是部分退款了
if (orderInfo.getPriceRefund().doubleValue() > 0) { // 已经有退完的 那就是部分退款了
newStatus = KylinTableStatusConst.ORDER_STATUS6;
} else {
newStatus = KylinTableStatusConst.ORDER_STATUS1;
......@@ -298,7 +298,7 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefunds.setAuditorAt(LocalDateTime.now());
kylinOrderRefunds.setReject(reject);
break;
case "Reject":
case "reject":
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT);
kylinOrderRefunds.setAuditorId(authId);
kylinOrderRefunds.setAuditorName(authName);
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceSponsorDao.java 0 → 100644
View file @ 24c69e11
package com.liquidnet.service.kylin.dao;
import lombok.Data;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: PerformanceSponsorDao
* @Package com.liquidnet.service.kylin.dao
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/19 14:49
*/
@Data
public class PerformanceSponsorDao {
private String sponsorId;
private String sponsorName;
private String sponsorType;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java
View file @ 24c69e11
......@@ -43,4 +43,6 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
PerformanceRecommendDao getRecommend(String performancesId);
List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);
List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @ 24c69e11
......@@ -110,6 +110,11 @@
<result column="total_paying_number" property="totalPayingNumber"/>
<result column="total_buy_users" property="totalBuyUsers"/>
</resultMap>
<resultMap id="performanceSponsorDaoResult" type="com.liquidnet.service.kylin.dao.PerformanceSponsorDao">
<result column="sponsor_id" property="sponsorId"/>
<result column="sponsor" property="sponsorName"/>
<result column="sponsor_type" property="sponsorType"/>
</resultMap>
<!-- 第三方演出列表 (不包含退票信息) -->
<select id="partnerPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
......@@ -319,8 +324,7 @@
title
FROM kylin_performances AS p
LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
WHERE performances_id = ${performancesId};
WHERE performances_id = ${performancesId}
</select>
<!-- Mis根据演出id查询票种信息 -->
<select id="misTicketMemberInfo" resultMap="ticketMemberAuditDaoResult">
......@@ -413,37 +417,37 @@
</select>
<select id="orderList" resultMap="performanceOrderListDaoResult">
SELECT
kot.order_tickets_id,
kp.sponsor,
kot.order_code,
kp.title,
kots.status,
kot.get_ticket_type,
kot.pay_type,
kot.payment_type,
'无' as tied,
kot.price,
kot.number,
kot.price_member,
kot.price_total,
kot.price_voucher,
kot.price_actual,
kot.price_express,
kot.price_refund,
kot.refund_number,
kot.user_id,
kot.user_name,
kot.user_mobile
kot.order_tickets_id,
kp.sponsor,
kot.order_code,
kp.title,
kots.status,
kot.get_ticket_type,
kot.pay_type,
kot.payment_type,
'无' as tied,
kot.price,
kot.number,
kot.price_member,
kot.price_total,
kot.price_voucher,
kot.price_actual,
kot.price_express,
kot.price_refund,
kot.refund_number,
kot.user_id,
kot.user_name,
kot.user_mobile
FROM kylin_order_tickets kot
inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id
inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
inner join kylin_performances kp on kotr.performance_id = kp.performances_id
inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id
inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
inner join kylin_performances kp on kotr.performance_id = kp.performances_id
<where>
<if test="orderTicketsId != null and orderTicketsId != ''"> and order_tickets_id = #{orderTicketsId}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
<if test="userMobile != null and userMobile != ''"> and user_mobile = #{userMobile}</if>
<if test="performanceTitle != null and performanceTitle != ''"> and performance_title = #{performanceTitle}</if>
<if test="performanceTitle != null and performanceTitle != ''"> and performance_title LIKE concat('%', #{performanceTitle}, '%')</if>
<if test="orderCode != null and orderCode != ''"> and order_code = #{orderCode}</if>
<if test="payCode != null and payCode != ''"> and pay_code = #{payCode}</if>
<if test="qrCode != null and qrCode != ''"> and qr_code = #{qrCode}</if>
......@@ -472,32 +476,23 @@
<if test="createdAt != null "> and created_at = #{createdAt}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
<if test="orderSourece != null and orderSourece != ''"> and order_sourece = #{orderSourece}</if>
</where>
<where>
<if test="title!=''">
AND title LIKE concat('%', #{title}, '%')
</if>
<if test="cityName!=''">
AND city_name LIKE concat('%', #{cityName}, '%')
</if>
<if test="status!='-2'">
AND ps.STATUS = #{status}
</if>
<if test="status=='-2'">
AND ps.STATUS >= 3 or ps.STATUS = 1
</if>
<if test="auditStatus!='-2'">
AND ps.audit_status = #{auditStatus}
</if>
<!-- <if test="auditStatus=='-2'">-->
<!-- AND (ps.audit_status = 0 or ps.audit_status = 1 or ps.audit_status = 2)-->
<!-- </if>-->
<if test="stopSellDay!=-2">
AND p.time_end BETWEEN #{stopSellTime} AND NOW()
<if test="sponsor!=null and sponsor!=''">
AND kp.sponsor = #{sponsor}
</if>
</where>
<if test="orderItem!=''">
ORDER BY ${orderItem} ${orderSc}
</if>
</select>
<select id="getPerformanceSponsorList" resultMap="performanceSponsorDaoResult">
select distinct kp.sponsor_id, kp.sponsor, kp.sponsor_type
from kylin_performances kp
<where>
kp.sponsor_id != ''
<if test="sponsorType!=null and sponsorType!=''">
AND kp.sponsor_type = #{sponsorType}
</if>
</where>
order by sponsor_id
</select>
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @ 24c69e11
......@@ -71,8 +71,8 @@ public class KylinOrderTicketsController {
@GetMapping("list")
@ApiOperation("订单列表")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderList(@RequestParam("page") @NotNull @Min(1) int page,
@RequestParam("size") @NotNull @Min(1) int size) {
public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderList(@RequestParam("page") int page,
@RequestParam("size") int size) {
return ResponseDto.success(orderTicketsService.orderList(page,size));
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ 24c69e11
......@@ -71,18 +71,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
isShow = false;
}
}
if (null != isExclusive) {
if (info.getIsExclusive() != isExclusive) {
isShow = false;
}
}
if (null != isDiscount) {
if (info.getIsDiscount() != isDiscount) {
isShow = false;
}
}
if (null != isAdvance) {
if (info.getIsAdvance() != isAdvance) {
if (null != isExclusive || null != isDiscount || null != isAdvance) {
if (info.getIsExclusive() != isExclusive && info.getIsDiscount() != isDiscount && info.getIsAdvance() != isAdvance) {
isShow = false;
}
}
......@@ -98,7 +88,17 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
List<KylinPerformanceVo> performancesListRecommend = dataUtils.getPerformancesListIsSystemRecommend();
if (performancesListRecommend.size() > 0) {
is_native = 0;
performancesListNew.addAll(performancesListRecommend);
if(recommend > 0) {// 去重
for(KylinPerformanceVo recommendInfo : performancesListRecommend) {
for(KylinPerformanceVo info : performancesListNew) {
if (recommendInfo.getPerformancesId() != info.getPerformancesId()) {
performancesListNew.add(recommendInfo);
}
}
}
} else {
performancesListNew.addAll(performancesListRecommend);
}
}
}
......
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