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

Commit c0ef20bb authored by 胡佳晨's avatar 胡佳晨

提交merchant 驳回演出

parent e5fe2f52
......@@ -170,7 +170,7 @@ public interface IKylinPerformancesPartnerService {
* @param performancesId 演出id
* @return String
*/
ResponseDto<String> fieldsAuditPerformance(String performancesId,Integer status);
ResponseDto<String> fieldsAuditPerformance(String performancesId,Integer status,String rejectTxt);
List<PerformanceOrderStatisticalVo> getPerformanceOrderStatisticalList(String performancesId);
}
......@@ -162,10 +162,12 @@ public class KylinPerformancePartnerController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "performancesId", value = "演出ID", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "status", value = "[1-待审核|2-已拒绝]", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "rejectTxt", value = "驳回原因]", required = true),
})
public ResponseDto<String> fieldsAuditPerformance(@RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId,
@RequestParam("status") @NotNull(message = "审核状态不能为空") Integer status) {
return performancesPartnerService.fieldsAuditPerformance(performancesId, status);
@RequestParam("status") @NotNull(message = "审核状态不能为空") Integer status,
@RequestParam(value = "rejectTxt", required = false) String rejectTxt) {
return performancesPartnerService.fieldsAuditPerformance(performancesId, status, rejectTxt);
}
}
......@@ -27,6 +27,7 @@ import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
import com.liquidnet.service.merchant.constant.MerchantAuthorizationConst;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.util.*;
import com.mongodb.BasicDBObject;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.util.DataUtils;
import org.springframework.beans.BeanUtils;
......@@ -825,15 +826,26 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
}
@Override
public ResponseDto<String> fieldsAuditPerformance(String performancesId, Integer status) {
public ResponseDto<String> fieldsAuditPerformance(String performancesId, Integer status, String rejectTxt) {
LocalDateTime now = LocalDateTime.now();
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
if (vo.getFieldAuditStatus() == 1) {
return ResponseDto.failure("演出不需要审核");
} else if (vo.getFieldAuditStatus() == 0) {
KylinPerformanceVo changeVo = KylinPerformanceVo.getNew();
changeVo.setFieldAuditStatus(status);
changeVo.setRejectTxt(rejectTxt);
changeVo.setPerformancesId(performancesId);
mongoMerchantUtils.updateKylinPerformanceVoById(changeVo);
redisMerchantUtils.delPerformanceVo(performancesId);
PerformancePartnerVo changePartnerVo = PerformancePartnerVo.getNew();
changePartnerVo.setFieldAuditStatus(status);
changePartnerVo.setRejectTxt(rejectTxt);
changePartnerVo.setUpdatedAt(now.format(DateUtil.DTF_YMD_HMS));
mongoMerchantUtils.updatePerformancePartnerVoById(changePartnerVo);
queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_PERFORMANCE_UPDATE.getKey(),
SqlMapping.get("kylin_performance_status.fieldsStatus",
status, performancesId, now, now
status, rejectTxt, performancesId, now, now
));
}
return ResponseDto.success("审核完成");
......
......@@ -35,7 +35,7 @@ kylin_performances_status.onLine=UPDATE kylin_performance_status SET status = ?
kylin_ticket_status.update_status=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_ticket_status.onLine=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
# ---- 场地审核演出 ----
kylin_performance_status.fieldsStatus = UPDATE kylin_performance_status SET field_audit_status = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_performance_status.fieldsStatus = UPDATE kylin_performance_status SET field_audit_status = ? , reject_txt = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
# ---- 演出第二步骤操作 ----
kylin_performance.updateStep2=UPDATE kylin_performances SET audit_time = ? , notice_image = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_performance_status.updateStep2=UPDATE kylin_performance_status SET field_audit_status = ? ,audit_status = ? , is_true_name = ? , limit_count = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
......
......@@ -716,7 +716,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
}
@Override
public ResponseDto<String> fieldsAuditPerformance(String performancesId, Integer status) {
public ResponseDto<String> fieldsAuditPerformance(String performancesId, Integer status,String rejectTxt) {
return null;
}
......
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