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

Commit 5140346e authored by jiangxiulong's avatar jiangxiulong

isBackPaperTicket 快递票是否需要退回配置

parent 730f1b4b
......@@ -17,6 +17,7 @@ public class PerformanceRefundConfigVo {
private Integer isRefundPoundage;
private Integer isRefundVoucher;
private Integer isRefundExpress;
private Integer isBackPaperTicket;
private OrderRefundAddress orderRefundAddress;
}
......@@ -119,6 +119,7 @@ public class KylinPerformanceVo {
private Integer isRefundPoundage;
private Integer isRefundVoucher;
private Integer isRefundExpress;
private Integer isBackPaperTicket;
public void setPerformance(KylinPerformances performance) {
this.mid = performance.getMid();
......@@ -175,6 +176,7 @@ public class KylinPerformanceVo {
this.isRefundPoundage = performanceStatus.getIsRefundPoundage();
this.isRefundVoucher = performanceStatus.getIsRefundVoucher();
this.isRefundExpress = performanceStatus.getIsRefundExpress();
this.isBackPaperTicket = performanceStatus.getIsBackPaperTicket();
}
public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
......
......@@ -199,7 +199,9 @@ public interface IKylinPerformancesAdminService {
String refundCloseTime,
Integer isRefundPoundage,
Integer isRefundVoucher,
Integer isRefundExpress);
Integer isRefundExpress,
Integer isBackPaperTicket
);
/**
* 获取 演出转赠配置
......
......@@ -203,8 +203,10 @@ public class KylinPerformancesController extends BaseController {
@RequestParam("refundCloseTime") String refundCloseTime,
@RequestParam("isRefundPoundage") Integer isRefundPoundage,
@RequestParam("isRefundVoucher") Integer isRefundVoucher,
@RequestParam("isRefundExpress") Integer isRefundExpress) {
String result = kylinPerformancesService.changeRefundConfig(performancesId, isCanRefund, refundOpenTime, refundCloseTime, isRefundPoundage, isRefundVoucher, isRefundExpress);
@RequestParam("isRefundExpress") Integer isRefundExpress,
@RequestParam("isBackPaperTicket") Integer isBackPaperTicket
) {
String result = kylinPerformancesService.changeRefundConfig(performancesId, isCanRefund, refundOpenTime, refundCloseTime, isRefundPoundage, isRefundVoucher, isRefundExpress, isBackPaperTicket);
return this.success(result);
}
......
......@@ -95,6 +95,17 @@
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">快递票是否需要退回:</label>
<div class="col-sm-8">
<div class="radio check-box">
<input type="radio" value="0" name="isBackPaperTicket" th:checked="*{isBackPaperTicket==0 ? true : false}" checked> 不需要</label>
</div>
<div class="radio check-box">
<input type="radio" value="1" name="isBackPaperTicket" th:checked="*{isBackPaperTicket==1 ? true : false}">需要</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">收货人:</label>
<div class="col-sm-8">
......@@ -156,7 +167,8 @@
refundCloseTime: $("input[name^='refundCloseTime']").val(),
isRefundPoundage: parseInt($("input[name^='performance_isRefundPoundage']: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() == "") {
......
......@@ -586,6 +586,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
vo.setIsRefundPoundage(kylinPerformanceStatus.getIsRefundPoundage());
vo.setIsRefundVoucher(kylinPerformanceStatus.getIsRefundVoucher());
vo.setIsRefundExpress(kylinPerformanceStatus.getIsRefundExpress());
vo.setIsBackPaperTicket(kylinPerformanceStatus.getIsBackPaperTicket());
vo.setOrderRefundAddress(dataUtils.getRefundAddress());
return vo;
......@@ -646,7 +647,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
String refundCloseTime,
Integer isRefundPoundage,
Integer isRefundVoucher,
Integer isRefundExpress) {
Integer isRefundExpress,
Integer isBackPaperTicket
) {
KylinPerformanceStatus kylinPerformanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
if (kylinPerformanceStatusData.getIsTransfer().equals(1) && isCanRefund.equals(1)) {
return "修改失败,演出已开启转赠";
......@@ -659,6 +662,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
kylinPerformanceStatus.setIsRefundPoundage(isRefundPoundage);
kylinPerformanceStatus.setIsRefundVoucher(isRefundVoucher);
kylinPerformanceStatus.setIsRefundExpress(isRefundExpress);
kylinPerformanceStatus.setIsBackPaperTicket(isBackPaperTicket);
try {
performanceStatusMapper.update(kylinPerformanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
......
......@@ -139,6 +139,11 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{
*/
private Integer isRefundExpress;
/**
* 快递票是否需要退回
*/
private Integer isBackPaperTicket;
/**
* 创建时间
*/
......
......@@ -18,3 +18,5 @@ CREATE TABLE `kylin_express_module`
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci
ROW_FORMAT = DYNAMIC COMMENT '快递模板表';
alter table kylin_performance_status add is_back_paper_ticket tinyint NOT NULL DEFAULT 0 COMMENT '快递票是否需要退回 0不需要 1需要' after is_refund_express;
\ 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