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

Skip to content

L
liquidnet-bus-v1
Commit 88265b65 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

提交 修改支付文案相关配置

parent ec825c0f
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 22 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
View file @ 88265b65
......@@ -12,6 +12,7 @@ public class KylinRedisConst {
public static final String PERFORMANCES_ROADLIST = "kylin:performances:roadShowId:";
public static final String PERFORMANCES_AGENT_INFO = "kylin:agent:hash:id:";
public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:id:";
public static final String TICKET_PAY_TXT = "kylin:payTxt:ticket:id:";
public static final String SURPLUS_GENERAL = "surplusGeneral";
public static final String SURPLUS_EXCHANGE = "surplusExchange";
public static final String TICKET = "kylin:ticket:id:";
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/KylinPerformancePayTxtVo.java 0 → 100644
View file @ 88265b65
package com.liquidnet.service.kylin.dto.vo.admin;
import com.liquidnet.service.kylin.dao.TicketAgentDao;
import com.liquidnet.service.kylin.dao.TicketPayTxtDao;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.List;
@ApiModel
@Data
public class KylinPerformancePayTxtVo {
private String performancesId;
private String title;
private List<TicketPayTxtDao> tickets;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @ 88265b65
......@@ -6,10 +6,7 @@ import com.liquidnet.service.kylin.dao.*;
import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
import com.liquidnet.service.kylin.dto.vo.admin.PerformanceTransferConfigVo;
import com.liquidnet.service.kylin.dto.vo.admin.*;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
import com.liquidnet.service.kylin.entity.KylinOrderImport;
import com.liquidnet.service.kylin.entity.KylinPerformances;
......@@ -188,6 +185,14 @@ public interface IKylinPerformancesAdminService {
*/
boolean changeTicketAgent(String performancesId,String ticketId, Integer status);
/**
* 修改 当前票种支付文案
* @param ticketId 票务id
* @param payTxt 支付文案
* @return
*/
boolean changeTicketPayTxt(String performancesId,String ticketId, String payTxt);
/**
* 修改 演出&票种&是否同步到大麦
* @return
......@@ -240,6 +245,8 @@ public interface IKylinPerformancesAdminService {
KylinPerformanceAgentVo getPerformanceAgent(String performancesId);
KylinPerformancePayTxtVo getPerformancePayTxt(String performancesId);
KylinPerformanceDamaiVo getPerformanceDamai(String performancesId);
List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
View file @ 88265b65
......@@ -16,10 +16,7 @@ import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
import com.liquidnet.service.kylin.dto.vo.admin.PerformanceTransferConfigVo;
import com.liquidnet.service.kylin.dto.vo.admin.*;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
import com.liquidnet.service.kylin.entity.KylinOrderImport;
import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
......@@ -165,6 +162,13 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/agent";
}
@GetMapping(value = "/payTxt/{performancesId}")
public String payTxt(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
KylinPerformancePayTxtVo result = kylinPerformancesService.getPerformancePayTxt(performancesId);
mmap.put("kylinPerformancePayTxtVo", result);
return prefix + "/payTxt";
}
//@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/agent/change")
@ResponseBody
......@@ -173,6 +177,13 @@ public class KylinPerformancesController extends BaseController {
return toAjax(result);
}
@PostMapping(value = "/payTxt/change")
@ResponseBody
public AjaxResult changeTicketPayTxt(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("payTxt") String payTxt) {
boolean result = kylinPerformancesService.changeTicketPayTxt(performancesId, ticketsId, payTxt);
return toAjax(result);
}
//@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/damai/change")
@ResponseBody
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @ 88265b65
......@@ -36,7 +36,9 @@
</li>
<li id="li-tab-5"><a data-toggle="tab" href="#tab-5" aria-expanded="false" onclick="damaiInfo()">大麦配置</a>
</li>
<li id="li-tab-8"><a data-toggle="tab" href="#tab-8" aria-expanded="false" onclick="importInfo()">订单导入</a>
<!-- <li id="li-tab-8"><a data-toggle="tab" href="#tab-8" aria-expanded="false" onclick="importInfo()">订单导入</a>-->
<!-- </li>-->
<li id="li-tab-9"><a data-toggle="tab" href="#tab-9" aria-expanded="false" onclick="payTxtInfo()">支付文案</a>
</li>
</ul>
<div class="tab-content">
......@@ -69,7 +71,7 @@
th:object="${kylinPerformanceMisVo}">
<div>
<h4>场地核进度：</h4>
<span th:if="*{fieldAuditStatus==0}" >通过</span>
<span th:if="*{fieldAuditStatus==0}">通过</span>
<span th:if="*{fieldAuditStatus==1}" style="color: red">待审核</span>
<span th:if="*{fieldAuditStatus==2}" style="color: red">拒绝</span>
</div>
......@@ -298,6 +300,16 @@
height=800px frameborder=0></iframe>
</div>
</div>
<div id="tab-9" class="tab-pane">
<div class="panel-body">
<form class="form-horizontal m" th:object="${kylinPerformanceMisVo}">
<input name="title" th:field="*{title}" class="form-control" type="text" readonly>
</form>
<iframe id="pay_txt_iframe" name="order_import_iframe" marginwidth=0 marginheight=0
width=100%
height=800px frameborder=0></iframe>
</div>
</div>
</div>
</div>
</div>
......@@ -351,7 +363,12 @@
document.getElementById("li-tab-8").style.display = "none";
}
if (auditStatus == 1 || fieldStatus == 1 || fieldStatus == 2 ||auditStatus == 2) {
var payTxt = [[${@permission.hasPermi('kylin:performances:payTxt')}]];
if (payTxt == "hidden") {
document.getElementById("li-tab-9").style.display = "none";
}
if (auditStatus == 1 || fieldStatus == 1 || fieldStatus == 2 || auditStatus == 2) {
document.getElementsByName("auditBtn")[0].style.display = "none";
}
......@@ -433,6 +450,11 @@
document.getElementById("order_import_iframe").src = "../orderImport/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
}
//支付文案
function payTxtInfo() {
document.getElementById("pay_txt_iframe").src = "../payTxt/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
}
$("#tab-nav-1").bind("click", function () {
$("#tab_iframe_1").attr("src", prefix + "/performanceStatic/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""));
});
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/payTxt.html 0 → 100644
View file @ 88265b65
<!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" id="form-agent-edit" th:object="${kylinPerformancePayTxtVo}">
<div class="form-group">
<label class="col-sm-3 control-label is-required">performances_id：</label>
<div class="col-sm-8">
<input name="performancesId" th:field="*{performancesId}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">演出名称：</label>
<div class="col-sm-8">
<input name="title" th:value="*{title}" class="form-control" type="text" readonly>
</div>
</div>
<div th:each="ticket : ${kylinPerformancePayTxtVo.tickets}">
<div class="form-group">
<label class="col-sm-3 control-label is-required">票种名称：</label>
<div class="col-sm-8">
<input name="title" th:value="${ticket.title}" class="form-control" type="text" readonly>
<input name="ticketsId" th:value="${ticket.ticketsId}" class="form-control" type="hidden" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">支付文案：</label>
<div class="col-sm-8">
<input name="payTxt" th:value="${ticket.payTxt}" class="form-control" type="text">
</div>
<button type="button" class="btn btn-w-m btn-success" onclick="submitHandler(this)">
保存
</button>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var prefix = ctx + "kylin/performances";
$("#form-performances-edit").validate({
focusCleanup: true
});
function submitHandler(res) {
var param = {
"performancesId": '[[${kylinPerformancePayTxtVo.performancesId}]]'.replaceAll("\"", ""),
"ticketsId": $(res).parent().parent().parent().find("input[name^='ticketsId']").val(),
"payTxt":$(res).parent().parent().parent().find("input[name^='payTxt']").val()
}
$.operate.post(prefix + "/payTxt/change", param, function (res) {
location.reload();
});
}
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
View file @ 88265b65
......@@ -590,6 +590,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
}
}
@Override
public boolean changeTicketPayTxt(String performancesId, String ticketId, String payTxt) {
dataUtils.setTicketPayTxt(ticketId, payTxt);
return true;
}
@Override
public boolean changeSysDamai(List<SysDamaiParam> params) {
try {
......@@ -735,6 +741,25 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
return vo;
}
@Override
public KylinPerformancePayTxtVo getPerformancePayTxt(String performancesId) {
KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
List<TicketAgentDao> ticketData = ticketsMapper.ticketAgent(performancesId);
KylinPerformancePayTxtVo vo = new KylinPerformancePayTxtVo();
vo.setPerformancesId(performanceData.getPerformancesId());
vo.setTitle(performanceData.getTitle());
List<TicketPayTxtDao> payTxtDaoList = new ArrayList();
for (TicketAgentDao item : ticketData) {
TicketPayTxtDao payTxtDao = new TicketPayTxtDao();
payTxtDao.setTicketsId(item.getTicketsId());
payTxtDao.setTitle(item.getTitle());
payTxtDao.setPayTxt(dataUtils.getTicketPayTxt(item.getTicketsId()));
payTxtDaoList.add(payTxtDao);
}
vo.setTickets(payTxtDaoList);
return vo;
}
public KylinPerformanceDamaiVo getPerformanceDamai(String performancesId) {
KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
View file @ 88265b65
......@@ -373,17 +373,17 @@ public class DataUtils {
}
// 获取 快递地址
public OrderRefundAddress getRefundAddress(){
public OrderRefundAddress getRefundAddress() {
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ORDER_REFUND_ADDRESS);
if(obj==null){
if (obj == null) {
OrderRefundAddress vo = OrderRefundAddress.getNew();
vo.setName("张三");
vo.setPhone("010 124412");
vo.setAddress("北京 北京市朝阳区广渠路3-12");
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER_REFUND_ADDRESS,vo);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER_REFUND_ADDRESS, vo);
return vo;
}else{
return (OrderRefundAddress)obj;
} else {
return (OrderRefundAddress) obj;
}
}
......@@ -444,12 +444,12 @@ public class DataUtils {
}
//订单信息存redis
public void orderSetRedis(String orderCode){
public void orderSetRedis(String orderCode) {
KylinOrderTicketVo orderTicketVo = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(orderCode)), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
String orderTicketsId = orderTicketVo.getOrderTicketsId();
List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderTicketsId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
orderTicketVo.setEntitiesVoList(kylinOrderTicketEntitiesVoList);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER +orderTicketsId, orderTicketVo);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER + orderTicketsId, orderTicketVo);
}
public void setkylinExpressModules(List<KylinExpressModuleVo> voList) {
......@@ -465,11 +465,11 @@ public class DataUtils {
*/
public KylinTicketExpressModuleVo getTEMMerchantVo(String ticketId) {
String redisKey = KylinRedisConst.TICKET_EXPRESS_MODULE_P.concat(ticketId);
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
if (obj != null) {
return (KylinTicketExpressModuleVo) obj;
} else {
return KylinTicketExpressModuleVo.getNew() ;
return KylinTicketExpressModuleVo.getNew();
}
}
......@@ -497,4 +497,18 @@ public class DataUtils {
return KylinTicketExpressModuleVo.getNew();
}
}
public void setTicketPayTxt(String ticketId, String payTxt) {
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.TICKET_PAY_TXT + ticketId, payTxt);
}
public String getTicketPayTxt(String ticketId) {
String rdsKey = KylinRedisConst.TICKET_PAY_TXT.concat(ticketId);
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(rdsKey);
if(obj==null){
return "";
}else{
return (String) obj;
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/TicketPayTxtDao.java 0 → 100644
View file @ 88265b65
package com.liquidnet.service.kylin.dao;
import lombok.Data;
@Data
public class TicketPayTxtDao {
private String ticketsId;
private String title;
private String payTxt;
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java
View file @ 88265b65
......@@ -418,7 +418,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
httpData.add("type", "PRODUCT");
httpData.add("price", preParam.getPriceActual().toString());
// httpData.add("price","0.01");
httpData.add("name", preParam.getStoreName());
httpData.add("name", "正在现场");
httpData.add("detail", preParam.getSkuName());
httpData.add("orderCode", preParam.getOrderMasterCode());
httpData.add("orderId", preParam.getOrderIdList().substring(1));
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 88265b65
......@@ -728,10 +728,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
}
KylinOrderTicketEntitiesVo entitiesData = orderTicketData.getEntitiesVoList().get(0);
String name = dataUtils.getTicketPayTxt(orderTicketData.getTicketId());
if(name.equals("")){
name = "正在现场";
}
LinkedMultiValueMap<String, String> httpData = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
httpData.add("type", "TICKET");
httpData.add("price", orderTicketData.getPriceActual().toString());
httpData.add("name", entitiesData.getUseStart() + "" + entitiesData.getPerformanceTitle());
httpData.add("name", name);
httpData.add("detail", entitiesData.getPerformanceTitle() + "-" + entitiesData.getTicketTitle() + "-" + entitiesData.getUseStart());
httpData.add("orderCode", orderTicketData.getOrderCode());
httpData.add("clientIp", CurrentUtil.getCliIpAddr());
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/DataUtils.java
View file @ 88265b65
......@@ -316,4 +316,14 @@ public class DataUtils {
}
return price;
}
public String getTicketPayTxt(String ticketId) {
String rdsKey = KylinRedisConst.TICKET_PAY_TXT.concat(ticketId);
Object obj = redisUtil.get(rdsKey);
if(obj==null){
return "";
}else{
return (String) obj;
}
}
}
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