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

Skip to content

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

Merge branch 'dev' into test

parents 3a111d5c 7ea181cc
Hide whitespace changes
Inline Side-by-side
Showing with 932 additions and 356 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java
View file @ 1ff11f19
...@@ -16,6 +16,7 @@ public class AdamRedisConst { ...@@ -16,6 +16,7 @@ public class AdamRedisConst {
public static final String INFO_THIRD_PARTY = INFO.concat("third_party:"); public static final String INFO_THIRD_PARTY = INFO.concat("third_party:");
public static final String INFO_ENTERS = INFO.concat("enters:"); public static final String INFO_ENTERS = INFO.concat("enters:");
public static final String INFO_ADDRESSES = INFO.concat("addresses:"); public static final String INFO_ADDRESSES = INFO.concat("addresses:");
public static final String INFO_CERTIFICATION = INFO.concat("certification:");
public static final String INFO_MEMBER_SIMPLE = INFO.concat("member:simple"); public static final String INFO_MEMBER_SIMPLE = INFO.concat("member:simple");
public static final String INFO_MEMBER_CATEGORY = INFO.concat("member:category:"); public static final String INFO_MEMBER_CATEGORY = INFO.concat("member:category:");
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRdmService.java
View file @ 1ff11f19
...@@ -28,7 +28,9 @@ public interface IAdamRdmService { ...@@ -28,7 +28,9 @@ public interface IAdamRdmService {
AdamRealInfoVo getRealInfoVoByUid(String uid); AdamRealInfoVo getRealInfoVoByUid(String uid);
void delRealInfoVoByUid(String uid); boolean setCertification(int idType, String idNo, String idName);
boolean isCertification(int idType, String idNo, String idName);
boolean setThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> voList); boolean setThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> voList);
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceExpressAdminListParam.java 0 → 100644
View file @ 1ff11f19
package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PerformanceExpressAdminListParam {
@ApiModelProperty(value = "演出名称", example = "")
private String title;
@ApiModelProperty(value = "-2全部状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "-2")
private Integer status;
@ApiModelProperty(value = "城市名称", example = "")
private String cityName;
@ApiModelProperty(value = "-2全部,0审核中，2审核拒绝", example = "0")
private Integer auditStatus;
@ApiModelProperty(value = "停售时间（天）-2全部", example = "-2")
private long stopSellDay;
@ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00", hidden = true)
private String stopSellTime;
@ApiModelProperty(value = "页数", example = "0")
private Integer pageSize;
@ApiModelProperty(value = "数量", example = "20")
private Integer pageNum;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java
View file @ 1ff11f19
...@@ -46,6 +46,9 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> { ...@@ -46,6 +46,9 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
//TASK 订单状态 //TASK 订单状态
ResponseDto<Integer> checkOrderResult(String orderId); ResponseDto<Integer> checkOrderResult(String orderId);
//TASK 订单状态
ResponseDto<Integer> orderUnPayCount();
// 下单接口(无订单->待支付->可支付) // 下单接口(无订单->待支付->可支付)
// 删除订单 // 删除订单
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java 0 → 100644
View file @ 1ff11f19
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.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.PerformancesExpressServiceImpl;
import com.liquidnet.service.kylin.dao.PerformanceExpressAdminListDao;
import com.liquidnet.service.kylin.dto.param.PerformanceExpressAdminListParam;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* <p>
* 演出快递
* </p>
*
* @author jiangxiulong
* @since 2021-06-21
*/
@Controller
@RequestMapping("/kylin/performancesExpress")
public class PerformancesExpressController extends BaseController {
private String prefix = "zhengzai/kylin/performancesExpress";
@Value("${liquidnet.shunfeng.url}")
private String url;
@Value("${liquidnet.shunfeng.sk}")
private String sk;
@Value("${liquidnet.shunfeng.appid}")
private String appid;
@Autowired
private PerformancesExpressServiceImpl performancesExpressServiceImpl;
@RequiresPermissions("kylin:performancesExpress:view")
@GetMapping()
public String banners() {
return prefix + "/performancesExpress";
}
/**
* 查询演出列表
*/
@RequiresPermissions("kylin:performances:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(PerformanceExpressAdminListParam performanceExpressAdminListParam) {
List<PerformanceExpressAdminListDao> result = performancesExpressServiceImpl.getList(performanceExpressAdminListParam);
return getDataTable(result);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml
View file @ 1ff11f19
...@@ -59,6 +59,10 @@ liquidnet: ...@@ -59,6 +59,10 @@ liquidnet:
endpoint: http://oss-cn-hangzhou.aliyuncs.com endpoint: http://oss-cn-hangzhou.aliyuncs.com
accessKeyId: LTAI4FxrURzMvvu9reFgwY5o accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
shunfeng:
url: "https://butler-dev-ms.sf-express.com"
sk: 21e9a70f677a2bf29dfa2b3bead4f018
appid: 557104628450889728
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml
View file @ 1ff11f19
...@@ -48,6 +48,10 @@ liquidnet: ...@@ -48,6 +48,10 @@ liquidnet:
endpoint: http://oss-cn-hangzhou.aliyuncs.com endpoint: http://oss-cn-hangzhou.aliyuncs.com
accessKeyId: LTAI4FxrURzMvvu9reFgwY5o accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
shunfeng:
url: "https://butler-dev-ms.sf-express.com"
sk: 21e9a70f677a2bf29dfa2b3bead4f018
appid: 557104628450889728
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml
View file @ 1ff11f19
...@@ -60,6 +60,10 @@ liquidnet: ...@@ -60,6 +60,10 @@ liquidnet:
endpoint: http://oss-cn-hangzhou.aliyuncs.com endpoint: http://oss-cn-hangzhou.aliyuncs.com
accessKeyId: LTAI4FxrURzMvvu9reFgwY5o accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
shunfeng:
url: "https://butler-dev-ms.sf-express.com"
sk: 21e9a70f677a2bf29dfa2b3bead4f018
appid: 557104628450889728
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesExpress.html 0 → 100644
View file @ 1ff11f19
<!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="formId">
<div class="select-list">
<ul>
<li>
<label>演出名称：</label>
<input type="text" name="title"/>
</li>
<li>
<label>城市名称：</label>
<input type="text" name="cityName"/>
</li>
<li>
<label>演出状态：</label>
<select name="status">
<option value="-2">全部</option>
<option value="1">审核中</option>
<option value="3">审核通过</option>
<option value="4">审核拒绝</option>
<option value="6">售卖</option>
<option value="7">已下架</option>
<option value="8">售罄</option>
<option value="9">未开始</option>
<option value="10">演出结束</option>
</select>
</li>
<li>
<label>审核状态：</label>
<select name="auditStatus">
<option value="-2">全部</option>
<option value="0">审核中</option>
<option value="2">审核拒绝</option>
</select>
</li>
<li>
<label>停售时间：</label>
<select name="stopSellDay">
<option value="-2">全部</option>
<option value="0">今天</option>
<option value="1">明天</option>
<option value="-1">昨天</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="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:performancesExpress:detail')}]];
var expertFlag = [[${@permission.hasPermi('kylin:performancesExpress:expert')}]];
var prefix = ctx + "kylin/performancesExpress";
$(function () {
var options = {
url: prefix + "/list",
detailUrl: prefix + "/details/{id}",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "演出快递",
columns: [{
checkbox: true
},
{
field: 'performancesId',
title: '演出id'
},
{
field: 'title',
title: '演出名称'
},
{
field: 'timeStart',
title: '开演时间'
},
{
field: 'statusName',
title: '演出状态'
},
{
field: '22',
title: '总数'
},
{
field: '33',
title: '待发货'
},
{
field: '44',
title: '已发货'
},
{
field: '55',
title: '已签收'
},
{
title: '操作',
align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>管理</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
return actions.join('');
}
}]
};
$.table.init(options);
});
</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/KylinPerformancesAdminServiceImpl.java
View file @ 1ff11f19
...@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo; ...@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils; import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils; import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.dao.*; import com.liquidnet.service.kylin.dao.*;
import com.liquidnet.service.kylin.dto.param.*; import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo; import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
...@@ -205,8 +206,20 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -205,8 +206,20 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
try { try {
Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam); Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map); List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
for (PerformanceAdminListDao item : voList) { for (PerformanceAdminListDao item : voList) {
item.setStatus(item.getStatus()); item.setStatus(item.getStatus());
if(item.getStatus() >=6 && item.getStatus()!=7){
if (DateUtil.compareStrDay(item.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
item.setStatus(9);
} else if (DateUtil.compareStrDay(item.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
item.setStatus(10);
}else{
item.setStatus(6);
}
}
newList.add(item); newList.add(item);
} }
} catch (Exception e) { } catch (Exception e) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java 0 → 100644
View file @ 1ff11f19
package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
import com.liquidnet.commons.lang.util.BeanUtil;
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.admin.KylinPerformanceMemberHistoryVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 演出 服务实现类
* </p>
*
* @author liquidnet
* @since 2021-05-05
*/
@Service
@Slf4j
public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> {
@Autowired
MongoTemplate mongoTemplate;
@Autowired
private PerformanceVoUtils performanceVoUtils;
@Autowired
private KylinPerformancesMapper performancesMapper;
public KylinPerformanceMisVo performanceDetails(String performancesId) {
log.info(" PERFORMANCE mis演出详情");
KylinPerformanceMisVo createMisVo = performanceVoUtils.getPerformanceMisVo(performancesId);
return createMisVo;
}
public List<PerformanceExpressAdminListDao> getList(PerformanceExpressAdminListParam performanceExpressAdminListParam) {
List<PerformanceExpressAdminListDao> voList = new ArrayList();
try {
Map<String, Object> map = BeanUtil.convertBeanToMap(performanceExpressAdminListParam);
voList = performancesMapper.misPerformanceExpressList(map);
for (PerformanceExpressAdminListDao item : voList) {
item.setStatus(item.getStatus());
}
} catch (Exception e) {
e.printStackTrace();
return null;
}
return voList;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java
View file @ 1ff11f19
...@@ -93,10 +93,10 @@ public class MongoVoUtils { ...@@ -93,10 +93,10 @@ public class MongoVoUtils {
ticketList.add(kylinTicketVo); ticketList.add(kylinTicketVo);
//票种 库存redis //票种 库存redis
if (!redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + kylinTicketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) { // if (!redisUtil.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + kylinTicketVo.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
dataUtils.setSurplusGeneral(kylinTicketVo.getTicketsId(), t2.getTotalGeneral()); // dataUtils.setSurplusGeneral(kylinTicketVo.getTicketsId(), t2.getTotalGeneral());
dataUtils.setSurplusExchange(kylinTicketVo.getTicketsId(), t2.getSurplusExchange()); // dataUtils.setSurplusExchange(kylinTicketVo.getTicketsId(), t2.getSurplusExchange());
} // }
if (kylinTicketVo.getIsMember() == 1) { if (kylinTicketVo.getIsMember() == 1) {
if (kylinTicketVo.getMemberPrice().compareTo(kylinTicketVo.getPrice()) != 0) { if (kylinTicketVo.getMemberPrice().compareTo(kylinTicketVo.getPrice()) != 0) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @ 1ff11f19
...@@ -292,6 +292,15 @@ public class PerformanceVoUtils { ...@@ -292,6 +292,15 @@ public class PerformanceVoUtils {
ticketTimes.setStatus(1); ticketTimes.setStatus(1);
ticketTimesMapper.insert(ticketTimes); ticketTimesMapper.insert(ticketTimes);
ticketTimeRelationMapper.insert(ticketTimeRelation); ticketTimeRelationMapper.insert(ticketTimeRelation);
HashMap<String ,Object> map2 = new HashMap<>();
map2.put("status",1);
map2.put("updatedAt",map.get("updatedAt"));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map2));
mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketTimesId").is(ticketTimeRelation.getTimesId())).getQueryObject(),
objectTicketVo
);
} else { } else {
ticketTimesMapper.update(ticketTimes, new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", ticketTimes.getTicketTimesId())); ticketTimesMapper.update(ticketTimes, new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", ticketTimes.getTicketTimesId()));
ticketTimeRelationMapper.update(ticketTimeRelation, new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketTimes.getTicketTimesId())); ticketTimeRelationMapper.update(ticketTimeRelation, new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketTimes.getTicketTimesId()));
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceAdminListDao.java
View file @ 1ff11f19
...@@ -2,6 +2,8 @@ package com.liquidnet.service.kylin.dao; ...@@ -2,6 +2,8 @@ package com.liquidnet.service.kylin.dao;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
@Data @Data
public class PerformanceAdminListDao { public class PerformanceAdminListDao {
...@@ -14,10 +16,12 @@ public class PerformanceAdminListDao { ...@@ -14,10 +16,12 @@ public class PerformanceAdminListDao {
private Integer status; private Integer status;
private String statusName; private String statusName;
private String auditTime; private String auditTime;
private String timeSell;
private String timeStop;
private Integer auditStatus; private Integer auditStatus;
private Integer totalGeneral; private Integer totalGeneral;
private Integer saleGeneral; private Integer saleGeneral;
private Integer totalSalePrice; private BigDecimal totalSalePrice;
private Integer surplusGeneral; private Integer surplusGeneral;
private Integer syncDamai; private Integer syncDamai;
private String rejectTxt; private String rejectTxt;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressAdminListDao.java 0 → 100644
View file @ 1ff11f19
package com.liquidnet.service.kylin.dao;
import lombok.Data;
@Data
public class PerformanceExpressAdminListDao {
//演出数据
private String performancesId;
private String title;
private String timeStart;
private String timeEnd;
private String sponsor;
private Integer status;
private String statusName;
private String auditTime;
private Integer auditStatus;
private Integer totalGeneral;
private Integer saleGeneral;
private Integer totalSalePrice;
private Integer surplusGeneral;
private Integer syncDamai;
private String rejectTxt;
private Integer sort;
private String createdAt;
public void setStatus(Integer status){
this.status=status;
switch (status){
case 1:
this.statusName="审核中";
break;
case 3:
this.statusName="审核通过";
break;
case 4:
this.statusName="审核拒绝";
break;
case 6:
this.statusName="售卖中";
break;
case 7:
this.statusName="已下架";
break;
case 8:
this.statusName="售罄";
break;
case 9:
this.statusName="未开始";
break;
case 10:
this.statusName="已结束";
break;
default:
this.statusName="其他";
break;
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformancePartnerListDao.java
View file @ 1ff11f19
...@@ -2,6 +2,8 @@ package com.liquidnet.service.kylin.dao; ...@@ -2,6 +2,8 @@ package com.liquidnet.service.kylin.dao;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
@Data @Data
public class PerformancePartnerListDao { public class PerformancePartnerListDao {
...@@ -12,10 +14,12 @@ public class PerformancePartnerListDao { ...@@ -12,10 +14,12 @@ public class PerformancePartnerListDao {
private String timeEnd; private String timeEnd;
private Integer totalGeneral; private Integer totalGeneral;
private Integer saleGeneral; private Integer saleGeneral;
private Integer totalSalePrice; private BigDecimal totalSalePrice;
private Integer surplusGeneral; private Integer surplusGeneral;
private Integer status; private Integer status;
private Integer type; private Integer type;
private String timeSell;
private String timeStop;
private Integer auditStatus; private Integer auditStatus;
private String rejectTxt; private String rejectTxt;
private String createdAt; private String createdAt;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java
View file @ 1ff11f19
...@@ -45,4 +45,6 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> { ...@@ -45,4 +45,6 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId); List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);
List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType); List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType);
List<PerformanceExpressAdminListDao> misPerformanceExpressList(Map<String, Object> map);
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @ 1ff11f19
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
<result column="sale_general" property="saleGeneral"/> <result column="sale_general" property="saleGeneral"/>
<result column="total_sale_price" property="totalSalePrice"/> <result column="total_sale_price" property="totalSalePrice"/>
<result column="surplus_general" property="surplusGeneral"/> <result column="surplus_general" property="surplusGeneral"/>
<result column="time_sell" property="timeSell"/>
<result column="time_stop" property="timeStop"/>
<result column="status" property="status"/> <result column="status" property="status"/>
<result column="type" property="type"/> <result column="type" property="type"/>
<result column="sort" property="sort"/> <result column="sort" property="sort"/>
...@@ -29,6 +31,8 @@ ...@@ -29,6 +31,8 @@
<result column="total_sale_price" property="totalSalePrice"/> <result column="total_sale_price" property="totalSalePrice"/>
<result column="surplus_general" property="surplusGeneral"/> <result column="surplus_general" property="surplusGeneral"/>
<result column="status" property="status"/> <result column="status" property="status"/>
<result column="time_sell" property="timeSell"/>
<result column="time_stop" property="timeStop"/>
<result column="audit_status" property="auditStatus"/> <result column="audit_status" property="auditStatus"/>
<result column="reject_txt" property="rejectTxt"/> <result column="reject_txt" property="rejectTxt"/>
<result column="sort" property="sort"/> <result column="sort" property="sort"/>
...@@ -50,7 +54,6 @@ ...@@ -50,7 +54,6 @@
</resultMap> </resultMap>
<resultMap id="PerformanceRecommendAdminDaoResult" <resultMap id="PerformanceRecommendAdminDaoResult"
type="com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao"> type="com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao">
<result column="performances_id" property="performancesId"/> <result column="performances_id" property="performancesId"/>
...@@ -74,7 +77,8 @@ ...@@ -74,7 +77,8 @@
<result column="is_exclusive" property="isExclusive"/> <result column="is_exclusive" property="isExclusive"/>
</resultMap> </resultMap>
<resultMap id="performanceOrderStatisticalDaoResult" type="com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao"> <resultMap id="performanceOrderStatisticalDaoResult"
type="com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao">
<result column="performances_id" property="performancesId"/> <result column="performances_id" property="performancesId"/>
<result column="tickets_id" property="ticketsId"/> <result column="tickets_id" property="ticketsId"/>
<result column="title" property="title"/> <result column="title" property="title"/>
...@@ -123,6 +127,8 @@ ...@@ -123,6 +127,8 @@
p.title , p.title ,
p.time_start , p.time_start ,
p.time_end , p.time_end ,
t.time_sell ,
t.time_stop ,
IFNULL(t.total_general , 0) AS 'total_general' , IFNULL(t.total_general , 0) AS 'total_general' ,
IFNULL(ot.sale_general , 0) AS 'sale_general' , IFNULL(ot.sale_general , 0) AS 'sale_general' ,
IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' , IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
...@@ -130,10 +136,10 @@ ...@@ -130,10 +136,10 @@
( (
t.total_general - ot.sale_general t.total_general - ot.sale_general
) , ) ,
0 t.total_general
) AS 'surplus_general' , ) AS 'surplus_general' ,
ps.`status` , ps.`status` ,
p.type, p.type ,
ps.audit_status , ps.audit_status ,
p.reject_txt , p.reject_txt ,
p.created_at p.created_at
...@@ -144,26 +150,32 @@ ...@@ -144,26 +150,32 @@
LEFT JOIN( LEFT JOIN(
SELECT SELECT
ttr.performance_id , ttr.performance_id ,
ts.ticket_id , sum(ts.total_general) AS 'total_general' ,
sum(ts.total_general) AS 'total_general' MIN(
DATE_SUB(
t.time_start ,
INTERVAL pay_countdown_minute MINUTE
)
) AS 'time_sell' ,
MAX(t.time_end) AS 'time_stop'
FROM FROM
kylin_ticket_status AS ts kylin_ticket_status AS ts
LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
GROUP BY ttr.performance_id GROUP BY
ttr.performance_id
) AS t ON p.performances_id = t.performance_id ) AS t ON p.performances_id = t.performance_id
LEFT JOIN( LEFT JOIN(
SELECT SELECT(
(sum(ot.number)- sum(ot.refund_number)) AS 'sale_general' , sum(ot.number) - sum(ot.refund_number)
(sum(ot.price_actual) - sum(ot.price_refund)) AS 'total_sale_price' , ) AS 'sale_general' ,
otr.performance_id AS 'performance_id' (
FROM sum(ot.price_actual) - sum(ot.price_refund)
kylin_order_tickets AS ot ) AS 'total_sale_price' ,
LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id otr.performance_id AS 'performance_id' FROM kylin_order_tickets AS ot LEFT JOIN kylin_order_ticket_status AS ots
LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id ON ots.order_id = ot.order_tickets_id LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id =
WHERE ot.order_tickets_id WHERE ots.`status` = 1 AND coupon_type = 'no' GROUP BY otr.performance_id
ots.`status` = 1 and coupon_type ='no'
GROUP BY otr.performance_id
) AS ot ON ot.performance_id = p.performances_id ) AS ot ON ot.performance_id = p.performances_id
<where> <where>
<if test="title!=''"> <if test="title!=''">
...@@ -202,6 +214,8 @@ ...@@ -202,6 +214,8 @@
p.time_start , p.time_start ,
p.time_end , p.time_end ,
ps.sync_damai , ps.sync_damai ,
t.time_sell,
t.time_stop,
IFNULL(t.total_general , 0) AS 'total_general' , IFNULL(t.total_general , 0) AS 'total_general' ,
IFNULL(ot.sale_general , 0) AS 'sale_general' , IFNULL(ot.sale_general , 0) AS 'sale_general' ,
IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' , IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
...@@ -209,7 +223,7 @@ ...@@ -209,7 +223,7 @@
( (
t.total_general - ot.sale_general t.total_general - ot.sale_general
) , ) ,
0 t.total_general
) AS 'surplus_general' , ) AS 'surplus_general' ,
ps.`status` , ps.`status` ,
ps.audit_status , ps.audit_status ,
...@@ -222,13 +236,21 @@ ...@@ -222,13 +236,21 @@
LEFT JOIN( LEFT JOIN(
SELECT SELECT
ttr.performance_id , ttr.performance_id ,
ts.ticket_id , sum(ts.total_general) AS 'total_general' ,
sum(ts.total_general) AS 'total_general' MIN(
DATE_SUB(
t.time_start ,
INTERVAL pay_countdown_minute MINUTE
)
) AS 'time_sell' ,
MAX(t.time_end) AS 'time_stop'
FROM FROM
kylin_ticket_status AS ts kylin_ticket_status AS ts
LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
GROUP BY ttr.performance_id GROUP BY
ttr.performance_id
) AS t ON p.performances_id = t.performance_id ) AS t ON p.performances_id = t.performance_id
LEFT JOIN( LEFT JOIN(
SELECT SELECT
...@@ -259,9 +281,9 @@ ...@@ -259,9 +281,9 @@
<if test="auditStatus!='-2'"> <if test="auditStatus!='-2'">
AND ps.audit_status = #{auditStatus} AND ps.audit_status = #{auditStatus}
</if> </if>
<!-- <if test="auditStatus=='-2'">--> <!-- <if test="auditStatus=='-2'">-->
<!-- AND (ps.audit_status = 0 or ps.audit_status = 1 or ps.audit_status = 2)--> <!-- AND (ps.audit_status = 0 or ps.audit_status = 1 or ps.audit_status = 2)-->
<!-- </if>--> <!-- </if>-->
<if test="stopSellDay!=-2"> <if test="stopSellDay!=-2">
AND p.time_end BETWEEN #{stopSellTime} AND NOW() AND p.time_end BETWEEN #{stopSellTime} AND NOW()
</if> </if>
...@@ -284,15 +306,15 @@ ...@@ -284,15 +306,15 @@
<!-- Mis 根据状态查询演出列表 --> <!-- Mis 根据状态查询演出列表 -->
<select id="misTitleByStatusList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult"> <select id="misTitleByStatusList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult">
SELECT performances_id, SELECT performances_id,
title title
FROM kylin_performances AS p FROM kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
<where> <where>
ps.status in ${status} ps.status in ${status}
<if test="title!=''"> <if test="title!=''">
AND title LIKE concat('%', #{title}, '%') AND title LIKE concat('%', #{title}, '%')
</if> </if>
</where> </where>
LIMIT 20 LIMIT 20
</select> </select>
...@@ -311,11 +333,11 @@ ...@@ -311,11 +333,11 @@
<!-- Mis 根据演出id查询推荐数据 --> <!-- Mis 根据演出id查询推荐数据 -->
<select id="getRecommend" parameterType="java.lang.String" resultMap="performanceRecommendDaoResult"> <select id="getRecommend" parameterType="java.lang.String" resultMap="performanceRecommendDaoResult">
SELECT performances_id, SELECT performances_id,
title, title,
ps.is_recommend ps.is_recommend
FROM kylin_performances AS p FROM kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
WHERE p.performances_id = #{performancesId} WHERE p.performances_id = #{performancesId}
</select> </select>
<!-- Mis根据演出id查询演出名称 --> <!-- Mis根据演出id查询演出名称 -->
...@@ -361,59 +383,58 @@ ...@@ -361,59 +383,58 @@
</select> </select>
<!-- 演出订单统计--> <!-- 演出订单统计-->
<select id="getPerformanceOrderStatisticalList" parameterType="java.lang.String" resultMap="performanceOrderStatisticalDaoResult"> <select id="getPerformanceOrderStatisticalList" parameterType="java.lang.String"
SELECT resultMap="performanceOrderStatisticalDaoResult">
kp.performances_id , SELECT kp.performances_id,
kt.tickets_id, kt.tickets_id,
kt.title, kt.title,
kt.price, kt.price,
kt.type, kt.type,
kt.use_start, kt.use_start,
IFNULL(kts.total_general , 0) AS 'total_general' , IFNULL(kts.total_general, 0) AS 'total_general',
IFNULL(ot.total_sale_general , 0) AS 'sale_general' , IFNULL(ot.total_sale_general, 0) AS 'sale_general',
IFNULL((kts.total_general - ot.total_sale_general),0) AS 'surplus_general', IFNULL((kts.total_general - ot.total_sale_general), 0) AS 'surplus_general',
IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' , IFNULL(ot.total_sale_price, 0) AS 'total_sale_price',
IFNULL(kts.total_exchange , 0) AS 'total_exchange', IFNULL(kts.total_exchange, 0) AS 'total_exchange',
IFNULL(ot.total_refund_general , 0) AS 'total_refund_general', IFNULL(ot.total_refund_general, 0) AS 'total_refund_general',
IFNULL(ot.total_refund_price , 0) AS 'total_refund_price', IFNULL(ot.total_refund_price, 0) AS 'total_refund_price',
IFNULL(ot.total_member_number , 0) AS 'total_member_number', IFNULL(ot.total_member_number, 0) AS 'total_member_number',
IFNULL(ot.total_paying_number , 0) AS 'total_paying_number', IFNULL(ot.total_paying_number, 0) AS 'total_paying_number',
IFNULL(ut.total_buy_users , 0) AS 'total_buy_users' IFNULL(ut.total_buy_users, 0) AS 'total_buy_users'
FROM FROM (select t.performances_id from kylin_performances t where t.performances_id = ${performancesId}) AS kp
(select t.performances_id from kylin_performances t where t.performances_id = ${performancesId}) AS kp inner JOIN(
inner JOIN( SELECT kotr.performance_id AS 'performance_id',
SELECT kotr.ticket_id,
kotr.performance_id AS 'performance_id', (sum(kot.number) - sum(kot.refund_number)) AS 'total_sale_general',
kotr.ticket_id, (sum(kot.price_actual) - sum(kot.price_refund)) AS 'total_sale_price',
(sum(kot.number)- sum(kot.refund_number)) AS 'total_sale_general' , sum(kot.refund_number) as 'total_refund_general',
(sum(kot.price_actual) - sum(kot.price_refund)) AS 'total_sale_price', sum(kot.price_refund) as 'total_refund_price',
sum(kot.refund_number) as 'total_refund_general', sum(case when kotr.is_member = 1 then kot.number else 0 end) total_member_number,
sum(kot.price_refund) as 'total_refund_price', sum(case when kots.`status` = 0 then kot.number else 0 end) total_paying_number
sum(case when kotr.is_member = 1 then kot.number else 0 end) total_member_number, FROM kylin_order_ticket_relations kotr
sum(case when kots.`status` = 0 then kot.number else 0 end) total_paying_number inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
FROM inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
kylin_order_ticket_relations kotr WHERE 1 > 0
inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id and kotr.performance_id = ${performancesId}
inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id and kots.`status` in (1, 3, 4)
WHERE 1>0 and kotr.performance_id = ${performancesId} and kot.coupon_type = 'no'
and kots.`status` in(1,3,4) and kot.coupon_type ='no' group by kotr.performance_id, kotr.ticket_id
group by kotr.performance_id,kotr.ticket_id ) AS ot ON ot.performance_id = kp.performances_id
) AS ot ON ot.performance_id = kp.performances_id inner join kylin_tickets kt on kt.tickets_id = ot.ticket_id
inner join kylin_tickets kt on kt.tickets_id = ot.ticket_id inner join kylin_ticket_status kts on kts.ticket_id = kt.tickets_id
inner join kylin_ticket_status kts on kts.ticket_id = kt.tickets_id inner JOIN(
inner JOIN( select t.performance_id, count(t.user_id) as 'total_buy_users'
select t.performance_id,count(t.user_id) as 'total_buy_users' from( from (
SELECT SELECT kotr.performance_id,
kotr.performance_id, kot.user_id
kot.user_id FROM kylin_order_ticket_relations kotr
FROM inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
kylin_order_ticket_relations kotr inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id WHERE kotr.performance_id = ${performancesId}
inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id and (kots.`status` = 0 OR kots.`status` = 1)
WHERE kotr.performance_id = ${performancesId} and (kots.`status` = 0 OR kots.`status` = 1) group by kotr.performance_id, kot.user_id
group by kotr.performance_id,kot.user_id ) t
) t ) AS ut ON ut.performance_id = kp.performances_id
) AS ut ON ut.performance_id = kp.performances_id
</select> </select>
<select id="getPerformanceSponsorList" resultMap="performanceSponsorDaoResult"> <select id="getPerformanceSponsorList" resultMap="performanceSponsorDaoResult">
select distinct kp.sponsor_id, kp.sponsor, kp.sponsor_type select distinct kp.sponsor_id, kp.sponsor, kp.sponsor_type
...@@ -426,4 +447,42 @@ ...@@ -426,4 +447,42 @@
</where> </where>
order by sponsor_id order by sponsor_id
</select> </select>
<select id="misPerformanceExpressList"
resultType="com.liquidnet.service.kylin.dao.PerformanceExpressAdminListDao">
SELECT
p.performances_id ,
p.title ,
p.type,
p.time_start ,
p.time_end ,
ps.`status` ,
p.created_at
FROM
kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
LEFT JOIN kylin_performance_relations AS pr ON p.performances_id = pr.performance_id
<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="stopSellDay!=-2">
AND p.time_end BETWEEN #{stopSellTime} AND NOW()
</if>
</where>
<if test="orderItem!=''">
ORDER BY created_at DESC
</if>
</select>
</mapper> </mapper>
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java
View file @ 1ff11f19
...@@ -11,6 +11,7 @@ import com.liquidnet.service.base.ErrorMapping; ...@@ -11,6 +11,7 @@ import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument; import com.mongodb.client.model.ReturnDocument;
import com.mongodb.client.result.DeleteResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.bson.Document; import org.bson.Document;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
...@@ -184,25 +185,21 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService { ...@@ -184,25 +185,21 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
// removeVo.setDeletedAt(now); // removeVo.setDeletedAt(now);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate( DeleteResult deleteResult = mongoTemplate.remove(
Query.query(Criteria.where("addressesId").is(addressesId)).getQueryObject(), Query.query(Criteria.where("addressesId").is(addressesId)), AdamAddressesVo.class.getSimpleName()
new Document("$set", new Document("state", 2).append("isDefault", false).append("updatedAt", now).append("deletedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
); );
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != doc) { List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid); vos.removeIf(r -> r.getAddressesId().equals(addressesId));
vos.removeIf(r -> r.getAddressesId().equals(addressesId)); s = System.currentTimeMillis();
s = System.currentTimeMillis(); adamRdmService.setAddressesVoByUid(uid, vos);
adamRdmService.setAddressesVoByUid(uid, vos); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER, rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
SqlMapping.get("adam_addresses.remove", now, now, addressesId) SqlMapping.get("adam_addresses.remove", now, now, addressesId)
); );
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s); log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
}
} }
@Override @Override
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
View file @ 1ff11f19
...@@ -11,6 +11,7 @@ import com.liquidnet.service.base.ErrorMapping; ...@@ -11,6 +11,7 @@ import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument; import com.mongodb.client.model.ReturnDocument;
import com.mongodb.client.result.DeleteResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.bson.Document; import org.bson.Document;
...@@ -19,12 +20,9 @@ import org.springframework.beans.BeanUtils; ...@@ -19,12 +20,9 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
...@@ -65,26 +63,8 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -65,26 +63,8 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
if (1 == parameter.getType()) { if (1 == parameter.getType()) {
LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>(); if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
paramsMap.add("realName", parameter.getName()); identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
paramsMap.add("cardNo", parameter.getIdCard());
String respStr = null;
try {
long s = System.currentTimeMillis();
respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
Map respMap = JsonUtils.fromJson(respStr, Map.class);
if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", currentUid, parameter.getName(), parameter.getIdCard(), respStr);
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
}
} catch (Exception e) {
log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", currentUid, parameter.getName(), parameter.getIdCard(), respStr, e);
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
} }
} }
...@@ -105,6 +85,9 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -105,6 +85,9 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
s = System.currentTimeMillis(); s = System.currentTimeMillis();
adamRdmService.delEntersVoByUid(currentUid); adamRdmService.delEntersVoByUid(currentUid);
if (1 == parameter.getType()) {
adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
}
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
...@@ -178,9 +161,18 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -178,9 +161,18 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
} }
@Override @Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) // @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void edit(AdamEntersParam parameter) { public void edit(AdamEntersParam parameter) {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String currentUid = CurrentUtil.getCurrentUid();
if (1 == parameter.getType()) {
if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
}
}
AdamEntersVo updateVo = AdamEntersVo.getNew(); AdamEntersVo updateVo = AdamEntersVo.getNew();
BeanUtils.copyProperties(parameter, updateVo); BeanUtils.copyProperties(parameter, updateVo);
...@@ -194,10 +186,12 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -194,10 +186,12 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
if (null != doc) { if (null != doc) {
updateVo = BsonUtil.toBean(doc, AdamEntersVo.class); updateVo = BsonUtil.toBean(doc, AdamEntersVo.class);
String currentUid = CurrentUtil.getCurrentUid();
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid); List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
adamRdmService.setEntersVoByUid(currentUid, this.collectionProcess(vos, parameter.getEntersId(), updateVo)); adamRdmService.setEntersVoByUid(currentUid, this.collectionProcess(vos, parameter.getEntersId(), updateVo));
if (1 == parameter.getType()) {
adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
}
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
...@@ -211,36 +205,25 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -211,36 +205,25 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
} }
@Override @Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) // @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void remove(String uid, String entersId) { public void remove(String uid, String entersId) {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
// AdamEntersVo removeVo = AdamEntersVo.getNew();
// removeVo.setState(2);
// removeVo.setIsDefault(false);
// removeVo.setUpdatedAt(now);
// removeVo.setDeletedAt(now);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate( DeleteResult deleteResult = mongoTemplate.remove(
Query.query(Criteria.where("entersId").is(entersId)).getQueryObject(), Query.query(Criteria.where("entersId").is(entersId)), AdamEntersVo.class.getSimpleName()
new Document("$set", new Document("state", 2).append("isDefault", false).append("updatedAt", now).append("deletedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
); );
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != doc) { List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid); vos.removeIf(r -> r.getEntersId().equals(entersId));
vos.removeIf(r -> r.getEntersId().equals(entersId)); s = System.currentTimeMillis();
s = System.currentTimeMillis(); adamRdmService.setEntersVoByUid(uid, vos);
adamRdmService.setEntersVoByUid(uid, vos); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER, rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
SqlMapping.get("adam_enters.remove", now, now, entersId) SqlMapping.get("adam_enters.remove", now, now, entersId)
); );
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s); log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
}
} }
@Override @Override
...@@ -286,4 +269,28 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -286,4 +269,28 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
log.debug("#collect.process耗时:{}ms", System.currentTimeMillis() - s); log.debug("#collect.process耗时:{}ms", System.currentTimeMillis() - s);
return vos; return vos;
} }
private void identityHandler(String currentUid, String name, String idCard) {
String respStr = null;
try {
LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
paramsMap.add("realName", name);
paramsMap.add("cardNo", idCard);
long s = System.currentTimeMillis();
respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
Map respMap = JsonUtils.fromJson(respStr, Map.class);
if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", currentUid, name, idCard, respStr);
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
}
} catch (Exception e) {
log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", currentUid, name, idCard, respStr, e);
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
}
}
} }
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @ 1ff11f19
...@@ -232,6 +232,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe ...@@ -232,6 +232,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
new Document("$set", new Document("expiryAt", expiryAt).append("state", 1)) new Document("$set", new Document("expiryAt", expiryAt).append("state", 1))
); );
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
existUserMemberVo.setState(1);
existUserMemberVo.setExpiryAt(expiryAt); existUserMemberVo.setExpiryAt(expiryAt);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), existUserMemberVo); adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), existUserMemberVo);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java
View file @ 1ff11f19
...@@ -143,8 +143,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -143,8 +143,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
} }
@Override @Override
public void delRealInfoVoByUid(String uid) { public boolean setCertification(int idType, String idNo, String idName) {
redisUtil.del(AdamRedisConst.INFO_REAL_NAME.concat(uid)); return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION + idType + idNo, idName);
}
@Override
public boolean isCertification(int idType, String idNo, String idName) {
String o = (String) redisUtil.get(AdamRedisConst.INFO_CERTIFICATION + idType + idNo);
return !StringUtils.isEmpty(o) && o.equals(idName);
} }
@Override @Override
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @ 1ff11f19
...@@ -366,26 +366,27 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -366,26 +366,27 @@ public class AdamUserServiceImpl implements IAdamUserService {
if (RedisLockUtil.tryLock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid, 1, 3)) { if (RedisLockUtil.tryLock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid, 1, 3)) {
vo = adamRdmService.getRealInfoVoByUid(uid); vo = adamRdmService.getRealInfoVoByUid(uid);
if (null == vo) { if (null == vo) {
LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>(); if (!adamRdmService.isCertification(1, idCard, name)) {
paramsMap.add("realName", name); String respStr = null;
paramsMap.add("cardNo", idCard); try {
LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
String respStr = null; paramsMap.add("realName", name);
try { paramsMap.add("cardNo", idCard);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap); respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s); log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr); log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
Map respMap = JsonUtils.fromJson(respStr, Map.class); Map respMap = JsonUtils.fromJson(respStr, Map.class);
if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) { if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", uid, name, idCard, respStr); log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", uid, name, idCard, respStr);
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
}
} catch (Exception e) {
log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", uid, name, idCard, respStr, e);
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102"); ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage()); throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
} }
} catch (Exception e) {
log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", uid, name, idCard, respStr, e);
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
} }
AdamRealName realName = new AdamRealName(); AdamRealName realName = new AdamRealName();
...@@ -407,6 +408,7 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -407,6 +408,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
adamRdmService.setRealInfoVoByUid(uid, vo); adamRdmService.setRealInfoVoByUid(uid, vo);
adamRdmService.setCertification(1, idCard, name);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
} }
RedisLockUtil.unlock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid); RedisLockUtil.unlock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @ 1ff11f19
...@@ -54,9 +54,9 @@ public class KylinOrderTicketsController { ...@@ -54,9 +54,9 @@ public class KylinOrderTicketsController {
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) { public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData(); PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData();
if(null==vo){ if (null == vo) {
return ResponseDto.failure(ErrorMapping.get("20003")); return ResponseDto.failure(ErrorMapping.get("20003"));
}else{ } else {
return ResponseDto.success(vo); return ResponseDto.success(vo);
} }
} }
...@@ -78,11 +78,11 @@ public class KylinOrderTicketsController { ...@@ -78,11 +78,11 @@ public class KylinOrderTicketsController {
@GetMapping("details") @GetMapping("details")
@ApiOperation("订单详情") @ApiOperation("订单详情")
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam(value = "orderId",required = false) @NotNull(message = "订单id不能为空") String orderId) { public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
OrderDetailsVo vo = orderTicketsService.orderDetails(orderId); OrderDetailsVo vo = orderTicketsService.orderDetails(orderId);
if(null==vo){ if (null == vo) {
return ResponseDto.failure(ErrorMapping.get("20003")); return ResponseDto.failure(ErrorMapping.get("20003"));
}else { } else {
return ResponseDto.success(vo); return ResponseDto.success(vo);
} }
} }
...@@ -92,15 +92,24 @@ public class KylinOrderTicketsController { ...@@ -92,15 +92,24 @@ public class KylinOrderTicketsController {
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) { public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
Integer status = orderTicketsService.checkOrderResult(orderId).getData(); Integer status = orderTicketsService.checkOrderResult(orderId).getData();
if(null==status){ if (null == status) {
return ResponseDto.failure(ErrorMapping.get("20003")); return ResponseDto.failure(ErrorMapping.get("20003"));
}else { } else {
HashMap<String,Integer> map = new HashMap<>(); HashMap<String, Integer> map = new HashMap<>();
map.put("status",status); map.put("status", status);
return ResponseDto.success(map); return ResponseDto.success(map);
} }
} }
@GetMapping("orderUnPayCount")
@ApiOperation("待支付演出订单数量")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap> orderUnPayCount() {
Integer unPayCount = orderTicketsService.orderUnPayCount().getData();
HashMap<String, Integer> map = new HashMap<>();
map.put("unPayCount", unPayCount);
return ResponseDto.success(map);
}
@PostMapping("checkOrderTime") @PostMapping("checkOrderTime")
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/DataImpl.java
View file @ 1ff11f19
...@@ -197,6 +197,12 @@ public class DataImpl { ...@@ -197,6 +197,12 @@ public class DataImpl {
performancePartnerVo.setDetails(performances.getDetails()); performancePartnerVo.setDetails(performances.getDetails());
performancePartnerVo.setApprovalUrl(performances.getApprovalUrl()); performancePartnerVo.setApprovalUrl(performances.getApprovalUrl());
performancePartnerVo.setPayCountdownMinute(5); performancePartnerVo.setPayCountdownMinute(5);
performancePartnerVo.setNoticeIds(new ArrayList<String>(){{
add("1");
add("3");
add("7");
add("12");
}});
performancePartnerVo.setNoticeImage(performances.getNoticeImage()); performancePartnerVo.setNoticeImage(performances.getNoticeImage());
performancePartnerVo.setIsTrueName(performanceStatus.getIsTrueName()); performancePartnerVo.setIsTrueName(performanceStatus.getIsTrueName());
performancePartnerVo.setLimitCount(performanceStatus.getLimitCount()); performancePartnerVo.setLimitCount(performanceStatus.getLimitCount());
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 1ff11f19
...@@ -29,6 +29,7 @@ import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo; ...@@ -29,6 +29,7 @@ import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
import com.liquidnet.service.kylin.entity.*; import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper; import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper; import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
import com.liquidnet.service.kylin.service.IKylinOrderTicketsService; import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.service.kylin.utils.*; import com.liquidnet.service.kylin.utils.*;
...@@ -104,6 +105,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -104,6 +105,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
private TaobaoTicketUtils taobaoTicketUtils; private TaobaoTicketUtils taobaoTicketUtils;
@Autowired @Autowired
private KylinOrderTicketsMapper orderTicketsMapper; private KylinOrderTicketsMapper orderTicketsMapper;
@Autowired
private OrderRefundsCallbackServiceImpl orderRefundsCallbackService;
ArrayList<Integer> canBuyStatus = new ArrayList() {{ ArrayList<Integer> canBuyStatus = new ArrayList() {{
add(6); add(6);
...@@ -290,12 +293,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -290,12 +293,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
} }
//限购判断 如果实名 则身份证维度限购 如果不实名则数量限购 //限购判断 如果实名 则身份证维度限购 如果不实名则数量限购
Query queryPerformance = new Query();
Query queryTicket = new Query();
queryPerformance.addCriteria(Criteria.where("performanceId").is(payOrderParam.getPerformanceId()).and("status").in(KylinTableStatusConst.ORDER_STATUS0, KylinTableStatusConst.ORDER_STATUS1));
queryTicket.addCriteria(Criteria.where("ticketId").is(payOrderParam.getTicketId()).and("status").in(KylinTableStatusConst.ORDER_STATUS0, KylinTableStatusConst.ORDER_STATUS1));
if (entersVoList.size() > 0) { if (entersVoList.size() > 0) {
currentTime = System.currentTimeMillis(); currentTime = System.currentTimeMillis();
for (int i = 0; i < entersVoList.size(); i++) { for (int i = 0; i < entersVoList.size(); i++) {
...@@ -779,110 +776,114 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -779,110 +776,114 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
} }
LinkedList<String> sqls = new LinkedList<>(); LinkedList<String> sqls = new LinkedList<>();
LocalDateTime strTime = orderTicketData.getChangeDate();
//sql
KylinOrderTickets orderTickets = new KylinOrderTickets();
orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
orderTickets.setPaymentType(syncOrderParam.getPayment_type());
orderTickets.setPayCode(syncOrderParam.getCode());
orderTickets.setTimePay(timePay);
orderTickets.setQrCode(IDGenerator.ticketQrCode(orderTicketData.getOrderTicketsId()));
orderTickets.setUpdatedAt(now);
sqls.add(SqlMapping.get("kylin_order_ticket.synPay"));
LinkedList<Object[]> sqlsDataA = new LinkedList<>(); LinkedList<Object[]> sqlsDataA = new LinkedList<>();
sqlsDataA.add(orderTickets.getSynOrderObject(strTime, strTime));
KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
orderTicketStatus.setOrderId(orderTicketData.getOrderTicketsId());
orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS1);
orderTicketStatus.setPayStatus(syncOrderParam.getStatus());
orderTicketStatus.setUpdatedAt(orderTickets.getUpdatedAt());
sqls.add(SqlMapping.get("kylin_order_ticket_status.synPay"));
LinkedList<Object[]> sqlsDataB = new LinkedList<>(); LinkedList<Object[]> sqlsDataB = new LinkedList<>();
sqlsDataB.add(orderTicketStatus.getSynOrderObject(strTime, strTime));
sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
LinkedList<Object[]> sqlsDataC = new LinkedList<>(); LinkedList<Object[]> sqlsDataC = new LinkedList<>();
sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime}); LinkedList<Object[]> sqlsDataD = new LinkedList<>();
LocalDateTime strTime = orderTicketData.getChangeDate();
KylinOrderTickets orderTickets = new KylinOrderTickets();
KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities(); KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
orderTicketEntities.setOrderId(orderTicketData.getOrderTicketsId());
orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT1); if(orderTicketData.getStatus()==0){
orderTicketEntities.setUpdatedAt(orderTickets.getUpdatedAt()); orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
sqls.add(SqlMapping.get("kylin_order_ticket_entities.synPay")); orderTickets.setPaymentType(syncOrderParam.getPayment_type());
LinkedList<Object[]> sqlsDataD = new LinkedList<>(); orderTickets.setPayCode(syncOrderParam.getCode());
sqlsDataD.add(orderTicketEntities.getSynOrderObject(strTime, strTime)); orderTickets.setTimePay(timePay);
orderTickets.setQrCode(IDGenerator.ticketQrCode(orderTicketData.getOrderTicketsId()));
orderTickets.setUpdatedAt(now);
//vo sqls.add(SqlMapping.get("kylin_order_ticket.synPay"));
HashMap<String, Object> orderTicketVo = new HashMap<>(); sqlsDataA.add(orderTickets.getSynOrderObject(strTime, strTime));
orderTicketVo.put("paymentType", orderTickets.getPaymentType());
orderTicketVo.put("payCode", orderTickets.getPayCode()); orderTicketStatus.setOrderId(orderTicketData.getOrderTicketsId());
orderTicketVo.put("timePay", orderTickets.getTimePay()); orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS1);
orderTicketVo.put("qrCode", orderTickets.getQrCode()); orderTicketStatus.setPayStatus(syncOrderParam.getStatus());
orderTicketVo.put("status", KylinTableStatusConst.ORDER_STATUS1); orderTicketStatus.setUpdatedAt(orderTickets.getUpdatedAt());
orderTicketVo.put("payStatus", orderTicketStatus.getStatus()); sqls.add(SqlMapping.get("kylin_order_ticket_status.synPay"));
orderTicketVo.put("updatedAt", timePay); sqlsDataB.add(orderTicketStatus.getSynOrderObject(strTime, strTime));
orderTicketVo.put("changeDate", now);
mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne( sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(), sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketVo))
); orderTicketEntities.setOrderId(orderTicketData.getOrderTicketsId());
orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT1);
orderTicketEntities.setUpdatedAt(orderTickets.getUpdatedAt());
HashMap<String, Object> orderTicketEntitiesVo = new HashMap<>(); sqls.add(SqlMapping.get("kylin_order_ticket_entities.synPay"));
orderTicketEntitiesVo.put("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT1); sqlsDataD.add(orderTicketEntities.getSynOrderObject(strTime, strTime));
orderTicketEntitiesVo.put("updatedAt", timePay);
orderTicketEntitiesVo.put("changeDate", now); //vo
mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateMany( HashMap<String, Object> orderTicketVo = new HashMap<>();
Query.query(Criteria.where("orderId").is(orderTickets.getOrderTicketsId())).getQueryObject(), orderTicketVo.put("paymentType", orderTickets.getPaymentType());
new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketEntitiesVo)) orderTicketVo.put("payCode", orderTickets.getPayCode());
); orderTicketVo.put("timePay", orderTickets.getTimePay());
orderTicketVo.put("qrCode", orderTickets.getQrCode());
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY, orderTicketVo.put("status", KylinTableStatusConst.ORDER_STATUS1);
SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD)); orderTicketVo.put("payStatus", orderTicketStatus.getStatus());
orderTicketVo.put("updatedAt", timePay);
//生成vo redis orderTicketVo.put("changeDate", now);
dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId()); mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null); Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketVo))
// 发短信 );
KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(orderTicketData.getPerformanceId());
KylinTicketTimesVo ticketTimesData = null;
KylinTicketVo ticketData = null; HashMap<String, Object> orderTicketEntitiesVo = new HashMap<>();
for (int x = 0; x < performanceData.getTicketTimeList().size(); x++) { orderTicketEntitiesVo.put("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT1);
KylinTicketTimesVo timeItem = performanceData.getTicketTimeList().get(x); orderTicketEntitiesVo.put("updatedAt", timePay);
if (timeItem.getTimeId().equals(orderTicketData.getTimeId())) { orderTicketEntitiesVo.put("changeDate", now);
ticketTimesData = timeItem; mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateMany(
for (int y = 0; y < ticketTimesData.getTicketList().size(); y++) { Query.query(Criteria.where("orderId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
KylinTicketVo ticketItem = ticketTimesData.getTicketList().get(y); new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketEntitiesVo))
if (ticketItem.getTicketsId().equals(orderTicketData.getTicketId())) { );
ticketData = ticketItem;
break; rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY,
SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD));
//生成vo redis
dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null);
// 发短信
KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(orderTicketData.getPerformanceId());
KylinTicketTimesVo ticketTimesData = null;
KylinTicketVo ticketData = null;
for (int x = 0; x < performanceData.getTicketTimeList().size(); x++) {
KylinTicketTimesVo timeItem = performanceData.getTicketTimeList().get(x);
if (timeItem.getTimeId().equals(orderTicketData.getTimeId())) {
ticketTimesData = timeItem;
for (int y = 0; y < ticketTimesData.getTicketList().size(); y++) {
KylinTicketVo ticketItem = ticketTimesData.getTicketList().get(y);
if (ticketItem.getTicketsId().equals(orderTicketData.getTicketId())) {
ticketData = ticketItem;
break;
}
} }
break;
} }
break;
} }
}
MessageDataVo dataVo = new MessageDataVo(); MessageDataVo dataVo = new MessageDataVo();
dataVo.setName(orderTicketData.getPerformanceTitle()); dataVo.setName(orderTicketData.getPerformanceTitle());
String time1 = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketData.getUseStart()), DateUtil.Formatter.yyyy_MM_dd); String time1 = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketData.getUseStart()), DateUtil.Formatter.yyyy_MM_dd);
String time2 = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceData.getTimeStart()), DateUtil.Formatter.HHmm); String time2 = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceData.getTimeStart()), DateUtil.Formatter.HHmm);
dataVo.setTime(time1 + " " + time2); dataVo.setTime(time1 + " " + time2);
MessageConfigVo configVo = new MessageConfigVo(); MessageConfigVo configVo = new MessageConfigVo();
configVo.setStatus(true); configVo.setStatus(true);
if (orderTicketData.getGetTicketType().equals("express")) { if (orderTicketData.getGetTicketType().equals("express")) {
configVo.setId("SMS_181490473"); configVo.setId("SMS_181490473");
} else if (orderTicketData.getGetTicketType().equals("electronic")) { } else if (orderTicketData.getGetTicketType().equals("electronic")) {
configVo.setId(ticketData.getIsShowCode() == 1 ? "SMS_171358560" : "SMS_181500419"); configVo.setId(ticketData.getIsShowCode() == 1 ? "SMS_171358560" : "SMS_181500419");
} }
otherUtils.sendMessage(orderTicketData.getUserMobile(), dataVo, configVo, 1); otherUtils.sendMessage(orderTicketData.getUserMobile(), dataVo, configVo, 1);
// 大麦回调 // 大麦回调
sycDamaiOrder(orderTickets.getOrderTicketsId()); sycDamaiOrder(orderTickets.getOrderTicketsId());
}else{
orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
}
redisLockUtil.unlock(lock); redisLockUtil.unlock(lock);
return "success"; return "success";
} }
...@@ -1126,6 +1127,20 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -1126,6 +1127,20 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
} }
} }
@Override
public ResponseDto<Integer> orderUnPayCount() {
String uid = CurrentUtil.getCurrentUid();
List<KylinOrderListVo> voList = dataUtils.getOrderList(uid);
Integer unPayCount = 0;
for (KylinOrderListVo item : voList ){
if(item.getStatus()==0){
unPayCount+=1;
}
}
return ResponseDto.success(unPayCount);
}
public boolean checkAgent(String agentId, KylinTicketVo ticketData) { public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
boolean isAgent = ticketData.getIsAgent() == 1; boolean isAgent = ticketData.getIsAgent() == 1;
if (isAgent) { if (isAgent) {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ 1ff11f19
...@@ -331,6 +331,10 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -331,6 +331,10 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
if (info.getAppStatus() != 8) { if (info.getAppStatus() != 8) {
if (1 == DateUtil.compareStrDay(timeStart, nowTimeStr)) {// 未开始 if (1 == DateUtil.compareStrDay(timeStart, nowTimeStr)) {// 未开始
info.setAppStatus(9); info.setAppStatus(9);
int isMemberStatus = getPerformanceIsMemberStatus(info);
if (1 == isMemberStatus) {
info.setAppStatus(6);
}
} else { // 已开始 } else { // 已开始
info.setAppStatus(6); info.setAppStatus(6);
if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 已结束 if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 已结束
...@@ -382,6 +386,24 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -382,6 +386,24 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
return isMemberStatus; return isMemberStatus;
} }
public Integer getPerformanceIsMemberStatus(KylinPerformanceVo info) {// 会员状态
Integer isMemberStatus = 0;
if (null != info) {
if (1 == info.getIsMember()) { // 有会员
String memberTimeStart = info.getSellMemberTime();
String nowTime = DateUtil.getNowTime();
if (1 == DateUtil.compareStrDay(memberTimeStart, nowTime)) { // 还没到会员购买时间
isMemberStatus = 0;
} else { // 可以购买
isMemberStatus = 1;
}
} else {
isMemberStatus = 0;
}
}
return isMemberStatus;
}
public String checkPerformanceTime(String performancesId) { public String checkPerformanceTime(String performancesId) {
try { try {
task.performanceVoStatus(performancesId); task.performanceVoStatus(performancesId);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @ 1ff11f19
...@@ -17,6 +17,7 @@ import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam; ...@@ -17,6 +17,7 @@ import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo; import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param; import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param; import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo; import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
import com.liquidnet.service.kylin.dto.vo.partner.*; import com.liquidnet.service.kylin.dto.vo.partner.*;
import com.liquidnet.service.kylin.entity.*; import com.liquidnet.service.kylin.entity.*;
...@@ -25,6 +26,8 @@ import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerServ ...@@ -25,6 +26,8 @@ import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerServ
import com.liquidnet.service.kylin.timerTask.PerformanceVoTask; import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
import com.liquidnet.service.kylin.utils.DataUtils; import com.liquidnet.service.kylin.utils.DataUtils;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -201,6 +204,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -201,6 +204,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
} }
return performanceId; return performanceId;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
return null; return null;
} }
} }
...@@ -368,7 +372,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -368,7 +372,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
performances.setAuditTime(LocalDateTime.now()); performances.setAuditTime(LocalDateTime.now());
performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId)); performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus(); KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
performanceStatus.setAuditStatus((int)map.get("auditStatus")); performanceStatus.setAuditStatus((int) map.get("auditStatus"));
performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId)); performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId));
//提示：票种价格、售票时间、购票限制 直接生效 //提示：票种价格、售票时间、购票限制 直接生效
...@@ -377,10 +381,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -377,10 +381,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
List<KylinTicketPartnerVo> ticketList = timesItem.getTicket(); List<KylinTicketPartnerVo> ticketList = timesItem.getTicket();
for (KylinTicketPartnerVo ticketItem : ticketList) { for (KylinTicketPartnerVo ticketItem : ticketList) {
//修改 redis库存 //修改 redis库存
if (redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) { if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId())); KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId()));
int changeGeneral = ticketStatus.getTotalGeneral() - ticketItem.getTotalGeneral(); int changeGeneral = ticketItem.getTotalGeneral() - ticketStatus.getTotalGeneral();
int changeExchange = ticketStatus.getTotalGeneral() - ticketItem.getTotalExchange(); int changeExchange = ticketItem.getTotalExchange() - ticketStatus.getTotalGeneral();
dataUtils.changeSurplusGeneral(ticketItem.getTicketsId(), changeGeneral); dataUtils.changeSurplusGeneral(ticketItem.getTicketsId(), changeGeneral);
dataUtils.changeSurplusExchange(ticketItem.getTicketsId(), changeExchange); dataUtils.changeSurplusExchange(ticketItem.getTicketsId(), changeExchange);
} }
...@@ -479,6 +483,14 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -479,6 +483,14 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
ticketStatusUpdate.setUpdatedAt(updatedAt); ticketStatusUpdate.setUpdatedAt(updatedAt);
ticketStatusMapper.update(ticketStatusUpdate ticketStatusMapper.update(ticketStatusUpdate
, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelationsItem.getTicketId()).eq("status", 7)); , new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelationsItem.getTicketId()).eq("status", 7));
HashMap<String, Object> map = new HashMap<>();
map.put("status", 9);
map.put("updatedAt", updatedAt);
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketRelationsItem.getTicketId()).and("status").ne(7)).getQueryObject(),
new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
);
} }
} }
// 判断状态 // 判断状态
...@@ -585,6 +597,18 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -585,6 +597,18 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
try { try {
PageHelper.startPage(performancePartnerListParam.getPage(), performancePartnerListParam.getSize()); PageHelper.startPage(performancePartnerListParam.getPage(), performancePartnerListParam.getSize());
List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam)); List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam));
for (int i = 0; i < voList.size(); i++) {
PerformancePartnerListDao vo = voList.get(i);
if (vo.getStatus() >= 6 && vo.getStatus() != 7) {
if (DateUtil.compareStrDay(vo.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
vo.setStatus(9);
} else if (DateUtil.compareStrDay(vo.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
vo.setStatus(10);
} else {
vo.setStatus(6);
}
}
}
pageInfoTmp = new PageInfo(voList); pageInfoTmp = new PageInfo(voList);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -640,7 +664,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -640,7 +664,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
List<PerformanceOrderStatisticalDao> dtoList = performancesMapper.getPerformanceOrderStatisticalList(performancesId); List<PerformanceOrderStatisticalDao> dtoList = performancesMapper.getPerformanceOrderStatisticalList(performancesId);
dtoList.forEach(dto -> { dtoList.forEach(dto -> {
PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo(); PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
BeanUtil.copy(dto,vo); BeanUtil.copy(dto, vo);
voList.add(vo); voList.add(vo);
countBean.setTotalGeneral(countBean.getTotalGeneral().add(dto.getTotalGeneral())); countBean.setTotalGeneral(countBean.getTotalGeneral().add(dto.getTotalGeneral()));
...@@ -655,7 +679,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -655,7 +679,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
countBean.setTotalBuyUsers(dto.getTotalBuyUsers()); countBean.setTotalBuyUsers(dto.getTotalBuyUsers());
}); });
PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo(); PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
BeanUtil.copy(countBean,vo); BeanUtil.copy(countBean, vo);
voList.add(vo); voList.add(vo);
return voList; return voList;
} }
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ 1ff11f19
...@@ -116,14 +116,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -116,14 +116,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType()); kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
kylinTicketPartnerVo.setStatus(0); kylinTicketPartnerVo.setStatus(0);
kylinTicketPartnerVo.setDefault(); kylinTicketPartnerVo.setDefault();
if(ticketCreateParam.getIsExpress()==1){ if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
}else{ } else {
kylinTicketPartnerVo.setDescribesExpress(""); kylinTicketPartnerVo.setDescribesExpress("");
} }
if(ticketCreateParam.getIsElectronic()==1){ if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()); kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
}else{ } else {
kylinTicketPartnerVo.setDescribeElectronic(""); kylinTicketPartnerVo.setDescribeElectronic("");
} }
...@@ -166,14 +166,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -166,14 +166,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setUseStart(kylinTicketTimesPartnerVo.getUseStart()); kylinTicketPartnerVo.setUseStart(kylinTicketTimesPartnerVo.getUseStart());
kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd()); kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType()); kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
if(ticketCreateParam.getIsExpress()==1){ if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
}else{ } else {
kylinTicketPartnerVo.setDescribesExpress(""); kylinTicketPartnerVo.setDescribesExpress("");
} }
if(ticketCreateParam.getIsElectronic()==1){ if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()); kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
}else{ } else {
kylinTicketPartnerVo.setDescribeElectronic(""); kylinTicketPartnerVo.setDescribeElectronic("");
} }
...@@ -221,10 +221,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -221,10 +221,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); kylinTicketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
kylinTicketPartnerVo.setTimesId(null); kylinTicketPartnerVo.setTimesId(null);
kylinTicketPartnerVo.setStatus(null); kylinTicketPartnerVo.setStatus(null);
if(ticketCreateParam.getIsExpress()==1){ if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
} }
if(ticketCreateParam.getIsElectronic()==1){ if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()); kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
} }
...@@ -299,13 +299,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -299,13 +299,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
} }
@Override @Override
public ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId,String ticketsId) { public ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId, String ticketsId) {
try { try {
// 获取 当前时间 -> 创建时间 // 获取 当前时间 -> 创建时间
LocalDateTime createdAt = LocalDateTime.now(); LocalDateTime createdAt = LocalDateTime.now();
PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()); PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if(performancePartnerVo.getAuditStatus()==0 || performancePartnerVo.getAuditStatus()==1){ if (performancePartnerVo.getAuditStatus() == 0 || performancePartnerVo.getAuditStatus() == 1) {
return ResponseDto.failure(ErrorMapping.get(20107)); return ResponseDto.failure(ErrorMapping.get(20107));
} }
...@@ -324,22 +324,28 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -324,22 +324,28 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
} }
@Override @Override
public boolean submitTicketByTimes(String timesId,Integer status) { public boolean submitTicketByTimes(String timesId, Integer status) {
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
if(null==status) { if (null == status) {
map.put("status", 1); map.put("status", 1);
}else{ } else {
map.put("status", status); map.put("status", status);
} }
map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map)); BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
UpdateResult updateResult = mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateMany( mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("timesId").is(timesId).and("status").ne(-2)).getQueryObject(), Query.query(Criteria.where("timesId").is(timesId).and("status").nin(-2, 7)).getQueryObject(),
object object
); );
return updateResult.getModifiedCount() <= 0;
long count = mongoTemplate.count(
Query.query(Criteria.where("timesId").is(timesId)),
KylinTicketPartnerVo.class,
KylinTicketPartnerVo.class.getSimpleName()
);
return count <= 0;
} }
@Override @Override
...@@ -353,7 +359,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -353,7 +359,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
} }
@Override @Override
public ResponseDto<String> onLine(String ticketsId,String performancesId) { public ResponseDto<String> onLine(String ticketsId, String performancesId) {
try { try {
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId)); KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
...@@ -365,8 +371,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -365,8 +371,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId)); ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
HashMap<String,Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("status",9); map.put("status", 9);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map)); BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(), Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
...@@ -378,14 +384,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -378,14 +384,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20110)); return ResponseDto.failure(ErrorMapping.get(20110));
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return ResponseDto.failure(ErrorMapping.get(20108)); return ResponseDto.failure(ErrorMapping.get(20108));
} }
} }
@Override @Override
public ResponseDto<String> outLine(String ticketsId,String performancesId) { public ResponseDto<String> outLine(String ticketsId, String performancesId) {
try { try {
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId)); KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
...@@ -396,8 +402,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -396,8 +402,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
changeStatus.setStatus(7); changeStatus.setStatus(7);
ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId)); ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
// mongo 操作 // mongo 操作
HashMap<String,Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("status",7); map.put("status", 7);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map)); BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(), Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
...@@ -409,7 +415,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -409,7 +415,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20111)); return ResponseDto.failure(ErrorMapping.get(20111));
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return ResponseDto.failure(ErrorMapping.get(20109)); return ResponseDto.failure(ErrorMapping.get(20109));
} }
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @ 1ff11f19
...@@ -194,39 +194,44 @@ public class PerformanceVoTask { ...@@ -194,39 +194,44 @@ public class PerformanceVoTask {
* @return * @return
*/ */
public KylinPerformanceMisVo getPerformanceMisVo(String performancesId) { public KylinPerformanceMisVo getPerformanceMisVo(String performancesId) {
PerformancePartnerVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()); try {
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId); PerformancePartnerVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>(); List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
ArrayList<BigDecimal> floatList = new ArrayList<>();
ArrayList<String> StringList = new ArrayList<>(); ArrayList<BigDecimal> floatList = new ArrayList<>();
ArrayList<String> StringList = new ArrayList<>();
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVos) {
TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo(); for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVos) {
BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo); TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
List<KylinTicketPartnerVo> kylinTicketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId()); BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
ticketTimesTicketCreatePartnerVo.setTicket(kylinTicketPartnerVos); List<KylinTicketPartnerVo> kylinTicketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo); ticketTimesTicketCreatePartnerVo.setTicket(kylinTicketPartnerVos);
for (KylinTicketPartnerVo kylinTicketPartnerVoItem : kylinTicketPartnerVos) { ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
floatList.add(kylinTicketPartnerVoItem.getPrice()); for (KylinTicketPartnerVo kylinTicketPartnerVoItem : kylinTicketPartnerVos) {
StringList.add(kylinTicketPartnerVoItem.getTimeEnd()); floatList.add(kylinTicketPartnerVoItem.getPrice());
StringList.add(kylinTicketPartnerVoItem.getTimeEnd());
}
} }
} KylinPerformanceMisVo kylinPerformanceMisVo = new KylinPerformanceMisVo();
KylinPerformanceMisVo kylinPerformanceMisVo = new KylinPerformanceMisVo(); BeanUtils.copyProperties(performanceData, kylinPerformanceMisVo);
BeanUtils.copyProperties(performanceData, kylinPerformanceMisVo);
floatList.sort(Comparator.naturalOrder()); floatList.sort(Comparator.naturalOrder());
StringList.sort(Comparator.naturalOrder()); StringList.sort(Comparator.naturalOrder());
kylinPerformanceMisVo.setPrice(floatList.get(0) + "起"); kylinPerformanceMisVo.setPrice(floatList.get(0) + "起");
kylinPerformanceMisVo.setStopSellTime(StringList.get(0)); kylinPerformanceMisVo.setStopSellTime(StringList.get(0));
kylinPerformanceMisVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList); kylinPerformanceMisVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
kylinPerformanceMisVo.setIsDistribution(0); kylinPerformanceMisVo.setIsDistribution(0);
kylinPerformanceMisVo.setSyncAgent(0); kylinPerformanceMisVo.setSyncAgent(0);
kylinPerformanceMisVo.setAuditStatus(0); kylinPerformanceMisVo.setAuditStatus(0);
return kylinPerformanceMisVo; return kylinPerformanceMisVo;
}catch (Exception e){
e.printStackTrace();
return null;
}
} }
/** /**
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/MongoVoUtils.java
View file @ 1ff11f19
...@@ -88,6 +88,9 @@ public class MongoVoUtils { ...@@ -88,6 +88,9 @@ public class MongoVoUtils {
KylinTicketRelations ticket = t3.get(y); KylinTicketRelations ticket = t3.get(y);
KylinTickets t1 = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticket.getTicketId())); KylinTickets t1 = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticket.getTicketId()));
KylinTicketStatus t2 = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticket.getTicketId())); KylinTicketStatus t2 = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticket.getTicketId()));
// if(t2.getStatus()==7){
// continue;
// }
KylinTicketVo kylinTicketVo = new KylinTicketVo(); KylinTicketVo kylinTicketVo = new KylinTicketVo();
kylinTicketVo.setTimeId(ticket.getTimesId()); kylinTicketVo.setTimeId(ticket.getTimesId());
kylinTicketVo.setTicket(t1); kylinTicketVo.setTicket(t1);
...@@ -137,12 +140,14 @@ public class MongoVoUtils { ...@@ -137,12 +140,14 @@ public class MongoVoUtils {
} }
} }
KylinTicketTimesVo kylinTicketTimesVo = new KylinTicketTimesVo(); // if(ticketList.size()>0) {
kylinTicketTimesVo.setTicketTimes(tt1); KylinTicketTimesVo kylinTicketTimesVo = new KylinTicketTimesVo();
kylinTicketTimesVo.setPerformanceId(times.getPerformanceId()); kylinTicketTimesVo.setTicketTimes(tt1);
kylinTicketTimesVo.setTimeId(times.getTimesId()); kylinTicketTimesVo.setPerformanceId(times.getPerformanceId());
kylinTicketTimesVo.setTicketList(ticketList); kylinTicketTimesVo.setTimeId(times.getTimesId());
timeList.add(kylinTicketTimesVo); kylinTicketTimesVo.setTicketList(ticketList);
timeList.add(kylinTicketTimesVo);
// }
} }
voData.setPerformance(p1); voData.setPerformance(p1);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties
View file @ 1ff11f19
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
20112=不可修改 20112=不可修改
20113=未创建场次 20113=未创建场次
20114=有场次为创建票种 20114=有场次未创建票种
20115=提交失败 20115=提交失败
20116=不可撤回 20116=不可撤回
20117=撤回失败 20117=撤回失败
......
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