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

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

调用权限接口

parent d88c76f1
...@@ -63,7 +63,8 @@ public class KylinPerformanceVo { ...@@ -63,7 +63,8 @@ public class KylinPerformanceVo {
private String projectId; private String projectId;
@ApiModelProperty(value = "巡演id") @ApiModelProperty(value = "巡演id")
private String roadShowId; private String roadShowId;
@ApiModelProperty(value = "主办方id")
private String sponsorId;
// OSS // OSS
@ApiModelProperty(value = "演出详情") @ApiModelProperty(value = "演出详情")
private String details; private String details;
...@@ -140,6 +141,7 @@ public class KylinPerformanceVo { ...@@ -140,6 +141,7 @@ public class KylinPerformanceVo {
this.notice = performance.getNotice(); this.notice = performance.getNotice();
this.approvalUrl = performance.getApprovalUrl(); this.approvalUrl = performance.getApprovalUrl();
this.rejectTxt = performance.getRejectTxt(); this.rejectTxt = performance.getRejectTxt();
this.sponsorId = performance.getSponsorId();
} }
public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellMemberTime, LocalDateTime sellTime, int isAdvance, int isDiscount, int payCountdownMinute) { public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellMemberTime, LocalDateTime sellTime, int isAdvance, int isDiscount, int payCountdownMinute) {
......
...@@ -24,6 +24,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.*; ...@@ -24,6 +24,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.*;
import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService; import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService; import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService; import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsService;
import com.liquidnet.service.merchant.util.*; import com.liquidnet.service.merchant.util.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -68,6 +69,8 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -68,6 +69,8 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
IKylinTicketsPartnerService ticketsPartnerService; IKylinTicketsPartnerService ticketsPartnerService;
@Autowired @Autowired
IKylinTicketTimesPartnerService ticketTimesPartnerService; IKylinTicketTimesPartnerService ticketTimesPartnerService;
@Autowired
IMerchantAuthorizationRecordsService merchantAuthorizationRecordsService;
@Override @Override
public String step1(PerformanceStep1Param step1Param) { public String step1(PerformanceStep1Param step1Param) {
...@@ -252,6 +255,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -252,6 +255,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
now, performanceId, now, now now, performanceId, now, now
)); ));
} }
merchantAuthorizationRecordsService.authorizationInit(performanceId, merchantId, performancePartnerVo.getFieldId(), performancePartnerVo.getSponsorId());
return ResponseDto.success("操作成功"); return ResponseDto.success("操作成功");
} else { //保存 } else { //保存
performancePartnerVo.setStatus(0); performancePartnerVo.setStatus(0);
...@@ -379,18 +383,19 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -379,18 +383,19 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(ticketItem.getTicketsId()); KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(ticketItem.getTicketsId());
redisMerchantUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo); redisMerchantUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo);
sqlsDataE.add(new Object[]{ticketItem.getTicketsId()}); sqlsDataE.add(new Object[]{ticketItem.getTicketsId()});
for (String mVo:moduleVo.getExpressModuleIdList()) for (String mVo : moduleVo.getExpressModuleIdList())
sqlsDataF.add(new Object[]{ sqlsDataF.add(new Object[]{
ticketItem.getTicketsId(),mVo,now,now ticketItem.getTicketsId(), mVo, now, now
}); });
} }
} }
String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD,sqlsDataE,sqlsDataF); String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE, sqlsDataF);
queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_STEP2.getKey(), queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_STEP2.getKey(),
sqlData); sqlData);
performanceUtils.performanceVoStatus(performanceId, null); performanceUtils.performanceVoStatus(performanceId, null);
} }
merchantAuthorizationRecordsService.authorizationInit(performanceId, merchantId, performancePartnerVo.getFieldId(), performancePartnerVo.getSponsorId());
return ResponseDto.success("操作完成"); return ResponseDto.success("操作完成");
} else { //保存 } else { //保存
performancePartnerVo.setStatus(0); performancePartnerVo.setStatus(0);
...@@ -641,6 +646,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -641,6 +646,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
2, performancesId, now, now 2, performancesId, now, now
)); ));
} }
merchantAuthorizationRecordsService.authorizationInit(performancesId,merchantId,vo.getFieldId(),vo.getSponsorId());
mongoMerchantUtils.updatePerformancePartnerVoById(performancePartnerVo); mongoMerchantUtils.updatePerformancePartnerVoById(performancePartnerVo);
log.info(UserPathDto.setPartnerData("0", "withdraw", "performancesId=" + performancesId, "撤回成功")); log.info(UserPathDto.setPartnerData("0", "withdraw", "performancesId=" + performancesId, "撤回成功"));
return ResponseDto.success("撤回成功"); return ResponseDto.success("撤回成功");
......
...@@ -583,8 +583,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -583,8 +583,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
httpData.add("showUrl", payOrderParam.getShowUrl() + orderTicketId); httpData.add("showUrl", payOrderParam.getShowUrl() + orderTicketId);
httpData.add("returnUrl", payOrderParam.getReturnUrl() + orderTicketId); httpData.add("returnUrl", payOrderParam.getReturnUrl() + orderTicketId);
} }
log.debug("调用 DRAGON 参数 = " + httpData.toString());
String returnData = HttpUtil.post(payUrl, httpData); String returnData = HttpUtil.post(payUrl, httpData);
log.info("调用 DRAGON 结果 = " + returnData); log.debug("调用 DRAGON 结果 = " + returnData);
payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class); payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
payResultVo.getData().setOrderId(orderTicketId); payResultVo.getData().setOrderId(orderTicketId);
payResultVo.getData().setPrice(orderTickets.getPriceActual()); payResultVo.getData().setPrice(orderTickets.getPriceActual());
......
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