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

Skip to content

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

修改 会员审核bug

parent 0d3fbb85
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 57 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketPartnerVo.java
View file @ a24de318
......@@ -114,6 +114,6 @@ public class KylinTicketPartnerVo implements Serializable {
this.setIsTransfer(0);
this.setIsExclusive(0);
this.setSurplusExchange(this.getTotalExchange());
this.setSurplusGeneral(this.getTotalExchange());
this.setSurplusGeneral(this.getTotalGeneral());
}
}
\ No newline at end of file
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/memberAudit/edit.html
View file @ a24de318
......@@ -129,9 +129,16 @@
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/save", $('#form-member-audit').serialize());
const auditStatus = document.getElementsByName("status")[0].checked ? 3 : 4;
if (4 === auditStatus) {
auditRejectTxt = document.getElementsByName("rejectTxt")[0].value;
}if (4 === auditStatus && auditRejectTxt === "") {
alert("请填写拒绝理由");
} else {
$.operate.save(prefix + "/save", $('#form-member-audit').serialize());
}
}
}
</script>
</body>
</html>
\ No newline at end of file
</html>
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 @ a24de318
......@@ -156,7 +156,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
mapSql.put("status", 9);
mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, performanceVoUtils.getPerformanceMisVo(performancesId), updatedAt, auditStatus);
if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus()!=7) {//若 演出上 则 线判断状态
if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7) {//若 演出上 则 线判断状态
performanceVoUtils.performanceVoStatus(performancesId);
}
}
......@@ -202,7 +202,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
List<PerformanceAdminListDao> newList = new ArrayList();
try {
Map<String ,Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
for (PerformanceAdminListDao item : voList) {
item.setStatus(item.getStatus());
......@@ -331,13 +331,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
performanceMemberAuditDao.setIsExclusive(1);
}
}
PerformanceMemberAuditParam memberAuditVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
if (memberAuditVo != null) {
if (memberAuditVo.getStatus() == 1) {
boolean isExists = mongoTemplate.exists(Query.query(Criteria.where("status").is(1).and("performancesId").is(performanceId)), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
if (isExists) {
performanceMemberAuditDao.setIsSubmit(1);
} else {
performanceMemberAuditDao.setIsSubmit(0);
}
} else {
performanceMemberAuditDao.setIsSubmit(0);
}
......@@ -347,9 +343,14 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Override
public boolean performanceMemberChange(PerformanceMemberAuditParam performanceMemberAuditParam) {
try {
performanceMemberAuditParam.setStatus(1);
mongoTemplate.insert(performanceMemberAuditParam, PerformanceMemberAuditParam.class.getSimpleName());
return true;
boolean isExists = mongoTemplate.exists(Query.query(Criteria.where("status").is(1).and("performancesId").is(performanceMemberAuditParam.getPerformancesId())), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
if (isExists) {
return false;
} else {
performanceMemberAuditParam.setStatus(1);
mongoTemplate.insert(performanceMemberAuditParam, PerformanceMemberAuditParam.class.getSimpleName());
return true;
}
} catch (Exception e) {
return false;
}
......@@ -525,7 +526,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
public boolean changeSysDamai(List<SysDamaiParam> params) {
try {
LocalDateTime updatedAt = LocalDateTime.now();
String performancesId="";
String performancesId = "";
for (SysDamaiParam item : params) {
if (item.getStatus() != 0 && item.getStatus() != 1) {
return false;
......@@ -537,7 +538,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
ticketStatus.setSyncDamai(item.getStatus());
ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", item.getId()));
} else if (item.getType().equals("performance")) {
performancesId=item.getId();
performancesId = item.getId();
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
performanceStatus.setUpdatedAt(updatedAt);
performanceStatus.setSyncDamai(item.getStatus());
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @ a24de318
......@@ -356,7 +356,6 @@ public class PerformanceVoUtils {
dataUtils.setSurplusExchange(tickets.getTicketsId(), ticketStatus.getSurplusExchange());
dataUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral());
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(),
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ a24de318
......@@ -296,7 +296,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
LocalDateTime createdAt = LocalDateTime.now();
PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if(performancePartnerVo.getAuditStatus()==1){
if(performancePartnerVo.getAuditStatus()==0){
return ResponseDto.failure(ErrorMapping.get(20107));
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @ a24de318
......@@ -95,7 +95,7 @@ public class PerformanceVoTask {
List<String> performanceIdList = new ArrayList<>();
if (performanceSingleId == null) {
List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6,8,9));
List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6, 8, 9));
for (KylinPerformanceStatus item : list) {
performanceIdList.add(item.getPerformanceId());
}
......@@ -146,7 +146,7 @@ public class PerformanceVoTask {
}
}
if(kylinTicketVoItem.getStatus()==7){
if (kylinTicketVoItem.getStatus() == 7) {
status = 7;
}
......@@ -171,18 +171,18 @@ public class PerformanceVoTask {
}
}
}
if(vo.getAppStatus()<=4){
appStatus=vo.getAppStatus();
if (vo.getAppStatus() <= 4) {
appStatus = vo.getAppStatus();
}
if(vo.getAppStatus()==7){
appStatus=7;
if (vo.getAppStatus() == 7) {
appStatus = 7;
}
//修改演出状态
KylinPerformanceStatus changeStatus = new KylinPerformanceStatus();
changeStatus.setStatus(appStatus);
performanceStatusMapper.update(changeStatus,new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performancesId));
performanceStatusMapper.update(changeStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
vo.setAppStatus(appStatus);
dataUtils.updatePerformanceMongo(performancesId,vo);
dataUtils.updatePerformanceMongo(performancesId, vo);
}
}
......@@ -361,6 +361,9 @@ public class PerformanceVoTask {
ticketStatusMapper.insert(ticketStatus);
ticketRelationsMapper.delete(new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", ticketRelations.getTicketId()));
ticketRelationsMapper.insert(ticketRelations);
dataUtils.setSurplusExchange(tickets.getTicketsId(), ticketStatus.getSurplusExchange());
dataUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral());
}
}
} catch (Exception e) {
......@@ -369,42 +372,42 @@ public class PerformanceVoTask {
}
public boolean judgeIsAudit(String performanceId){
public boolean judgeIsAudit(String performanceId) {
KylinPerformanceMisVo misVo = getPerformanceMisVo(performanceId);
KylinPerformanceVo mongoVo = mongoVoUtils.combinePerformanceVoData(performanceId);
if(!misVo.getTitle().equals(mongoVo.getTitle())){
if (!misVo.getTitle().equals(mongoVo.getTitle())) {
return true;
}else if(!misVo.getType().equals(mongoVo.getType())){
} else if (!misVo.getType().equals(mongoVo.getType())) {
return true;
}else if(!misVo.getTimeStart().equals(mongoVo.getTimeStart())){
} else if (!misVo.getTimeStart().equals(mongoVo.getTimeStart())) {
return true;
}else if(!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())){
} else if (!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())) {
return true;
}else if(!misVo.getFieldId().equals(mongoVo.getFieldId())){
} else if (!misVo.getFieldId().equals(mongoVo.getFieldId())) {
return true;
}else if(!misVo.getNotice().equals(mongoVo.getNotice())){
} else if (!misVo.getNotice().equals(mongoVo.getNotice())) {
return true;
}else if(!misVo.getDetails().equals(mongoVo.getDetails())){
} else if (!misVo.getDetails().equals(mongoVo.getDetails())) {
return true;
}else if(!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())){
} else if (!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())) {
return true;
}else if(!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())){
} else if (!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())) {
return true;
}else if(!misVo.getLimitCount().equals(mongoVo.getLimitCount())){
} else if (!misVo.getLimitCount().equals(mongoVo.getLimitCount())) {
return true;
} else if(!misVo.getIsTrueName().equals(mongoVo.getIsTrueName())){
} else if (!misVo.getIsTrueName().equals(mongoVo.getIsTrueName())) {
return true;
}
boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is("-1").and("performancesId").is(performanceId)),KylinTicketTimesPartnerVo.class,KylinTicketTimesPartnerVo.class.getSimpleName());
if(exists){
boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is("-1").and("performancesId").is(performanceId)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
if (exists) {
return true;
}
for (int i = 0;i<misVo.getTicketTimes().size();i++){
for (int i = 0; i < misVo.getTicketTimes().size(); i++) {
TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(i);
boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is("-2").and("timesId").is(times.getTicketTimesId())),KylinTicketPartnerVo.class,KylinTicketPartnerVo.class.getSimpleName());
if(exists2){
boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is("-2").and("timesId").is(times.getTicketTimesId())), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
if (exists2) {
return true;
}
}
......
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