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

Skip to content

L
liquidnet-bus-v1
Commit 4b42e440 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

是否退纸质票的配置

parent 7e8c2dea
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 32 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/PerformanceRefundConfigVo.java
View file @ 4b42e440
...@@ -17,6 +17,7 @@ public class PerformanceRefundConfigVo { ...@@ -17,6 +17,7 @@ public class PerformanceRefundConfigVo {
private Integer isRefundPoundage; private Integer isRefundPoundage;
private Integer isRefundVoucher; private Integer isRefundVoucher;
private Integer isRefundExpress; private Integer isRefundExpress;
private Integer isBackPaperTicket;
private OrderRefundAddress orderRefundAddress; private OrderRefundAddress orderRefundAddress;
} }
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
View file @ 4b42e440
...@@ -119,6 +119,7 @@ public class KylinPerformanceVo { ...@@ -119,6 +119,7 @@ public class KylinPerformanceVo {
private Integer isRefundPoundage; private Integer isRefundPoundage;
private Integer isRefundVoucher; private Integer isRefundVoucher;
private Integer isRefundExpress; private Integer isRefundExpress;
private Integer isBackPaperTicket;
public void setPerformance(KylinPerformances performance) { public void setPerformance(KylinPerformances performance) {
this.mid = performance.getMid(); this.mid = performance.getMid();
...@@ -175,6 +176,7 @@ public class KylinPerformanceVo { ...@@ -175,6 +176,7 @@ public class KylinPerformanceVo {
this.isRefundPoundage = performanceStatus.getIsRefundPoundage(); this.isRefundPoundage = performanceStatus.getIsRefundPoundage();
this.isRefundVoucher = performanceStatus.getIsRefundVoucher(); this.isRefundVoucher = performanceStatus.getIsRefundVoucher();
this.isRefundExpress = performanceStatus.getIsRefundExpress(); this.isRefundExpress = performanceStatus.getIsRefundExpress();
this.isBackPaperTicket = performanceStatus.getIsBackPaperTicket();
} }
public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) { public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @ 4b42e440
...@@ -208,7 +208,8 @@ public interface IKylinPerformancesAdminService { ...@@ -208,7 +208,8 @@ public interface IKylinPerformancesAdminService {
String refundCloseTime, String refundCloseTime,
Integer isRefundPoundage, Integer isRefundPoundage,
Integer isRefundVoucher, Integer isRefundVoucher,
Integer isRefundExpress); Integer isRefundExpress,
Integer isBackPaperTicket);
/** /**
* 获取 演出转赠配置 * 获取 演出转赠配置
......
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 @ 4b42e440
...@@ -203,8 +203,9 @@ public class KylinPerformancesController extends BaseController { ...@@ -203,8 +203,9 @@ public class KylinPerformancesController extends BaseController {
@RequestParam("refundCloseTime") String refundCloseTime, @RequestParam("refundCloseTime") String refundCloseTime,
@RequestParam("isRefundPoundage") Integer isRefundPoundage, @RequestParam("isRefundPoundage") Integer isRefundPoundage,
@RequestParam("isRefundVoucher") Integer isRefundVoucher, @RequestParam("isRefundVoucher") Integer isRefundVoucher,
@RequestParam("isRefundExpress") Integer isRefundExpress) { @RequestParam("isRefundExpress") Integer isRefundExpress,
String result = kylinPerformancesService.changeRefundConfig(performancesId, isCanRefund, refundOpenTime, refundCloseTime, isRefundPoundage, isRefundVoucher, isRefundExpress); @RequestParam("isBackPaperTicket") Integer isBackPaperTicket) {
String result = kylinPerformancesService.changeRefundConfig(performancesId, isCanRefund, refundOpenTime, refundCloseTime, isRefundPoundage, isRefundVoucher, isRefundExpress, isBackPaperTicket);
return this.success(result); return this.success(result);
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/refundConfig.html
View file @ 4b42e440
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</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-3 control-label is-required">用户申请退款：</label>
<div class="col-sm-8" th:if="*{isCanRefund==1}"> <div class="col-sm-8" th:if="*{isCanRefund==1}">
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="1" name="performance_isCanRefund" checked>开启</label> <input type="radio" value="1" name="performance_isCanRefund" checked>开启</label>
...@@ -38,8 +38,18 @@ ...@@ -38,8 +38,18 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">用户申请退款定时： </label>
<input th:field="${performanceRefundConfigVo.refundOpenTime}" type="text" style="width: 200px;float: left"
class="form-control" id="startTime" placeholder="开始时间选择" name="refundOpenTime"
required/>
<span class="control-label" style="float: left;margin-left: 10px;margin-right: 10px"> — </span>
<input th:field="${performanceRefundConfigVo.refundCloseTime}" type="text" style="width: 200px;float: left"
class="form-control" id="endTime" placeholder="结束时间选择" name="refundCloseTime"
required/>
</div>
<div class="form-group" > <div class="form-group" >
<label class="col-sm-3 control-label is-required">手续费：</label> <label class="col-sm-3 control-label is-required">用户退款手续费：</label>
<div class="col-sm-8" th:if="*{isRefundPoundage==1}"> <div class="col-sm-8" th:if="*{isRefundPoundage==1}">
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundPoundage" checked>开启</label> <input type="radio" value="1" name="performance_isRefundPoundage" checked>开启</label>
...@@ -58,40 +68,51 @@ ...@@ -58,40 +68,51 @@
</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-3 control-label is-required">用户退款快递票快递费：</label>
<div class="col-sm-8" th:if="*{isRefundVoucher==1}"> <div class="col-sm-8" th:if="*{isRefundExpress==1}">
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundVoucher" checked>开启</label> <input type="radio" value="1" name="performance_isRefundExpress" checked>用户承担</label>
</div> </div>
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundVoucher">关闭</label> <input type="radio" value="0" name="performance_isRefundExpress">公司月结</label>
</div> </div>
</div> </div>
<div class="col-sm-8" th:if="*{isRefundVoucher==0}"> <div class="col-sm-8" th:if="*{isRefundExpress==0}">
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundVoucher">开启</label> <input type="radio" value="1" name="performance_isRefundExpress">用户承担</label>
</div> </div>
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundVoucher" checked> 关闭</label> <input type="radio" value="0" name="performance_isRefundExpress" checked>公司月结</label>
</div> </div>
</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-3 control-label is-required">用户退款快递票是否需要退回：</label>
<div class="col-sm-8" th:if="*{isRefundExpress==1}"> <div class="col-sm-8">
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundExpress" checked>用户承担</label> <input type="radio" value="0" name="isBackPaperTicket" th:checked="*{isBackPaperTicket==0 ? true : false}" checked> 不需要</label>
</div> </div>
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundExpress">无</label> <input type="radio" value="1" name="isBackPaperTicket" th:checked="*{isBackPaperTicket==1 ? true : false}">需要</label>
</div> </div>
</div> </div>
<div class="col-sm-8" th:if="*{isRefundExpress==0}"> </div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">退款是否退优惠券：</label>
<div class="col-sm-8" th:if="*{isRefundVoucher==1}">
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundExpress">用户承担</label> <input type="radio" value="1" name="performance_isRefundVoucher" checked>开启</label>
</div> </div>
<div class="radio check-box"> <div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundExpress" checked>无</label> <input type="radio" value="0" name="performance_isRefundVoucher">关闭</label>
</div>
</div>
<div class="col-sm-8" th:if="*{isRefundVoucher==0}">
<div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundVoucher">开启</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundVoucher" checked> 关闭</label>
</div> </div>
</div> </div>
</div> </div>
...@@ -113,16 +134,6 @@ ...@@ -113,16 +134,6 @@
<input name="title" th:field="*{orderRefundAddress.address}" class="form-control" type="text" readonly> <input name="title" th:field="*{orderRefundAddress.address}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">定时： </label>
<input th:field="${performanceRefundConfigVo.refundOpenTime}" type="text" style="width: 200px;float: left"
class="form-control" id="startTime" placeholder="开始时间选择" name="refundOpenTime"
required/>
<span class="control-label" style="float: left;margin-left: 10px;margin-right: 10px"> — </span>
<input th:field="${performanceRefundConfigVo.refundCloseTime}" type="text" style="width: 200px;float: left"
class="form-control" id="endTime" placeholder="结束时间选择" name="refundCloseTime"
required/>
</div>
<button type="button" class="btn btn-w-m btn-success" onclick="submitHandler()"> <button type="button" class="btn btn-w-m btn-success" onclick="submitHandler()">
修改 修改
...@@ -156,7 +167,8 @@ ...@@ -156,7 +167,8 @@
refundCloseTime: $("input[name^='refundCloseTime']").val(), refundCloseTime: $("input[name^='refundCloseTime']").val(),
isRefundPoundage: parseInt($("input[name^='performance_isRefundPoundage']:checked").val()), isRefundPoundage: parseInt($("input[name^='performance_isRefundPoundage']:checked").val()),
isRefundVoucher: parseInt($("input[name^='performance_isRefundVoucher']:checked").val()), isRefundVoucher: parseInt($("input[name^='performance_isRefundVoucher']:checked").val()),
isRefundExpress: parseInt($("input[name^='performance_isRefundExpress']:checked").val()) isRefundExpress: parseInt($("input[name^='performance_isRefundExpress']:checked").val()),
isBackPaperTicket: parseInt($("input[name^='isBackPaperTicket']:checked").val())
} }
if ($("input[name^='refundCloseTime']").val() == "" || $("input[name^='refundOpenTime']").val() == "") { if ($("input[name^='refundCloseTime']").val() == "" || $("input[name^='refundOpenTime']").val() == "") {
...@@ -172,4 +184,4 @@ ...@@ -172,4 +184,4 @@
} }
</script> </script>
</body> </body>
</html> </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/KylinPerformancesAdminServiceImpl.java
View file @ 4b42e440
...@@ -600,6 +600,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -600,6 +600,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
vo.setIsRefundPoundage(kylinPerformanceStatus.getIsRefundPoundage()); vo.setIsRefundPoundage(kylinPerformanceStatus.getIsRefundPoundage());
vo.setIsRefundVoucher(kylinPerformanceStatus.getIsRefundVoucher()); vo.setIsRefundVoucher(kylinPerformanceStatus.getIsRefundVoucher());
vo.setIsRefundExpress(kylinPerformanceStatus.getIsRefundExpress()); vo.setIsRefundExpress(kylinPerformanceStatus.getIsRefundExpress());
vo.setIsBackPaperTicket(kylinPerformanceStatus.getIsBackPaperTicket());
vo.setOrderRefundAddress(dataUtils.getRefundAddress()); vo.setOrderRefundAddress(dataUtils.getRefundAddress());
return vo; return vo;
...@@ -660,7 +661,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -660,7 +661,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
String refundCloseTime, String refundCloseTime,
Integer isRefundPoundage, Integer isRefundPoundage,
Integer isRefundVoucher, Integer isRefundVoucher,
Integer isRefundExpress) { Integer isRefundExpress,
Integer isBackPaperTicket) {
KylinPerformanceStatus kylinPerformanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId)); KylinPerformanceStatus kylinPerformanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
if (kylinPerformanceStatusData.getIsTransfer().equals(1) && isCanRefund.equals(1)) { if (kylinPerformanceStatusData.getIsTransfer().equals(1) && isCanRefund.equals(1)) {
return "修改失败，演出已开启转赠"; return "修改失败，演出已开启转赠";
...@@ -673,6 +675,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -673,6 +675,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
kylinPerformanceStatus.setIsRefundPoundage(isRefundPoundage); kylinPerformanceStatus.setIsRefundPoundage(isRefundPoundage);
kylinPerformanceStatus.setIsRefundVoucher(isRefundVoucher); kylinPerformanceStatus.setIsRefundVoucher(isRefundVoucher);
kylinPerformanceStatus.setIsRefundExpress(isRefundExpress); kylinPerformanceStatus.setIsRefundExpress(isRefundExpress);
kylinPerformanceStatus.setIsBackPaperTicket(isBackPaperTicket);
try { try {
performanceStatusMapper.update(kylinPerformanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId)); performanceStatusMapper.update(kylinPerformanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
View file @ 4b42e440
...@@ -139,6 +139,11 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{ ...@@ -139,6 +139,11 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{
*/ */
private Integer isRefundExpress; private Integer isRefundExpress;
/**
* 快递票是否需要退回
*/
private Integer isBackPaperTicket;
/** /**
* 创建时间 * 创建时间
*/ */
......
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