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

Skip to content

L
liquidnet-bus-v1
Commit 6c106520 authored by anjiabin's avatar anjiabin
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketsMapper.java
parents 574b7bc0 2bcbcf3e
Hide whitespace changes
Inline Side-by-side
Showing with 603 additions and 203 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/other/DamaiService.java
View file @ 6c106520
...@@ -11,7 +11,9 @@ public interface DamaiService { ...@@ -11,7 +11,9 @@ public interface DamaiService {
//同步演出 //同步演出
Boolean sycPerformance(String performanceId); Boolean sycPerformance(String performanceId);
//同步场次 //同步场次
Boolean sycTimes(String performanceId, KylinTicketTimes timesData); Boolean sycTimes(long performanceId, KylinTicketTimes timesData);
//同步票 //同步票
Boolean sycTicket(String timeId, KylinTickets ticketsData); Boolean sycTicket(long timeId, KylinTickets ticketsData);
//订单
Boolean sycOrder(long timeId, String ticketsId,long ticketsmId);
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersDisplayLocation.java 0 → 100644
View file @ 6c106520
package com.liquidnet.client.admin.common.enums;
import java.util.*;
/**
* <p>
* banner展示位置
* </p>
*
* @author jiangxiulong
* @since 2021-06-08 12:21 下午
*/
public enum BannersDisplayLocation {
DISPLAY_LOCATION1("首页", 1),
DISPLAY_LOCATION4("演出", 4),
DISPLAY_LOCATION3("周边", 3),
DISPLAY_LOCATION5("积分商城", 5),
DISPLAY_LOCATION6("YOUNG BLOOD", 6),
DISPLAY_LOCATION8("视频", 8);
private String name;
private int index;
BannersDisplayLocation(String name, int index) {
this.name = name;
this.index = index;
}
public String getName() {
return this.name;
}
public int getIndex() {
return this.index;
}
private static List<Object> resultTypeListR = null;
static {
ArrayList<Object> resultTypeList = new ArrayList<>();
for (BannersDisplayLocation resultType : BannersDisplayLocation.values()) {
Map<String, Object> mapTemp = new HashMap<>();
mapTemp.put("id", resultType.index);
mapTemp.put("name", resultType.name);
resultTypeList.add(mapTemp);
}
resultTypeListR = Collections.unmodifiableList(resultTypeList);
}
public static List<Object> getResultType() {
return resultTypeListR;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersTargetType.java 0 → 100644
View file @ 6c106520
package com.liquidnet.client.admin.common.enums;
import org.apache.ibatis.annotations.ResultType;
import java.util.*;
/**
* <p>
* banner跳转类型
* </p>
*
* @author jiangxiulong
* @since 2021-06-08 11:23 上午
*/
public enum BannersTargetType {
TARGET_TYPE1("PGC点播", 1),
TARGET_TYPE2("PGC直播", 2),
TARGET_TYPE5("场地", 5),
TARGET_TYPE6("票务", 6),
TARGET_TYPE7("商品", 7),
TARGET_TYPE8("巡演", 8),
TARGET_TYPE12("活动跳转-可分享", 12),
TARGET_TYPE100("活动跳转", 100),
TARGET_TYPE13("积分商品", 13),
TARGET_TYPE14("商品集合", 14),
TARGET_TYPE20("音乐人", 20),
TARGET_TYPE21("歌曲", 21),
TARGET_TYPE22("专辑", 22),
TARGET_TYPE23("视频播单", 23),
TARGET_TYPE24("音乐人集合", 24),
TARGET_TYPE26("摩登会员", 26),
TARGET_TYPE201("youngBlood报名跳转", 201),
TARGET_TYPE0("不跳转", 0);
private String name;
private int index;
BannersTargetType(String name, int index) {
this.name = name;
this.index = index;
}
public String getName() {
return this.name;
}
public int getIndex() {
return this.index;
}
private static List<Object> resultTypeListR = null;
static {
ArrayList<Object> resultTypeList = new ArrayList<>();
for (BannersTargetType resultType : BannersTargetType.values()) {
Map<String, Object> mapTemp = new HashMap<>();
mapTemp.put("id", resultType.index);
mapTemp.put("name", resultType.name);
resultTypeList.add(mapTemp);
}
resultTypeListR = Collections.unmodifiableList(resultTypeList);
}
public static List<Object> getResultType() {
return resultTypeListR;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java
View file @ 6c106520
...@@ -4,19 +4,23 @@ import com.github.pagehelper.PageInfo; ...@@ -4,19 +4,23 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.controller.BaseController; import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult; import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BannersDisplayLocation;
import com.liquidnet.client.admin.common.enums.BannersTargetType;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinBannersServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinBannersServiceImpl;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.BannerDetailsListDao; import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
import com.liquidnet.service.kylin.dto.param.BannersParam; import com.liquidnet.service.kylin.dto.param.BannersParam;
import com.liquidnet.service.kylin.dto.param.BannersSearchParam; import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
import com.liquidnet.service.kylin.dto.vo.KylinBannersVo; import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* <p> * <p>
* 轮播图 后端管理控制器 * 轮播图 后端管理控制器
...@@ -32,6 +36,37 @@ public class KylinBannersAdminController extends BaseController { ...@@ -32,6 +36,37 @@ public class KylinBannersAdminController extends BaseController {
private String prefix = "zhengzai/kylin/banners"; private String prefix = "zhengzai/kylin/banners";
@Value("${liquidnet.url-banner.provinces}")
private String provinces;
@Value("${liquidnet.url-banner.url1}")
private String url1;
@Value("${liquidnet.url-banner.url2}")
private String url2;
@Value("${liquidnet.url-banner.url5}")
private String url5;
@Value("${liquidnet.url-banner.url6}")
private String url6;
@Value("${liquidnet.url-banner.url7}")
private String url7;
@Value("${liquidnet.url-banner.url8}")
private String url8;
@Value("${liquidnet.url-banner.url13}")
private String url13;
@Value("${liquidnet.url-banner.url14}")
private String url14;
@Value("${liquidnet.url-banner.url20}")
private String url20;
@Value("${liquidnet.url-banner.url21}")
private String url21;
@Value("${liquidnet.url-banner.url22}")
private String url22;
@Value("${liquidnet.url-banner.url23}")
private String url23;
@Value("${liquidnet.url-banner.url24}")
private String url24;
@Value("${liquidnet.url-banner.url26}")
private String url26;
@Autowired @Autowired
private KylinBannersServiceImpl kylinBannersServiceImpl; private KylinBannersServiceImpl kylinBannersServiceImpl;
...@@ -42,8 +77,28 @@ public class KylinBannersAdminController extends BaseController { ...@@ -42,8 +77,28 @@ public class KylinBannersAdminController extends BaseController {
} }
@GetMapping("/create") @GetMapping("/create")
public String create() public String create(ModelMap mmap) {
{ List<Object> bannersTargetType = BannersTargetType.getResultType();
List<Object> bannersDisplayLocation = BannersDisplayLocation.getResultType();
mmap.put("BannersTargetType", bannersTargetType);
mmap.put("BannersDisplayLocation", bannersDisplayLocation);
mmap.put("provinces", provinces);
mmap.put("url1", url1);
mmap.put("url2", url2);
mmap.put("url5", url5);
mmap.put("url6", url6);
mmap.put("url7", url7);
mmap.put("url8", url8);
mmap.put("url13", url13);
mmap.put("url14", url14);
mmap.put("url20", url20);
mmap.put("url21", url21);
mmap.put("url22", url22);
mmap.put("url23", url23);
mmap.put("url24", url24);
mmap.put("url26", url26);
return prefix + "/create"; return prefix + "/create";
} }
...@@ -60,8 +115,7 @@ public class KylinBannersAdminController extends BaseController { ...@@ -60,8 +115,7 @@ public class KylinBannersAdminController extends BaseController {
} }
@GetMapping("/update/{bannersId}") @GetMapping("/update/{bannersId}")
public String update(@PathVariable("bannersId") String bannersId, ModelMap mmap) public String update(@PathVariable("bannersId") String bannersId, ModelMap mmap) {
{
KylinBannersVo result = null; KylinBannersVo result = null;
result = kylinBannersServiceImpl.detail(bannersId); result = kylinBannersServiceImpl.detail(bannersId);
mmap.put("KylinBannersVo", result); mmap.put("KylinBannersVo", result);
...@@ -80,14 +134,14 @@ public class KylinBannersAdminController extends BaseController { ...@@ -80,14 +134,14 @@ public class KylinBannersAdminController extends BaseController {
} }
} }
@RequiresPermissions("kylin:banners:detail") /*@RequiresPermissions("kylin:banners:detail")
@GetMapping("/details/{bannersId}") @GetMapping("/details/{bannersId}")
public String detail(@PathVariable("bannersId") String bannersId, ModelMap mmap) { public String detail(@PathVariable("bannersId") String bannersId, ModelMap mmap) {
KylinBannersVo result = null; KylinBannersVo result = null;
result = kylinBannersServiceImpl.detail(bannersId); result = kylinBannersServiceImpl.detail(bannersId);
mmap.put("KylinBannersVo", result); mmap.put("KylinBannersVo", result);
return prefix + "/details"; return prefix + "/details";
} }*/
@RequiresPermissions("kylin:banners:list") @RequiresPermissions("kylin:banners:list")
@PostMapping("list") @PostMapping("list")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml
View file @ 6c106520
...@@ -27,6 +27,22 @@ liquidnet: ...@@ -27,6 +27,22 @@ liquidnet:
url-refund: url-refund:
apply: "http://devpay.zhengzai.tv/refund/single" apply: "http://devpay.zhengzai.tv/refund/single"
notify: "https://devzuul.zhengzai.tv/kylin/refund/callback" notify: "https://devzuul.zhengzai.tv/kylin/refund/callback"
url-banner:
provinces: "https://devservice.zhengzai.tv/provinces" #省份
url1: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "https://devmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "https://devmall.zhengzai.tv/admin/performanceListForQuick?page=1&per_page=50&status=3,6,7,8,9,10" #票务
url7: "https://devmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://devmall.zhengzai.tv/admin/roadShowListForQuick?page=1&per_page=50" #巡演
url13: "https://devmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "https://devmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "https://devmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "https://devmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "https://devmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "https://devmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
url24: "https://devmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "https://devpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml
View file @ 6c106520
...@@ -27,6 +27,22 @@ liquidnet: ...@@ -27,6 +27,22 @@ liquidnet:
url-refund: url-refund:
apply: "http://pay.zhengzai.tv/refund/single" apply: "http://pay.zhengzai.tv/refund/single"
notify: "https://zuul.zhengzai.tv/kylin/refund/callback" notify: "https://zuul.zhengzai.tv/kylin/refund/callback"
url-banner:
provinces: "https://service.zhengzai.tv/provinces" #省份
url1: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "https://mall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "https://mall.zhengzai.tv/admin/performanceListForQuick?page=1&per_page=50&status=3,6,7,8,9,10" #票务
url7: "https://mall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://mall.zhengzai.tv/admin/roadShowListForQuick?page=1&per_page=50" #巡演
url13: "https://mall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "https://mall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "https://merchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "https://merchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "https://merchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "https://mediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
url24: "https://merchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "https://passport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml
View file @ 6c106520
...@@ -27,6 +27,22 @@ liquidnet: ...@@ -27,6 +27,22 @@ liquidnet:
url-refund: url-refund:
apply: "http://testpay.zhengzai.tv/refund/single" apply: "http://testpay.zhengzai.tv/refund/single"
notify: "https://zuul.zhengzai.tv/kylin/refund/callback" notify: "https://zuul.zhengzai.tv/kylin/refund/callback"
url-banner:
provinces: "https://testservice.zhengzai.tv/provinces" #省份
url1: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "https://testmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "https://testmall.zhengzai.tv/admin/performanceListForQuick?page=1&per_page=50&status=3,6,7,8,9,10" #票务
url7: "https://testmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://testmall.zhengzai.tv/admin/roadShowListForQuick?page=1&per_page=50" #巡演
url13: "https://testmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "https://testmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "https://testmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "https://testmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "https://testmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
url24: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "https://testpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/banners.html
View file @ 6c106520
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<script th:inline="javascript"> <script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:banners:detail')}]];
var updateFlag = [[${@permission.hasPermi('kylin:banners:update')}]]; var updateFlag = [[${@permission.hasPermi('kylin:banners:update')}]];
var deleteFlag = [[${@permission.hasPermi('kylin:banners:delete')}]]; var deleteFlag = [[${@permission.hasPermi('kylin:banners:delete')}]];
...@@ -73,9 +72,9 @@ ...@@ -73,9 +72,9 @@
$(function () { $(function () {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
updateFlag: prefix + "/update", updateUrl: prefix + "/update",
detailUrl: prefix + "/details/{id}", createUrl: prefix + "/create",
deleteFlag: prefix + "/delete", deleteUrl: prefix + "/delete",
modalName: "-Banner", modalName: "-Banner",
columns: [{ columns: [{
checkbox: true checkbox: true
...@@ -90,7 +89,14 @@ ...@@ -90,7 +89,14 @@
}, },
{ {
field: 'coverImg', field: 'coverImg',
title: '封面图' title: '封面图',
formatter: function(value, row, index) {
return $.table.imageView(value,"300", "600");
}
},
{
field: 'promotionTypeName',
title: '推广类型'
}, },
{ {
field: 'targetType', field: 'targetType',
...@@ -101,7 +107,7 @@ ...@@ -101,7 +107,7 @@
title: '跳转目标' title: '跳转目标'
}, },
{ {
field: 'isOnline', field: 'isOnlineName',
title: '是否上线' title: '是否上线'
}, },
{ {
...@@ -112,10 +118,6 @@ ...@@ -112,10 +118,6 @@
field: 'onlineEndTime', field: 'onlineEndTime',
title: '上线结束时间' title: '上线结束时间'
}, },
{
field: 'promotionType',
title: '推广类型'
},
{ {
field: 'createdAt', field: 'createdAt',
title: '创建时间' title: '创建时间'
...@@ -125,7 +127,6 @@ ...@@ -125,7 +127,6 @@
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-info btn-xs' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="review(\'' + row.orderRefundsId + '\')"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="review(\'' + row.orderRefundsId + '\')"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + deleteFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>删除</a> '); actions.push('<a class="btn btn-danger btn-xs ' + deleteFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>删除</a> ');
return actions.join(''); return actions.join('');
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html
View file @ 6c106520
...@@ -2,39 +2,101 @@ ...@@ -2,39 +2,101 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org"> <html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<th:block th:include="include :: header('提交订单退款')"/> <th:block th:include="include :: header('提交订单退款')"/>
<th:block th:include="include :: select2-css"/>
<th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-post-add"> <form class="form-horizontal m" id="form-post-add">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">订单id：</label> <label class="col-sm-2 control-label is-required">标题：</label>
<div class="col-sm-8"> <div class="col-sm-10">
<input class="form-control" type="text" name="orderTicketsId" id="orderTicketsId" required> <input class="form-control" type="text" name="banners_id" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">快递费：</label> <label class="col-sm-2 control-label is-required">展示位置</label>
<div class="col-sm-8"> <div class="col-sm-10">
<input class="form-control" type="text" name="RefundPriceExpress"> <label th:each="type : ${BannersDisplayLocation}" class="checkbox-inline">
<input name="positionList[]" th:text="${type.name}" th:value="${type.id}" type="checkbox">
</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">入场人：</label> <label class="col-sm-2 control-label">请选择跳转类型</label>
<div class="col-sm-8"> <div class="col-sm-5">
<div class="col-sm-12 select-table table-bordered"> <select class="form-control" name="target_type">
<table id="bootstrap-table"></table> <option value="">--请选择跳转类型--</option>
<option th:each="type : ${BannersTargetType}" th:text="${type.name}" th:value="${type.id}"></option>
</select>
</div>
<div class="col-sm-5">
<input class="form-control" type="text" name="target_obj" placeholder="请填写url">
<select class="form-control" name="target_obj">
<option value="">--请选择--</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">推广省份</label>
<div class="col-sm-10">
<div class="radio check-box">
<label>
<input type="radio" value="1" name="promotionType" checked=""> 全国
</label>
</div>
<div class="radio check-box">
<label>
<input type="radio" value="2" name="promotionType"> 省份
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">请选择省份</label>
<div class="col-sm-5">
<select class="form-control" name="provincesList[]">
<option value="">--请选择省份--</option>
<option value=".NET">.NET</option>
</select>
</div>
<div class="col-sm-5">
<button type="button" class="btn btn-w-m btn-danger">删除</button>
<button type="button" class="btn btn-w-m btn-success">添加</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">是否上线</label>
<div class="col-sm-10">
<div class="radio check-box">
<label>
<input type="radio" value="1" name="is_online" checked=""> <i></i> 上线
</label>
</div>
<div class="radio check-box">
<label>
<input type="radio" value="0" name="is_online"> <i></i> 下线
</label>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label layui-required is-required">备注：</label> <label class="col-sm-2 control-label">上线开始/结束时间</label>
<div class="col-sm-8"> <div class="col-sm-10">
<textarea name="reason" maxlength="500" class="form-control layui-required" rows="3"></textarea> <div class="input-daterange input-group">
<input name="online_start_time" type="text" class="input-sm form-control" id="laydate-startTime"
placeholder="yyyy-MM-dd HH:mm:ss"/>
<span class="input-group-addon">到</span>
<input name="online_end_time" type="text" class="input-sm form-control" id="laydate-endTime"
placeholder="yyyy-MM-dd HH:mm:ss"/>
</div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: select2-js"/>
<th:block th:include="include :: datetimepicker-js" />
<script type="text/javascript"> <script type="text/javascript">
var prefix = ctx + "kylin/refund"; var prefix = ctx + "kylin/refund";
...@@ -83,17 +145,62 @@ ...@@ -83,17 +145,62 @@
var reason = $('#form-post-add').find("[name='reason']").val(); var reason = $('#form-post-add').find("[name='reason']").val();
var orderTicketsId = $('#form-post-add').find("[name='orderTicketsId']").val(); var orderTicketsId = $('#form-post-add').find("[name='orderTicketsId']").val();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
if (!orderTicketsId || !reason || rows.length <= 0) { if (!orderTicketsId || !reason || rows.length <= 0) {
layer.msg("请完善数据"); layer.msg("请完善数据");
return false; return false;
} }
if ($.validate.form()) { if ($.validate.form()) {
var data = $('#form-post-add').serializeArray(); var data = $('#form-post-add').serializeArray();
data.push({"ticketEntityIds":rows.join()}); data.push({"ticketEntityIds": rows.join()});
data.push({"name":"ticketEntityIds","value":rows}); data.push({"name": "ticketEntityIds", "value": rows});
$.operate.save(prefix + "/apply", data); $.operate.save(prefix + "/apply", data);
} }
} }
$(function (){
layui.use('laydate', function(){
var laydate = layui.laydate;
var startDate = laydate.render({
elem: '#laydate-startTime',
type: 'datetime',
max: $('#laydate-endTime').val(),
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// 结束时间大于开始时间
if (value !== '') {
endDate.config.min.year = date.year;
endDate.config.min.month = date.month - 1;
endDate.config.min.date = date.date;
} else {
endDate.config.min.year = '';
endDate.config.min.month = '';
endDate.config.min.date = '';
}
}
});
var endDate = laydate.render({
elem: '#laydate-endTime',
type: 'datetime',
min: $('#laydate-startTime').val(),
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// 开始时间小于结束时间
if (value !== '') {
startDate.config.max.year = date.year;
startDate.config.max.month = date.month - 1;
startDate.config.max.date = date.date;
} else {
startDate.config.max.year = '';
startDate.config.max.month = '';
startDate.config.max.date = '';
}
}
});
});
})
</script> </script>
</body> </body>
</html> </html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/details.html deleted 100644 → 0
View file @ 574b7bc0
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('退款详情')"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m-t" id="signupForm">
<div class="form-group">
<label class="col-sm-2 control-label">退款单id：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.orderRefundsId}"></div>
<label class="col-sm-2 control-label">票务订单id：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.orderTicketsId}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">退款编号：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.orderRefundCode}"></div>
<label class="col-sm-2 control-label">退款中心退款编号：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundCode}"></div>
<label class="col-sm-2 control-label">第三方退款编号：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundId}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">退款总金额：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.price}"></div>
<label class="col-sm-2 control-label">退款状态：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.statusName}"></div>
<label class="col-sm-2 control-label">成功退款时间：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundAt}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">申请人名称：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.applicantName}"></div>
<label class="col-sm-2 control-label">申请时间：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.applicantAt}"></div>
<label class="col-sm-2 control-label">申请备注：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.reason}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">审核人名称：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.auditorName}"></div>
<label class="col-sm-2 control-label">审核时间：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.auditorAt}"></div>
<label class="col-sm-2 control-label">审核备注：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.reject}"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">执行人名称：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.executorName}"></div>
<label class="col-sm-2 control-label">执行时间：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.executorAt}"></div>
<label class="col-sm-2 control-label">执行备注：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.refuse}"></div>
</div>
<div class="form-group">
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<legend>票种</legend>
</fieldset>
<table class="col-sm-8 select-table table-bordered">
<thead>
<tr>
<th>票种名称</th>
<th>适用日期</th>
<th>入场人</th>
<th>状态</th>
<th>价格</th>
</tr>
</thead>
<tbody>
<tr th:each="v : ${KylinOrderRefundsVo.entities}">
<td th:text="${v.title}"></td>
<td th:text="${v.useStart}"></td>
<td th:text="${v.enterName}"></td>
<td th:text="${v.isPaymentName}"></td>
<td th:text="${v.price}"></td>
</tr>
</tbody>
</table>
</div>
</form>
</div>
<th:block th:include="include :: footer"/>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java
View file @ 6c106520
...@@ -219,6 +219,10 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl ...@@ -219,6 +219,10 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
try { try {
PageHelper.startPage(bannersSearchParam.getPageNum(), bannersSearchParam.getPageSize()); PageHelper.startPage(bannersSearchParam.getPageNum(), bannersSearchParam.getPageSize());
List<BannerDetailsListDao> voList = bannersMapper.searchBannersList(BeanUtil.convertBeanToMap(bannersSearchParam)); List<BannerDetailsListDao> voList = bannersMapper.searchBannersList(BeanUtil.convertBeanToMap(bannersSearchParam));
for (BannerDetailsListDao item : voList) {
item.setIsOnlineName(item.getIsOnline());
item.setPromotionTypeName(item.getPromotionType());
}
pageInfoTmp = new PageInfo(voList); pageInfoTmp = new PageInfo(voList);
} catch (Exception e) { } catch (Exception e) {
return new PageInfo(); return new PageInfo();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java
View file @ 6c106520
...@@ -2,19 +2,23 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl; ...@@ -2,19 +2,23 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.utils.DateUtils;
import com.liquidnet.client.admin.zhengzai.kylin.utils.TaobaoTicketUtils; import com.liquidnet.client.admin.zhengzai.kylin.utils.TaobaoTicketUtils;
import com.liquidnet.service.kylin.dao.OrderPushDamaiDto;
import com.liquidnet.service.kylin.entity.*; import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*; import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.other.DamaiService; import com.liquidnet.service.kylin.service.other.DamaiService;
import com.taobao.api.TaobaoClient; import com.taobao.api.TaobaoClient;
import com.taobao.api.internal.util.StringUtils; import com.taobao.api.internal.util.StringUtils;
import com.taobao.api.request.AlibabaDamaiMevOpenBatchpushticketRequest;
import com.taobao.api.request.AlibabaDamaiMevOpenBatchpushticketRequest.ThirdTicketPushOpenParam;
import com.taobao.api.request.AlibabaDamaiMevOpenPushitemRequest; import com.taobao.api.request.AlibabaDamaiMevOpenPushitemRequest;
import com.taobao.api.request.AlibabaDamaiMevOpenPushitemRequest.PushTicketItemPushOpenParam; import com.taobao.api.request.AlibabaDamaiMevOpenPushitemRequest.PushTicketItemPushOpenParam;
import com.taobao.api.request.AlibabaDamaiMevOpenPushperformRequest; import com.taobao.api.request.AlibabaDamaiMevOpenPushperformRequest;
import com.taobao.api.request.AlibabaDamaiMevOpenPushperformRequest.ThirdPerformPushOpenParam; import com.taobao.api.request.AlibabaDamaiMevOpenPushperformRequest.ThirdPerformPushOpenParam;
import com.taobao.api.request.AlibabaDamaiMevOpenPushprojectRequest; import com.taobao.api.request.AlibabaDamaiMevOpenPushprojectRequest;
import com.taobao.api.request.AlibabaDamaiMevOpenPushprojectRequest.ThirdProjectPushOpenParam; import com.taobao.api.request.AlibabaDamaiMevOpenPushprojectRequest.ThirdProjectPushOpenParam;
import com.taobao.api.response.AlibabaDamaiMevOpenPushfaceResponse; import com.taobao.api.response.AlibabaDamaiMevOpenBatchpushticketResponse;
import com.taobao.api.response.AlibabaDamaiMevOpenPushitemResponse; import com.taobao.api.response.AlibabaDamaiMevOpenPushitemResponse;
import com.taobao.api.response.AlibabaDamaiMevOpenPushperformResponse; import com.taobao.api.response.AlibabaDamaiMevOpenPushperformResponse;
import com.taobao.api.response.AlibabaDamaiMevOpenPushprojectResponse; import com.taobao.api.response.AlibabaDamaiMevOpenPushprojectResponse;
...@@ -24,6 +28,7 @@ import org.springframework.data.mongodb.core.convert.MongoConverter; ...@@ -24,6 +28,7 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -46,6 +51,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -46,6 +51,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
@Autowired @Autowired
private TaobaoTicketUtils taobaoTicketUtils; private TaobaoTicketUtils taobaoTicketUtils;
@Autowired
private KylinOrderTicketsMapper orderTicketsMapper;
@Autowired @Autowired
private KylinPerformancesMapper performancesMapper; private KylinPerformancesMapper performancesMapper;
...@@ -59,6 +66,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -59,6 +66,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
private KylinTicketsMapper ticketsMapper; private KylinTicketsMapper ticketsMapper;
@Autowired @Autowired
private KylinTicketRelationsMapper ticketRelationsMapper; private KylinTicketRelationsMapper ticketRelationsMapper;
@Autowired
private KylinTicketStatusMapper ticketStatusMapper;
@Override @Override
...@@ -76,17 +85,12 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -76,17 +85,12 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId)); KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
obj1.setPicUrl(performanceData.getImgPoster()); obj1.setPicUrl(performanceData.getImgPoster());
obj1.setProjectId(Long.parseLong(performanceData.getPerformancesId())); obj1.setProjectId(performanceData.getMid().longValue());
obj1.setProjectName(performanceData.getTitle()); obj1.setProjectName(performanceData.getTitle());
obj1.setCityId(performanceData.getCityId().longValue()); obj1.setCityId(performanceData.getCityId().longValue());
obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret()); obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
obj1.setSystemId(taobaoTicketUtils.getSystemId()); obj1.setSystemId(taobaoTicketUtils.getSystemId());
// obj1.setPushTime(DateUtils.getNowDate());
// obj1.setSupplierSecret("foo");
// obj1.setSystemId(0L);
// obj1.setVenueId(0L);
req.setPushProjectParam(obj1); req.setPushProjectParam(obj1);
AlibabaDamaiMevOpenPushprojectResponse rsp = client.execute(req); AlibabaDamaiMevOpenPushprojectResponse rsp = client.execute(req);
if (rsp.getResult().getSuccess()) { if (rsp.getResult().getSuccess()) {
...@@ -94,7 +98,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -94,7 +98,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
for (int i = 0; i < timeRelation.size(); i++) { for (int i = 0; i < timeRelation.size(); i++) {
KylinTicketTimes timeData = ticketTimesMapper.selectOne(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", timeRelation.get(i).getTimesId())); KylinTicketTimes timeData = ticketTimesMapper.selectOne(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", timeRelation.get(i).getTimesId()));
boolean result = sycTimes(performanceId, timeData); boolean result = sycTimes(performanceData.getMid().longValue(), timeData);
if (!result) { if (!result) {
return false; return false;
} }
...@@ -110,16 +114,16 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -110,16 +114,16 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
} }
@Override @Override
public Boolean sycTimes(String performancesId, KylinTicketTimes timesData) { public Boolean sycTimes(long performancesmId, KylinTicketTimes timesData) {
try { try {
TaobaoClient client = taobaoTicketUtils.initTaobaoClient(); TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
AlibabaDamaiMevOpenPushperformRequest req = new AlibabaDamaiMevOpenPushperformRequest(); AlibabaDamaiMevOpenPushperformRequest req = new AlibabaDamaiMevOpenPushperformRequest();
ThirdPerformPushOpenParam obj1 = new ThirdPerformPushOpenParam(); ThirdPerformPushOpenParam obj1 = new ThirdPerformPushOpenParam();
obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))); obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
obj1.setPerformId(Long.parseLong(timesData.getTicketTimesId())); obj1.setPerformId(timesData.getMid().longValue());
obj1.setPerformName(timesData.getTitle()); obj1.setPerformName(timesData.getTitle());
obj1.setProjectId(Long.parseLong(performancesId)); obj1.setProjectId(performancesmId);
obj1.setStartTime(StringUtils.parseDateTime(timesData.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))); obj1.setStartTime(StringUtils.parseDateTime(timesData.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret()); obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
obj1.setSystemId(taobaoTicketUtils.getSystemId()); obj1.setSystemId(taobaoTicketUtils.getSystemId());
...@@ -128,10 +132,12 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -128,10 +132,12 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
if (rsp.getResult().getSuccess()) { if (rsp.getResult().getSuccess()) {
List<KylinTicketRelations> ticketRelation = ticketRelationsMapper.selectList(new UpdateWrapper<KylinTicketRelations>().eq("times_id", timesData.getTicketTimesId())); List<KylinTicketRelations> ticketRelation = ticketRelationsMapper.selectList(new UpdateWrapper<KylinTicketRelations>().eq("times_id", timesData.getTicketTimesId()));
for (int i = 0; i < ticketRelation.size(); i++) { for (int i = 0; i < ticketRelation.size(); i++) {
KylinTickets ticketData = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketRelation.get(i).getTicketId())); if (null != ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelation.get(i).getTicketId()).eq("sync_damai", 1))) {
boolean result = sycTicket(timesData.getTicketTimesId(), ticketData); KylinTickets ticketData = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketRelation.get(i).getTicketId()));
if (!result) { boolean result = sycTicket(timesData.getMid().longValue(), ticketData);
return false; if (!result) {
return false;
}
} }
} }
return true; return true;
...@@ -145,25 +151,75 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -145,25 +151,75 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
} }
@Override @Override
public Boolean sycTicket(String timeId, KylinTickets ticketsData) { public Boolean sycTicket(long timemId, KylinTickets ticketsData) {
try { try {
TaobaoClient client = taobaoTicketUtils.initTaobaoClient(); TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
AlibabaDamaiMevOpenPushitemRequest req = new AlibabaDamaiMevOpenPushitemRequest(); AlibabaDamaiMevOpenPushitemRequest req = new AlibabaDamaiMevOpenPushitemRequest();
PushTicketItemPushOpenParam obj1 = new PushTicketItemPushOpenParam(); PushTicketItemPushOpenParam obj1 = new PushTicketItemPushOpenParam();
obj1.setItemId(Long.parseLong(ticketsData.getTicketsId())); obj1.setItemId(ticketsData.getMid().longValue());
obj1.setItemName(ticketsData.getTitle()); obj1.setItemName(ticketsData.getTitle());
obj1.setItemPrice(ticketsData.getPrice().longValue()); obj1.setItemPrice(ticketsData.getPrice().longValue());
obj1.setPerformId(Long.parseLong(timeId)); obj1.setPerformId(timemId);
obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret()); obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
obj1.setSystemId(taobaoTicketUtils.getSystemId()); obj1.setSystemId(taobaoTicketUtils.getSystemId());
// obj1.setRemark("0"); // obj1.setRemark("0");
req.setPushItemParam(obj1); req.setPushItemParam(obj1);
AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req); AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
return rsp.getResult().getSuccess(); if (rsp.getResult().getSuccess()) {
return sycOrder(timemId, ticketsData.getTicketsId(),ticketsData.getMid().longValue());
} else {
return false;
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return false; return false;
} }
} }
@Override
public Boolean sycOrder(long timemId, String ticketsId,long ticketsmId) {
try {
TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
List<ThirdTicketPushOpenParam> list2 = new ArrayList<ThirdTicketPushOpenParam>();
List<OrderPushDamaiDto> data = orderTicketsMapper.pushDamaiDetailsList(ticketsId);
for (int i = 0; i < data.size(); i++) {
OrderPushDamaiDto item = data.get(i);
ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
list2.add(obj3);
obj3.setUserName(item.getEnterName());//用户名 入场人姓名
obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证
obj3.setOrderUserMobile(item.getEnterMobile());//用户手机号 入场人手机号
obj3.setCertificateType(item.getEnterType().longValue());//证件内容 入场人证件type
obj3.setPayTime(DateUtils.parseDate(item.getTimePay()));//支付时间
obj3.setPerformId(timemId);//场次id
obj3.setTicketItemId(ticketsmId);
// if (item.getIsMember() == 1) {
// obj3.setTicketItemId(Long.parseLong(item.getTicketId() + "01"));//票品id ticketId+01会员 ticketId+0非会员
// } else {
// obj3.setTicketItemId(Long.parseLong(item.getTicketId() + "00"));
// }
obj3.setOrderId(Long.parseLong(item.getOrderTicketsId()));//订单id orderId
obj3.setVoucherId(item.getMid().longValue());//票单号 入场人id
obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
obj3.setSystemId(taobaoTicketUtils.getSystemId());
obj3.setSeatType(1L);
obj3.setTicketType(1L);//票类型
}
req.setThirdTicketSetOpenParamList(list2);
if (list2.size() == 0) {
return true;
} else {
AlibabaDamaiMevOpenBatchpushticketResponse rsp = client.execute(req);
return rsp.getResult().getSuccess();
}
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/BannerDetailsListDao.java
View file @ 6c106520
...@@ -19,12 +19,14 @@ public class BannerDetailsListDao implements Serializable { ...@@ -19,12 +19,14 @@ public class BannerDetailsListDao implements Serializable {
private String targetObj; private String targetObj;
private Integer isOnline; private Integer isOnline;
private String isOnlineName;
private String onlineStartTime; private String onlineStartTime;
private String onlineEndTime; private String onlineEndTime;
private Integer promotionType; private Integer promotionType;
private String promotionTypeName;
private Integer bannersSort; private Integer bannersSort;
...@@ -33,4 +35,34 @@ public class BannerDetailsListDao implements Serializable { ...@@ -33,4 +35,34 @@ public class BannerDetailsListDao implements Serializable {
private String createdAt; private String createdAt;
private String updatedAt; private String updatedAt;
public void setIsOnlineName(Integer isOnline){
this.isOnline=isOnline;
switch (isOnline){
case 0:
this.isOnlineName="下线";
break;
case 1:
this.isOnlineName="上线";
break;
default:
this.isOnlineName="--";
break;
}
}
public void setPromotionTypeName(Integer promotionType){
this.promotionType=promotionType;
switch (promotionType){
case 1:
this.promotionTypeName="全国";
break;
case 2:
this.promotionTypeName="省份";
break;
default:
this.promotionTypeName="--";
break;
}
}
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderPushDamaiDto.java 0 → 100644
View file @ 6c106520
package com.liquidnet.service.kylin.dao;
import lombok.Data;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @class: PerformanceOrderListDao
* @Package com.liquidnet.service.kylin.dao
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/4 13:31
*/
@Data
public class OrderPushDamaiDto {
String orderTicketsId;
Integer mid;
String enterName;
String enterIdCode;
Integer enterType;
String enterMobile;
String timePay;
String timeId;
String ticketId;
Integer isMember;
String orderTicketEntitiesId;
String getTicketType;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinBannersMapper.xml
View file @ 6c106520
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.KylinBannersMapper"> <mapper namespace="com.liquidnet.service.kylin.mapper.KylinBannersMapper">
<!-- 详情 --> <select id="detail" parameterType="java.lang.String">
<resultMap id="bannerDetailsResult" type="com.liquidnet.service.kylin.dao.BannerDetailsDao">
<result column="banners_id" property="bannersId"/>
<result column="banners_name" property="bannersName"/>
<result column="cover_img" property="coverImg"/>
<result column="target_type" property="targetType"/>
<result column="target_obj" property="targetObj"/>
<result column="is_online" property="isOnline"/>
<result column="online_start_time" property="onlineStartTime"/>
<result column="online_end_time" property="onlineEndTime"/>
<result column="promotion_type" property="promotionType"/>
<result column="banners_sort" property="bannersSort"/>
<result column="remarks" property="remarks"/>
<result column="created_at" property="createdAt"/>
<result column="updated_at" property="updatedAt"/>
</resultMap>
<select id="detail" parameterType="java.lang.String" resultMap="bannerDetailsResult">
SELECT SELECT
* *
FROM kylin_banners FROM kylin_banners
...@@ -27,7 +11,7 @@ ...@@ -27,7 +11,7 @@
</select> </select>
<!-- admin banner列表 --> <!-- admin banner列表 -->
<select id="searchBannersList" parameterType="java.util.Map" resultType="com.liquidnet.service.kylin.dao.BannerDetailsListDao" resultMap="bannerDetailsResult"> <select id="searchBannersList" parameterType="java.util.Map" resultType="com.liquidnet.service.kylin.dao.BannerDetailsListDao">
SELECT * SELECT *
FROM kylin_banners FROM kylin_banners
<where> <where>
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 6c106520
...@@ -25,6 +25,22 @@ ...@@ -25,6 +25,22 @@
<result column="user_mobile" property="userMobile"/> <result column="user_mobile" property="userMobile"/>
<result column="order_source" property="orderSource"/> <result column="order_source" property="orderSource"/>
</resultMap> </resultMap>
<resultMap id="orderPushDamaiDto" type="com.liquidnet.service.kylin.dao.OrderPushDamaiDto">
<result column="order_tickets_id" property="orderTicketsId"/>
<result column="mid" property="mid"/>
<result column="enter_name" property="enterName"/>
<result column="enter_id_code" property="enterIdCode"/>
<result column="enter_mobile" property="enterMobile"/>
<result column="enter_type" property="enterType"/>
<result column="time_pay" property="timePay"/>
<result column="time_id" property="timeId"/>
<result column="ticket_id" property="ticketId"/>
<result column="is_member" property="isMember"/>
<result column="order_ticket_entities_id" property="orderTicketEntitiesId"/>
<result column="get_ticket_type" property="getTicketType"/>
</resultMap>
<select id="getPriceNum" resultType="java.util.HashMap"> <select id="getPriceNum" resultType="java.util.HashMap">
SELECT SUM(o.price_actual) as total_price, SUM(o.number) as total_num SELECT SUM(o.price_actual) as total_price, SUM(o.number) as total_num
FROM kylin_order_tickets AS o FROM kylin_order_tickets AS o
...@@ -54,7 +70,8 @@ ...@@ -54,7 +70,8 @@
</foreach> </foreach>
</where> </where>
</select> </select>
<select id="getOrderList" parameterType="java.lang.String" resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets"> <select id="getOrderList" parameterType="java.lang.String"
resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets">
SELECT o.mid, order_tickets_id, number, price_actual, performance_title SELECT o.mid, order_tickets_id, number, price_actual, performance_title
FROM kylin_order_tickets AS o FROM kylin_order_tickets AS o
JOIN kylin_order_ticket_relations AS r ON r.order_id = o.order_tickets_id JOIN kylin_order_ticket_relations AS r ON r.order_id = o.order_tickets_id
...@@ -97,42 +114,72 @@ ...@@ -97,42 +114,72 @@
inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
inner join kylin_performances kp on kotr.performance_id = kp.performances_id inner join kylin_performances kp on kotr.performance_id = kp.performances_id
<where> <where>
<if test="orderTicketsId != null and orderTicketsId != ''"> and kot.order_tickets_id = #{orderTicketsId}</if> <if test="orderTicketsId != null and orderTicketsId != ''">and kot.order_tickets_id = #{orderTicketsId}
<if test="userId != null and userId != ''"> and kot.user_id = #{userId}</if> </if>
<if test="userName != null and userName != ''"> and kot.user_name like concat('%', #{userName}, '%')</if> <if test="userId != null and userId != ''">and kot.user_id = #{userId}</if>
<if test="userMobile != null and userMobile != ''"> and kot.user_mobile = #{userMobile}</if> <if test="userName != null and userName != ''">and kot.user_name like concat('%', #{userName}, '%')</if>
<if test="performanceTitle != null and performanceTitle != ''"> and kot.performance_title = #{performanceTitle}</if> <if test="userMobile != null and userMobile != ''">and kot.user_mobile = #{userMobile}</if>
<if test="orderCode != null and orderCode != ''"> and kot.order_code = #{orderCode}</if> <if test="performanceTitle != null and performanceTitle != ''">and kot.performance_title =
<if test="payCode != null and payCode != ''"> and kot.pay_code = #{payCode}</if> #{performanceTitle}
<if test="qrCode != null and qrCode != ''"> and kot.qr_code = #{qrCode}</if> </if>
<if test="orderType != null and orderType != ''"> and kot.order_type = #{orderType}</if> <if test="orderCode != null and orderCode != ''">and kot.order_code = #{orderCode}</if>
<if test="orderVersion != null and orderVersion != ''"> and kot.order_version = #{orderVersion}</if> <if test="payCode != null and payCode != ''">and kot.pay_code = #{payCode}</if>
<if test="number != null "> and kot.number = #{number}</if> <if test="qrCode != null and qrCode != ''">and kot.qr_code = #{qrCode}</if>
<if test="price != null "> and kot.price = #{price}</if> <if test="orderType != null and orderType != ''">and kot.order_type = #{orderType}</if>
<if test="priceMember != null "> and kot.price_member = #{priceMember}</if> <if test="orderVersion != null and orderVersion != ''">and kot.order_version = #{orderVersion}</if>
<if test="priceTotal != null "> and kot.price_total = #{priceTotal}</if> <if test="number != null ">and kot.number = #{number}</if>
<if test="priceVoucher != null "> and kot.price_voucher = #{priceVoucher}</if> <if test="price != null ">and kot.price = #{price}</if>
<if test="priceActual != null "> and kot.price_actual = #{priceActual}</if> <if test="priceMember != null ">and kot.price_member = #{priceMember}</if>
<if test="priceExpress != null "> and kot.price_express = #{priceExpress}</if> <if test="priceTotal != null ">and kot.price_total = #{priceTotal}</if>
<if test="priceRefund != null "> and kot.price_refund = #{priceRefund}</if> <if test="priceVoucher != null ">and kot.price_voucher = #{priceVoucher}</if>
<if test="refundNumber != null "> and kot.refund_number = #{refundNumber}</if> <if test="priceActual != null ">and kot.price_actual = #{priceActual}</if>
<if test="payType != null and payType != ''"> and kot.pay_type = #{payType}</if> <if test="priceExpress != null ">and kot.price_express = #{priceExpress}</if>
<if test="paymentType != null and paymentType != ''"> and kot.payment_type = #{paymentType}</if> <if test="priceRefund != null ">and kot.price_refund = #{priceRefund}</if>
<if test="timePay != null and timePay != ''"> and kot.time_pay = #{timePay}</if> <if test="refundNumber != null ">and kot.refund_number = #{refundNumber}</if>
<if test="expressContacts != null and expressContacts != ''"> and kot.express_contacts = #{expressContacts}</if> <if test="payType != null and payType != ''">and kot.pay_type = #{payType}</if>
<if test="expressAddress != null and expressAddress != ''"> and kot.express_address = #{expressAddress}</if> <if test="paymentType != null and paymentType != ''">and kot.payment_type = #{paymentType}</if>
<if test="expressPhone != null and expressPhone != ''"> and kot.express_phone = #{expressPhone}</if> <if test="timePay != null and timePay != ''">and kot.time_pay = #{timePay}</if>
<if test="couponType != null and couponType != ''"> and kot.coupon_type = #{couponType}</if> <if test="expressContacts != null and expressContacts != ''">and kot.express_contacts =
<if test="getTicketType != null and getTicketType != ''"> and kot.get_ticket_type = #{getTicketType}</if> #{expressContacts}
<if test="getTicketDescribe != null and getTicketDescribe != ''"> and kot.get_ticket_describe = #{getTicketDescribe}</if> </if>
<if test="payCountdownMinute != null "> and kot.pay_countdown_minute = #{payCountdownMinute}</if> <if test="expressAddress != null and expressAddress != ''">and kot.express_address = #{expressAddress}</if>
<if test="comment != null and comment != ''"> and kot.comment = #{comment}</if> <if test="expressPhone != null and expressPhone != ''">and kot.express_phone = #{expressPhone}</if>
<if test="createdAt != null "> and kot.created_at = #{createdAt}</if> <if test="couponType != null and couponType != ''">and kot.coupon_type = #{couponType}</if>
<if test="updatedAt != null "> and kot.updated_at = #{updatedAt}</if> <if test="getTicketType != null and getTicketType != ''">and kot.get_ticket_type = #{getTicketType}</if>
<if test="orderSource != null and orderSource != ''"> and kot.order_source = #{orderSource}</if> <if test="getTicketDescribe != null and getTicketDescribe != ''">and kot.get_ticket_describe =
#{getTicketDescribe}
</if>
<if test="payCountdownMinute != null ">and kot.pay_countdown_minute = #{payCountdownMinute}</if>
<if test="comment != null and comment != ''">and kot.comment = #{comment}</if>
<if test="createdAt != null ">and kot.created_at = #{createdAt}</if>
<if test="updatedAt != null ">and kot.updated_at = #{updatedAt}</if>
<if test="orderSource != null and orderSource != ''">and kot.order_source = #{orderSource}</if>
</where> </where>
<!-- <if test="orderItem!=''">--> <!-- <if test="orderItem!=''">-->
<!-- ORDER BY ${orderItem} ${orderSc}--> <!-- ORDER BY ${orderItem} ${orderSc}-->
<!-- </if>--> <!-- </if>-->
</select>
<select id="pushDamaiDetailsList" parameterType="java.lang.String" resultMap="orderPushDamaiDto">
SELECT ote.mid,
order_tickets_id,
enter_name,
enter_id_code,
enter_type,
enter_mobile,
time_pay,
otr.time_id,
otr.ticket_id,
otr.is_member,
ote.order_ticket_entities_id,
get_ticket_type
FROM kylin_order_tickets AS ot
LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
WHERE ots.pay_status = 1
AND ote.is_payment = 1
AND ote.sys_damai = 1
AND ote.ticket_id = ${ticketsId}
</select> </select>
</mapper> </mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-service-kylin.yml
View file @ 6c106520
...@@ -9,9 +9,9 @@ eureka: ...@@ -9,9 +9,9 @@ eureka:
spring: spring:
cloud: cloud:
config: config:
# uri: http://127.0.0.1:7002/support-config uri: http://39.106.122.201:7002/support-config
profile: ${liquidnet.cloudConfig.profile} # profile: ${liquidnet.cloudConfig.profile}
name: ${spring.application.name} #默认为spring.application.name # name: ${spring.application.name} #默认为spring.application.name
discovery: # discovery:
enabled: true # enabled: true
service-id: liquidnet-support-config # service-id: liquidnet-support-config
\ No newline at end of file
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