|
@@ -50,7 +50,7 @@ public class YppService {
|
|
private ShopService shopService;
|
|
private ShopService shopService;
|
|
|
|
|
|
|
|
|
|
- public ResultContent<CreatOrderResultModel> create_order(CreateOrdereRquest createOrdereRquest) {
|
|
|
|
|
|
+ public ResultContent<CreatOrderResultModel> create_order(CreateOrder2Request createOrder2Request) {
|
|
com.zswl.cloud.shop.client.ret.ResultContent<AccountDetailVo> shopSetting = shopService.shopSetting("有票票");
|
|
com.zswl.cloud.shop.client.ret.ResultContent<AccountDetailVo> shopSetting = shopService.shopSetting("有票票");
|
|
if (!shopSetting.getState().equals(com.zswl.cloud.shop.client.ret.ResultState.Success)) {
|
|
if (!shopSetting.getState().equals(com.zswl.cloud.shop.client.ret.ResultState.Success)) {
|
|
return ResultContent.build(ResultState.Fail, "有票票信息未配置");
|
|
return ResultContent.build(ResultState.Fail, "有票票信息未配置");
|
|
@@ -61,13 +61,9 @@ public class YppService {
|
|
String shopId = accountDetailVo.getAccountId();
|
|
String shopId = accountDetailVo.getAccountId();
|
|
String authAccount = accountDetailVo.getAuthAccount();
|
|
String authAccount = accountDetailVo.getAuthAccount();
|
|
SharePlatformVo sharePlatformVo = accountDetailVo.getSharePlatformVo();
|
|
SharePlatformVo sharePlatformVo = accountDetailVo.getSharePlatformVo();
|
|
- CreateOrder2Request createOrder2Request = new CreateOrder2Request();
|
|
|
|
|
|
|
|
- BeanUtils.copyProperties(createOrdereRquest, createOrder2Request);
|
|
|
|
//0 是创建即支付,1是后支付,等待你们的支付通知
|
|
//0 是创建即支付,1是后支付,等待你们的支付通知
|
|
createOrder2Request.setOrderPayMode(1);
|
|
createOrder2Request.setOrderPayMode(1);
|
|
- //是否可调座
|
|
|
|
- createOrder2Request.setSwitchSeat(false);
|
|
|
|
createOrder2Request.setOrderId(orderNo);
|
|
createOrder2Request.setOrderId(orderNo);
|
|
CreateOrder2Response createOrder2Response = yppApi.create_order2(createOrder2Request);
|
|
CreateOrder2Response createOrder2Response = yppApi.create_order2(createOrder2Request);
|
|
String data = createOrder2Response.getData().getOrderId();
|
|
String data = createOrder2Response.getData().getOrderId();
|
|
@@ -83,23 +79,23 @@ public class YppService {
|
|
createOrder2Model.setUserId(authHelper.getCurrentUser().getUserId());
|
|
createOrder2Model.setUserId(authHelper.getCurrentUser().getUserId());
|
|
createOrder2Model.setShopId(shopId);
|
|
createOrder2Model.setShopId(shopId);
|
|
JSONObject shopInfo = new JSONObject();
|
|
JSONObject shopInfo = new JSONObject();
|
|
- shopInfo.set("shopName", createOrdereRquest.getCinemaName());
|
|
|
|
|
|
+ shopInfo.set("shopName", createOrder2Request.getCinemaName());
|
|
createOrder2Model.setShopInfo(shopInfo);
|
|
createOrder2Model.setShopInfo(shopInfo);
|
|
createOrder2Model.setTotalAmount(totalUserPrice);
|
|
createOrder2Model.setTotalAmount(totalUserPrice);
|
|
createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
|
|
createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
|
|
createOrder2Model.setPayAmount(totalUserPrice);
|
|
createOrder2Model.setPayAmount(totalUserPrice);
|
|
createOrder2Model.setAccesserUserId(authAccount);
|
|
createOrder2Model.setAccesserUserId(authAccount);
|
|
- createOrder2Model.setChannel(createOrdereRquest.getChannel());
|
|
|
|
|
|
+ createOrder2Model.setChannel(createOrder2Request.getChannel());
|
|
|
|
|
|
|
|
|
|
- JSONObject goodsInfo = JSONUtil.parseObj(createOrdereRquest);
|
|
|
|
- goodsInfo.set("goodsName", createOrdereRquest.getMovieName());
|
|
|
|
- goodsInfo.set("goodsPath", createOrdereRquest.getPostImageUrl());
|
|
|
|
|
|
+ JSONObject goodsInfo = JSONUtil.parseObj(createOrder2Request);
|
|
|
|
+ goodsInfo.set("goodsName", createOrder2Request.getMovieName());
|
|
|
|
+ goodsInfo.set("goodsPath", createOrder2Request.getPostImageUrl());
|
|
goodsInfo.set("channelOrderId", data);
|
|
goodsInfo.set("channelOrderId", data);
|
|
|
|
|
|
|
|
|
|
CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
|
|
CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
|
|
- goods.setGoodsId(createOrdereRquest.getMovieId());
|
|
|
|
|
|
+ goods.setGoodsId(createOrder2Request.getMovieCode());
|
|
goods.setJobFlowMap(JobFlowMap.YPP);
|
|
goods.setJobFlowMap(JobFlowMap.YPP);
|
|
goods.setGoodsInfo(goodsInfo);
|
|
goods.setGoodsInfo(goodsInfo);
|
|
goods.setPayAmount(totalUserPrice);
|
|
goods.setPayAmount(totalUserPrice);
|