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

Commit 5b731dcf authored by Tice's avatar Tice

Merge branch 'dev_merchant' into dev_merchant_tice

parents a160c9d1 3bf495da
...@@ -30,6 +30,8 @@ public class KylinRedisConst { ...@@ -30,6 +30,8 @@ public class KylinRedisConst {
public static final String TICKET_EXPRESS_MODULE_P = "kylin:ticket:express_module:p:";//票种快递票模板关联vo [第三方非线上] public static final String TICKET_EXPRESS_MODULE_P = "kylin:ticket:express_module:p:";//票种快递票模板关联vo [第三方非线上]
public static final String TICKET_EXPRESS_MODULE = "kylin:ticket:express_module:";//票种快递票模板关联vo [线上] public static final String TICKET_EXPRESS_MODULE = "kylin:ticket:express_module:";//票种快递票模板关联vo [线上]
public static final String TIMES_SESSION_CODE = "kylin:ticketTime:";//票种快递票模板关联vo [线上]
public static final String ORDER_TRANSFER = "kylin:order:transfer:uid:"; public static final String ORDER_TRANSFER = "kylin:order:transfer:uid:";
//订单导入失败key //订单导入失败key
public static final String ORDER_IMPORT_FAIL = "kylin:order:import:fail:"; public static final String ORDER_IMPORT_FAIL = "kylin:order:import:fail:";
......
...@@ -15,7 +15,7 @@ public class STInsertOrderParam implements Cloneable{ ...@@ -15,7 +15,7 @@ public class STInsertOrderParam implements Cloneable{
@ApiModelProperty(value = "订单id [必传]") @ApiModelProperty(value = "订单id [必传]")
String orderId; String orderId;
@ApiModelProperty(value = "下单时间 [必传]") @ApiModelProperty(value = "下单时间 [必传]")
LocalDateTime orderTime; String orderTime;
@ApiModelProperty(value = "渠道类型,1自销,2分销 [必传]") @ApiModelProperty(value = "渠道类型,1自销,2分销 [必传]")
Integer channelType; Integer channelType;
@ApiModelProperty(value = "渠道名称 [必传]") @ApiModelProperty(value = "渠道名称 [必传]")
......
...@@ -8,7 +8,7 @@ import java.io.Serializable; ...@@ -8,7 +8,7 @@ import java.io.Serializable;
@Data @Data
@ApiModel @ApiModel
public class OrderVo implements Serializable { public class OrderVo implements Serializable ,Cloneable{
private static final long serialVersionUID = 4073256621782131607L; private static final long serialVersionUID = 4073256621782131607L;
@ApiModelProperty(value = "票单id [必传]") @ApiModelProperty(value = "票单id [必传]")
private String ticketOrderId; private String ticketOrderId;
...@@ -26,4 +26,15 @@ public class OrderVo implements Serializable { ...@@ -26,4 +26,15 @@ public class OrderVo implements Serializable {
private String ticketId; private String ticketId;
@ApiModelProperty(value = "票实收金额[必传 单位分]") @ApiModelProperty(value = "票实收金额[必传 单位分]")
private long ticketOrderAmount; private long ticketOrderAmount;
private static final OrderVo obj = new OrderVo();
public static OrderVo getNew() {
try {
return (OrderVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new OrderVo();
}
} }
...@@ -8,7 +8,7 @@ import java.io.Serializable; ...@@ -8,7 +8,7 @@ import java.io.Serializable;
@Data @Data
@ApiModel @ApiModel
public class TicketVo implements Serializable { public class TicketVo implements Serializable, Cloneable {
private static final long serialVersionUID = 4073256621782131607L; private static final long serialVersionUID = 4073256621782131607L;
@ApiModelProperty(value = "票ID [必传]") @ApiModelProperty(value = "票ID [必传]")
private String ticketId; private String ticketId;
...@@ -22,4 +22,14 @@ public class TicketVo implements Serializable { ...@@ -22,4 +22,14 @@ public class TicketVo implements Serializable {
private String rowName; private String rowName;
@ApiModelProperty(value = "座位号 [有座必传]") @ApiModelProperty(value = "座位号 [有座必传]")
private String seatNo; private String seatNo;
private static final TicketVo obj = new TicketVo();
public static TicketVo getNew() {
try {
return (TicketVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new TicketVo();
}
} }
...@@ -18,9 +18,9 @@ public class TimesVo implements Serializable,Cloneable { ...@@ -18,9 +18,9 @@ public class TimesVo implements Serializable,Cloneable {
@ApiModelProperty(value = "演出场所或场厅编码,兼容传递场所code [必传]") @ApiModelProperty(value = "演出场所或场厅编码,兼容传递场所code [必传]")
private String hallCode; private String hallCode;
@ApiModelProperty(value = "场次开始时间 [必传]") @ApiModelProperty(value = "场次开始时间 [必传]")
private LocalDateTime sessionStartTime; private String sessionStartTime;
@ApiModelProperty(value = "场次演出结束时间 [必传]") @ApiModelProperty(value = "场次演出结束时间 [必传]")
private LocalDateTime sessionEndTime; private String sessionEndTime;
@ApiModelProperty(value = "是否有座[必传 0:无座1:有座]") @ApiModelProperty(value = "是否有座[必传 0:无座1:有座]")
private Integer hasSeat; private Integer hasSeat;
@ApiModelProperty(value = "票图URL [有座必传]") @ApiModelProperty(value = "票图URL [有座必传]")
......
...@@ -26,6 +26,9 @@ import java.util.List; ...@@ -26,6 +26,9 @@ import java.util.List;
*/ */
public interface IKylinPerformancesAdminService { public interface IKylinPerformancesAdminService {
void test();
/** /**
* 获取演出详情 * 获取演出详情
* *
......
...@@ -56,6 +56,11 @@ public class KylinPerformancesController extends BaseController { ...@@ -56,6 +56,11 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/performances"; return prefix + "/performances";
} }
@GetMapping(value = "/test")
public void test() {
kylinPerformancesService.test();
}
/** /**
* 查询演出列表 * 查询演出列表
*/ */
......
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.InnerService;
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.client.admin.zhengzai.merchant.service.IMerchantAuthorizationRecordsAdminService; import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantAuthorizationRecordsAdminService;
...@@ -81,6 +82,21 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -81,6 +82,21 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
private KylinOrderImportMapper orderImportMapper; private KylinOrderImportMapper orderImportMapper;
@Autowired @Autowired
IMerchantAuthorizationRecordsAdminService merchantAuthorizationRecordsAdminService; IMerchantAuthorizationRecordsAdminService merchantAuthorizationRecordsAdminService;
@Autowired
InnerService innerService;
@Override
public void test() {
// //同步演出
// String performancesId = "324470932321198083852669";
// KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
// KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
// merchantAuthorizationRecordsAdminService.authorizationInit(performancesId, "484418569471385607065926", "528301618682265605017366", "528268445384048648038465");
// innerService.reportP(dataUtils.getPerformanceVo(performancesId),null,data.getSponsorId());
// //同步订单
// String orderId = "324561214127595525805856";
// innerService.reportO(dataUtils.getOrderTicketVo(orderId),"摩登天空");
}
@Override @Override
public KylinPerformanceMisVo performanceDetails(String performancesId) { public KylinPerformanceMisVo performanceDetails(String performancesId) {
...@@ -147,6 +163,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -147,6 +163,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId)); KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId)); KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
merchantAuthorizationRecordsAdminService.authorizationInit(performancesId, relationData.getMerchantId(), relationData.getFieldId(), data.getSponsorId()); merchantAuthorizationRecordsAdminService.authorizationInit(performancesId, relationData.getMerchantId(), relationData.getFieldId(), data.getSponsorId());
innerService.reportP(dataUtils.getPerformanceVo(performancesId),data.getApprovalUrl(),data.getSponsorId());
} else { //只修改演出相关 场次 票 (不包括 库存 售卖时间 限购) } else { //只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
log.info(" PERFORMANCE 演出审核 修改"); log.info(" PERFORMANCE 演出审核 修改");
......
package com.liquidnet.service.merchant.util; package com.liquidnet.service.merchant.util;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.google.gson.JsonObject;
import com.liquidnet.commons.lang.util.CollectionUtil; import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.HttpUtil; import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.ticketSystem.STInsertPerformanceParam; import com.liquidnet.service.kylin.dto.param.ticketSystem.*;
import com.liquidnet.service.kylin.dto.param.ticketSystem.STInsertTicketPriceParam;
import com.liquidnet.service.kylin.dto.param.ticketSystem.STUpdatePerformanceParam;
import com.liquidnet.service.kylin.dto.param.ticketSystem.STUpdateTimesParam;
import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.ticketSystem.TicketPriceVo; import com.liquidnet.service.kylin.dto.vo.ticketSystem.TicketPriceVo;
import com.liquidnet.service.kylin.dto.vo.ticketSystem.TicketVo;
import com.liquidnet.service.kylin.dto.vo.ticketSystem.TimesVo; import com.liquidnet.service.kylin.dto.vo.ticketSystem.TimesVo;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -23,8 +23,12 @@ import org.springframework.util.MultiValueMap; ...@@ -23,8 +23,12 @@ import org.springframework.util.MultiValueMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Component @Component
public class InnerUtils { public class InnerUtils {
...@@ -51,11 +55,11 @@ public class InnerUtils { ...@@ -51,11 +55,11 @@ public class InnerUtils {
} }
//上报演出 //上报演出
public boolean reportP(KylinPerformanceVo vo, String approval, String sponsorId) { public List<String> reportP(KylinPerformanceVo vo, String approval, String sponsorId) {
STInsertPerformanceParam insertPerformanceParam = STInsertPerformanceParam.getNew(); STInsertPerformanceParam insertPerformanceParam = STInsertPerformanceParam.getNew();
insertPerformanceParam.setPerformanceId(vo.getPerformancesId()); insertPerformanceParam.setPerformanceId(vo.getPerformancesId());
insertPerformanceParam.setPerformanceName(vo.getTitle()); insertPerformanceParam.setPerformanceName(vo.getTitle());
insertPerformanceParam.setApproval(approval); // insertPerformanceParam.setApproval(approval);
insertPerformanceParam.setTypeId(vo.getType() == 101 ? 2002 : 2003); insertPerformanceParam.setTypeId(vo.getType() == 101 ? 2002 : 2003);
insertPerformanceParam.setPosterUrl(vo.getImgPoster()); insertPerformanceParam.setPosterUrl(vo.getImgPoster());
insertPerformanceParam.setSponsor(sponsorId); insertPerformanceParam.setSponsor(sponsorId);
...@@ -67,18 +71,24 @@ public class InnerUtils { ...@@ -67,18 +71,24 @@ public class InnerUtils {
timesVo.setSessionId(item.getTicketTimesId()); timesVo.setSessionId(item.getTicketTimesId());
timesVo.setSessionName(item.getTitle()); timesVo.setSessionName(item.getTitle());
timesVo.setHallCode("320412009");//TODO timesVo.setHallCode("320412009");//TODO
timesVo.setSessionStartTime(LocalDateTime.parse(item.getUseStart())); timesVo.setSessionStartTime(item.getUseStart());
timesVo.setSessionStartTime(LocalDateTime.parse(item.getUseEnd())); String endTime = LocalDateTime.parse(item.getUseEnd()).plusDays(1).minusSeconds(1L).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
timesVo.setSessionEndTime(item.getUseEnd()==null?timesVo.getSessionStartTime():endTime);
timesVo.setHasSeat(0); timesVo.setHasSeat(0);
timesVos.add(timesVo); timesVos.add(timesVo);
} }
insertPerformanceParam.setSessionList(timesVos); insertPerformanceParam.setSessionList(timesVos);
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString(); MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Accept", "application/json;charset=UTF-8"); header.add("Accept", "application/json;charset=UTF-8");
String resultData = HttpUtil.postRaw(platform + "performance/insert", JSON.toJSONString(insertPerformanceParam), header); String resultData = HttpUtil.postRaw(platform + "/platform/performance/insert", JSON.toJSONString(insertPerformanceParam), header);
ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() { ResponseDto<JSONObject> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<JSONObject>>() {
}); });
return innerReturnVo.getData(); List<String> sessionCodeList = CollectionUtil.linkedListString();
for (KylinTicketTimesVo item : kylinTimeVos) {
JSONObject jobj = innerReturnVo.getData();
sessionCodeList.add(jobj.getString(item.getTicketTimesId()));
}
return sessionCodeList;
} }
//修改上报的演出项目数据 //修改上报的演出项目数据
...@@ -87,39 +97,36 @@ public class InnerUtils { ...@@ -87,39 +97,36 @@ public class InnerUtils {
updateTimesParam.setSessionId(vo.getTicketTimesId()); updateTimesParam.setSessionId(vo.getTicketTimesId());
updateTimesParam.setSessionCode(sessionCode); updateTimesParam.setSessionCode(sessionCode);
updateTimesParam.setSessionName(vo.getTitle()); updateTimesParam.setSessionName(vo.getTitle());
updateTimesParam.setSessionStartTime(LocalDateTime.parse(vo.getUseStart())); updateTimesParam.setSessionStartTime(LocalDateTime.parse(vo.getUseStart(),DTF_YMD_HMS));
updateTimesParam.setSessionEndTime(LocalDateTime.parse(vo.getUseEnd())); updateTimesParam.setSessionEndTime(LocalDateTime.parse(vo.getUseEnd(),DTF_YMD_HMS));
updateTimesParam.setHallCode("320412009");//TODO updateTimesParam.setHallCode("320412009");//TODO
updateTimesParam.setHasSeat(0); updateTimesParam.setHasSeat(0);
updateTimesParam.setPerformanceId(performanceId); updateTimesParam.setPerformanceId(performanceId);
updateTimesParam.setSessionStatus(1); updateTimesParam.setSessionStatus(1);
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString(); MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Accept", "application/json;charset=UTF-8"); header.add("Accept", "application/json;charset=UTF-8");
String resultData = HttpUtil.postRaw(platform + "performance/update", JSON.toJSONString(updateTimesParam), header); String resultData = HttpUtil.postRaw(platform + "/platform/performance/update", JSON.toJSONString(updateTimesParam), header);
ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() { ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() {
}); });
return innerReturnVo.getData(); return innerReturnVo.getData();
} }
//更新上报的场次数据 //删除票价信息
public boolean updateTT(KylinPerformanceVo vo, String approval, String sponsorId) { public boolean delTP(String performanceId, String sessionCode, String ticketId) {
STUpdatePerformanceParam updatePerformanceParam = STUpdatePerformanceParam.getNew(); STDelTicketPriceParam delTicketPriceParam = STDelTicketPriceParam.getNew();
updatePerformanceParam.setPerformanceId(vo.getPerformancesId()); delTicketPriceParam.setPerformanceId(performanceId);
updatePerformanceParam.setPerformanceName(vo.getTitle()); delTicketPriceParam.setSessionCode(sessionCode);
updatePerformanceParam.setTypeId(vo.getType() == 101 ? 2002 : 2003); delTicketPriceParam.setPriceId(ticketId);
updatePerformanceParam.setPosterUrl(vo.getImgPoster());
updatePerformanceParam.setSponsor(sponsorId);
updatePerformanceParam.setApproval(approval);
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString(); MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Accept", "application/json;charset=UTF-8"); header.add("Accept", "application/json;charset=UTF-8");
String resultData = HttpUtil.postRaw(platform + "times/update", JSON.toJSONString(updatePerformanceParam), header); String resultData = HttpUtil.postRaw(platform + "/platform/ticketPrice/del", JSON.toJSONString(delTicketPriceParam), header);
ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() { ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() {
}); });
return innerReturnVo.getData(); return innerReturnVo.getData();
} }
//上报票价信息 //上报票价信息
public boolean reportTP(List<KylinTicketVo> vo, String sessionCode,String performanceId,String ticketTimeId) { public boolean reportTP(List<KylinTicketVo> vo, String sessionCode, String performanceId, String ticketTimeId) {
STInsertTicketPriceParam insertTicketPriceParam = STInsertTicketPriceParam.getNew(); STInsertTicketPriceParam insertTicketPriceParam = STInsertTicketPriceParam.getNew();
insertTicketPriceParam.setSessionCode(sessionCode); insertTicketPriceParam.setSessionCode(sessionCode);
List<TicketPriceVo> priceVos = new ArrayList(); List<TicketPriceVo> priceVos = new ArrayList();
...@@ -137,7 +144,30 @@ public class InnerUtils { ...@@ -137,7 +144,30 @@ public class InnerUtils {
insertTicketPriceParam.setPriceList(priceVos); insertTicketPriceParam.setPriceList(priceVos);
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString(); MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Accept", "application/json;charset=UTF-8"); header.add("Accept", "application/json;charset=UTF-8");
String resultData = HttpUtil.postRaw(platform + "ticketPrice/insert", JSON.toJSONString(insertTicketPriceParam), header); String resultData = HttpUtil.postRaw(platform + "/platformticketPrice/insert", JSON.toJSONString(insertTicketPriceParam), header);
ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() {
});
return innerReturnVo.getData();
}
//上报票信息
public boolean reportT(String performanceId, String sessionCode, String priceId, List<String> ticketIdList, String ticketTimeId) {
STInsertTicketParam insertTicketParam = STInsertTicketParam.getNew();
insertTicketParam.setPerformanceId(performanceId);
insertTicketParam.setSessionId(ticketTimeId);
insertTicketParam.setSessionCode(sessionCode);
insertTicketParam.setPriceId(priceId);
List<TicketVo> ticketVos = new ArrayList();
for (String ticketId : ticketIdList) {
TicketVo ticketVo = TicketVo.getNew();
ticketVo.setTicketId(ticketId);
ticketVo.setAvailableSale(1);
ticketVos.add(ticketVo);
}
insertTicketParam.setTicketList(ticketVos);
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Accept", "application/json;charset=UTF-8");
String resultData = HttpUtil.postRaw(platform + "/platformticket/insert", JSON.toJSONString(insertTicketParam), header);
ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() { ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() {
}); });
return innerReturnVo.getData(); return innerReturnVo.getData();
......
package com.liquidnet.service.platform.controller.ticketSystem; package com.liquidnet.service.platform.controller.ticketSystem;
import com.alibaba.fastjson.JSONObject;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.ticketSystem.*; import com.liquidnet.service.kylin.dto.param.ticketSystem.*;
import com.liquidnet.service.platform.service.ticketSystem.ITicketSystemService; import com.liquidnet.service.platform.service.ticketSystem.ITicketSystemService;
...@@ -36,7 +37,7 @@ public class TicketSystemController { ...@@ -36,7 +37,7 @@ public class TicketSystemController {
@GetMapping("field/list") @GetMapping("field/list")
@ApiOperation("查询标准演出场所") @ApiOperation("查询标准演出场所")
public ResponseDto<List<STFieldListVo>> getFieldList(STFieldListParam fieldListParam) { public ResponseDto<List<STFieldListVo>> getFieldList(@RequestBody STFieldListParam fieldListParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
List<STFieldListVo> vo = ticketSystemService.getFieldList(accessToken, fieldListParam); List<STFieldListVo> vo = ticketSystemService.getFieldList(accessToken, fieldListParam);
...@@ -49,7 +50,7 @@ public class TicketSystemController { ...@@ -49,7 +50,7 @@ public class TicketSystemController {
@PostMapping("field/insert") @PostMapping("field/insert")
@ApiOperation("新增演出场厅") @ApiOperation("新增演出场厅")
public ResponseDto<STFieldChangeVo> insertField(STInsertFieldParam insertFieldParam) { public ResponseDto<STFieldChangeVo> insertField(@RequestBody STInsertFieldParam insertFieldParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
STFieldChangeVo vo = ticketSystemService.insertField(accessToken, insertFieldParam); STFieldChangeVo vo = ticketSystemService.insertField(accessToken, insertFieldParam);
...@@ -63,10 +64,11 @@ public class TicketSystemController { ...@@ -63,10 +64,11 @@ public class TicketSystemController {
@PostMapping("performance/insert") @PostMapping("performance/insert")
@ApiOperation("上报演出场次") @ApiOperation("上报演出场次")
public ResponseDto<String> insertPerformance(STInsertPerformanceParam insertPerformanceParam) { @ResponseBody
public ResponseDto<JSONObject> insertPerformance(@RequestBody STInsertPerformanceParam insertPerformanceParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
String vo = ticketSystemService.insertPerformance(accessToken, insertPerformanceParam); JSONObject vo = ticketSystemService.insertPerformance(accessToken, insertPerformanceParam);
return ResponseDto.success(vo); return ResponseDto.success(vo);
} catch (Exception e) { } catch (Exception e) {
log.error("上报演出场次 ERROR : {}", e); log.error("上报演出场次 ERROR : {}", e);
...@@ -76,7 +78,7 @@ public class TicketSystemController { ...@@ -76,7 +78,7 @@ public class TicketSystemController {
@PostMapping("performance/update") @PostMapping("performance/update")
@ApiOperation("更新上报的演出项目数据") @ApiOperation("更新上报的演出项目数据")
public ResponseDto<Boolean> updatePerformance(STUpdatePerformanceParam updatePerformanceParam) { public ResponseDto<Boolean> updatePerformance(@RequestBody STUpdatePerformanceParam updatePerformanceParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
boolean vo = ticketSystemService.updatePerformance(accessToken, updatePerformanceParam); boolean vo = ticketSystemService.updatePerformance(accessToken, updatePerformanceParam);
...@@ -89,7 +91,7 @@ public class TicketSystemController { ...@@ -89,7 +91,7 @@ public class TicketSystemController {
@PostMapping("times/update") @PostMapping("times/update")
@ApiOperation("更新上报的场次数据") @ApiOperation("更新上报的场次数据")
public ResponseDto<Boolean> updateTimes(STUpdateTimesParam updateTimesParam) { public ResponseDto<Boolean> updateTimes(@RequestBody STUpdateTimesParam updateTimesParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
boolean vo = ticketSystemService.updateTimes(accessToken, updateTimesParam); boolean vo = ticketSystemService.updateTimes(accessToken, updateTimesParam);
...@@ -102,7 +104,7 @@ public class TicketSystemController { ...@@ -102,7 +104,7 @@ public class TicketSystemController {
@PostMapping("ticketPrice/insert") @PostMapping("ticketPrice/insert")
@ApiOperation("上报票价信息") @ApiOperation("上报票价信息")
public ResponseDto<Boolean> insertTicketPrice(STInsertTicketPriceParam insertTicketPriceParam) { public ResponseDto<Boolean> insertTicketPrice(@RequestBody STInsertTicketPriceParam insertTicketPriceParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
boolean vo = ticketSystemService.insertTicketPrice(accessToken, insertTicketPriceParam); boolean vo = ticketSystemService.insertTicketPrice(accessToken, insertTicketPriceParam);
...@@ -115,7 +117,7 @@ public class TicketSystemController { ...@@ -115,7 +117,7 @@ public class TicketSystemController {
@PostMapping("ticketPrice/del") @PostMapping("ticketPrice/del")
@ApiOperation("删除票价信息") @ApiOperation("删除票价信息")
public ResponseDto<Boolean> delTicketPrice(STDelTicketPriceParam delTicketPriceParam) { public ResponseDto<Boolean> delTicketPrice(@RequestBody STDelTicketPriceParam delTicketPriceParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
boolean vo = ticketSystemService.delTicketPrice(accessToken, delTicketPriceParam); boolean vo = ticketSystemService.delTicketPrice(accessToken, delTicketPriceParam);
...@@ -128,7 +130,7 @@ public class TicketSystemController { ...@@ -128,7 +130,7 @@ public class TicketSystemController {
@PostMapping("ticket/insert") @PostMapping("ticket/insert")
@ApiOperation("上报票信息") @ApiOperation("上报票信息")
public ResponseDto<Boolean> insertTicket(STInsertTicketParam insertTicketParam) { public ResponseDto<Boolean> insertTicket(@RequestBody STInsertTicketParam insertTicketParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
boolean vo = ticketSystemService.insertTicket(accessToken, insertTicketParam); boolean vo = ticketSystemService.insertTicket(accessToken, insertTicketParam);
...@@ -141,7 +143,7 @@ public class TicketSystemController { ...@@ -141,7 +143,7 @@ public class TicketSystemController {
@PostMapping("ticket/del") @PostMapping("ticket/del")
@ApiOperation("删除票信息") @ApiOperation("删除票信息")
public ResponseDto<Boolean> delTicket(STDelTicketParam delTicketParam) { public ResponseDto<Boolean> delTicket(@RequestBody STDelTicketParam delTicketParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
boolean vo = ticketSystemService.delTicket(accessToken, delTicketParam); boolean vo = ticketSystemService.delTicket(accessToken, delTicketParam);
...@@ -155,7 +157,7 @@ public class TicketSystemController { ...@@ -155,7 +157,7 @@ public class TicketSystemController {
@PostMapping("order/insert") @PostMapping("order/insert")
@ApiOperation("上报订单信息") @ApiOperation("上报订单信息")
public ResponseDto<Boolean> insertOrder(STInsertOrderParam insertOrderParam) { public ResponseDto<Boolean> insertOrder(@RequestBody STInsertOrderParam insertOrderParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
boolean vo = ticketSystemService.insertOrder(accessToken, insertOrderParam); boolean vo = ticketSystemService.insertOrder(accessToken, insertOrderParam);
...@@ -168,7 +170,7 @@ public class TicketSystemController { ...@@ -168,7 +170,7 @@ public class TicketSystemController {
@PostMapping("order/refund") @PostMapping("order/refund")
@ApiOperation("上报退票信息") @ApiOperation("上报退票信息")
public ResponseDto<Boolean> refundOrder(STRefundOrderParam refundOrderParam) { public ResponseDto<Boolean> refundOrder(@RequestBody STRefundOrderParam refundOrderParam) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
Boolean vo = ticketSystemService.refundOrder(accessToken, refundOrderParam); Boolean vo = ticketSystemService.refundOrder(accessToken, refundOrderParam);
...@@ -181,7 +183,7 @@ public class TicketSystemController { ...@@ -181,7 +183,7 @@ public class TicketSystemController {
@PostMapping("check/insert") @PostMapping("check/insert")
@ApiOperation("上报检票数据") @ApiOperation("上报检票数据")
public ResponseDto<Boolean> insertCheck(List<CheckVo> ticketList) { public ResponseDto<Boolean> insertCheck(@RequestBody List<CheckVo> ticketList) {
try { try {
String accessToken = ticketSystemService.getAccessToken(); String accessToken = ticketSystemService.getAccessToken();
boolean vo = ticketSystemService.insertCheck(accessToken, ticketList); boolean vo = ticketSystemService.insertCheck(accessToken, ticketList);
......
package com.liquidnet.service.platform.service.ticketSystem; package com.liquidnet.service.platform.service.ticketSystem;
import com.alibaba.fastjson.JSONObject;
import com.liquidnet.service.kylin.dto.vo.ticketSystem.CheckVo; import com.liquidnet.service.kylin.dto.vo.ticketSystem.CheckVo;
import com.liquidnet.service.kylin.dto.vo.ticketSystem.STFieldChangeVo; import com.liquidnet.service.kylin.dto.vo.ticketSystem.STFieldChangeVo;
import com.liquidnet.service.kylin.dto.vo.ticketSystem.STFieldListVo; import com.liquidnet.service.kylin.dto.vo.ticketSystem.STFieldListVo;
...@@ -58,7 +59,7 @@ public interface ITicketSystemService { ...@@ -58,7 +59,7 @@ public interface ITicketSystemService {
* "sessionId2":"sessionCode2" * "sessionId2":"sessionCode2"
* } * }
*/ */
String insertPerformance(String accessToken, STInsertPerformanceParam insertPerformanceParam); JSONObject insertPerformance(String accessToken, STInsertPerformanceParam insertPerformanceParam);
/** /**
......
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