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

Skip to content

L
liquidnet-bus-v1
Commit 417a2829 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant 

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
parents c5a041c5 29a91cd9
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 28 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/PerformanceRefundConfigVo.java
View file @ 417a2829
...@@ -18,6 +18,7 @@ public class PerformanceRefundConfigVo { ...@@ -18,6 +18,7 @@ public class PerformanceRefundConfigVo {
private Integer isRefundVoucher; private Integer isRefundVoucher;
private Integer isRefundExpress; private Integer isRefundExpress;
private Integer isBackPaperTicket; private Integer isBackPaperTicket;
private Integer isRefundExpressNew;
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 @ 417a2829
...@@ -122,6 +122,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{ ...@@ -122,6 +122,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
private Integer isRefundVoucher; private Integer isRefundVoucher;
private Integer isRefundExpress; private Integer isRefundExpress;
private Integer isBackPaperTicket; private Integer isBackPaperTicket;
private Integer isRefundExpressNew;
private Integer auditStatus; private Integer auditStatus;
private String rejectTxt; private String rejectTxt;
...@@ -224,6 +225,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{ ...@@ -224,6 +225,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
this.auditStatus = performanceStatus.getAuditStatus(); this.auditStatus = performanceStatus.getAuditStatus();
this.fieldAuditStatus = performanceStatus.getFieldAuditStatus(); this.fieldAuditStatus = performanceStatus.getFieldAuditStatus();
this.isBackPaperTicket = performanceStatus.getIsBackPaperTicket(); this.isBackPaperTicket = performanceStatus.getIsBackPaperTicket();
this.isRefundExpressNew = performanceStatus.getIsRefundExpressNew();
} }
public void initPerformanceStatusPartner(PerformancePartnerVo performanceStatus) { public void initPerformanceStatusPartner(PerformancePartnerVo performanceStatus) {
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderTicketPreVo.java
View file @ 417a2829
...@@ -89,6 +89,8 @@ public class KylinOrderTicketPreVo implements Serializable, Cloneable { ...@@ -89,6 +89,8 @@ public class KylinOrderTicketPreVo implements Serializable, Cloneable {
private Integer isRefundExpress; private Integer isRefundExpress;
@ApiModelProperty(value = "用户退款快递票是否需要归还纸质演出票 1需要 0不需要") @ApiModelProperty(value = "用户退款快递票是否需要归还纸质演出票 1需要 0不需要")
private Integer isBackPaperTicket; private Integer isBackPaperTicket;
@ApiModelProperty(value = "用户退款快递票是否退快递费 1退回 0不退回")
private Integer isRefundExpressNew;
// 是否退优惠卷(这个是前后台通用的配置 其他都是针对用户自己退款的) // 是否退优惠卷(这个是前后台通用的配置 其他都是针对用户自己退款的)
@ApiModelProperty(value = "退款是否退优惠券 0关闭不退 1开启退") @ApiModelProperty(value = "退款是否退优惠券 0关闭不退 1开启退")
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @ 417a2829
...@@ -212,8 +212,8 @@ public interface IKylinPerformancesAdminService { ...@@ -212,8 +212,8 @@ public interface IKylinPerformancesAdminService {
Integer isRefundPoundage, Integer isRefundPoundage,
Integer isRefundVoucher, Integer isRefundVoucher,
Integer isRefundExpress, Integer isRefundExpress,
Integer isBackPaperTicket Integer isBackPaperTicket,
); Integer isRefundExpressNew);
/** /**
* 获取 演出转赠配置 * 获取 演出转赠配置
......
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 @ 417a2829
...@@ -209,9 +209,9 @@ public class KylinPerformancesController extends BaseController { ...@@ -209,9 +209,9 @@ public class KylinPerformancesController extends BaseController {
@RequestParam("isRefundPoundage") Integer isRefundPoundage, @RequestParam("isRefundPoundage") Integer isRefundPoundage,
@RequestParam("isRefundVoucher") Integer isRefundVoucher, @RequestParam("isRefundVoucher") Integer isRefundVoucher,
@RequestParam("isRefundExpress") Integer isRefundExpress, @RequestParam("isRefundExpress") Integer isRefundExpress,
@RequestParam("isBackPaperTicket") Integer isBackPaperTicket @RequestParam("isBackPaperTicket") Integer isBackPaperTicket,
) { @RequestParam("isRefundExpressNew") Integer isRefundExpressNew) {
String result = kylinPerformancesService.changeRefundConfig(performancesId, isCanRefund, refundOpenTime, refundCloseTime, isRefundPoundage, isRefundVoucher, isRefundExpress, isBackPaperTicket); String result = kylinPerformancesService.changeRefundConfig(performancesId, isCanRefund, refundOpenTime, refundCloseTime, isRefundPoundage, isRefundVoucher, isRefundExpress, isBackPaperTicket, isRefundExpressNew);
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 @ 417a2829
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,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="*{isRefundExpress==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_isRefundExpress" checked>用户承担</label> <input type="radio" value="1" name="performance_isRefundExpress" checked>用户承担</label>
...@@ -97,6 +97,17 @@ ...@@ -97,6 +97,17 @@
</div> </div>
</div> </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="isRefundExpressNew" th:checked="*{isRefundExpressNew==0 ? true : false}" checked> 不退回</label>
</div>
<div class="radio check-box">
<input type="radio" value="1" name="isRefundExpressNew" th:checked="*{isRefundExpressNew==1 ? true : false}">退回</label>
</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="*{isRefundVoucher==1}">
...@@ -169,6 +180,7 @@ ...@@ -169,6 +180,7 @@
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()) isBackPaperTicket: parseInt($("input[name^='isBackPaperTicket']:checked").val())
isRefundExpressNew: parseInt($("input[name^='isRefundExpressNew']:checked").val())
} }
if ($("input[name^='refundCloseTime']").val() == "" || $("input[name^='refundOpenTime']").val() == "") { if ($("input[name^='refundCloseTime']").val() == "" || $("input[name^='refundOpenTime']").val() == "") {
......
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 @ 417a2829
...@@ -632,6 +632,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -632,6 +632,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
vo.setIsRefundVoucher(kylinPerformanceStatus.getIsRefundVoucher()); vo.setIsRefundVoucher(kylinPerformanceStatus.getIsRefundVoucher());
vo.setIsRefundExpress(kylinPerformanceStatus.getIsRefundExpress()); vo.setIsRefundExpress(kylinPerformanceStatus.getIsRefundExpress());
vo.setIsBackPaperTicket(kylinPerformanceStatus.getIsBackPaperTicket()); vo.setIsBackPaperTicket(kylinPerformanceStatus.getIsBackPaperTicket());
vo.setIsRefundExpressNew(kylinPerformanceStatus.getIsRefundExpressNew());
vo.setOrderRefundAddress(dataUtils.getRefundAddress()); vo.setOrderRefundAddress(dataUtils.getRefundAddress());
return vo; return vo;
...@@ -693,8 +694,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -693,8 +694,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
Integer isRefundPoundage, Integer isRefundPoundage,
Integer isRefundVoucher, Integer isRefundVoucher,
Integer isRefundExpress, Integer isRefundExpress,
Integer isBackPaperTicket Integer isBackPaperTicket,
) { Integer isRefundExpressNew) {
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 "修改失败，演出已开启转赠";
...@@ -708,6 +709,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -708,6 +709,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
kylinPerformanceStatus.setIsRefundVoucher(isRefundVoucher); kylinPerformanceStatus.setIsRefundVoucher(isRefundVoucher);
kylinPerformanceStatus.setIsRefundExpress(isRefundExpress); kylinPerformanceStatus.setIsRefundExpress(isRefundExpress);
kylinPerformanceStatus.setIsBackPaperTicket(isBackPaperTicket); kylinPerformanceStatus.setIsBackPaperTicket(isBackPaperTicket);
kylinPerformanceStatus.setIsRefundExpressNew(isRefundExpressNew);
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 @ 417a2829
...@@ -124,6 +124,11 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{ ...@@ -124,6 +124,11 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{
*/ */
private Integer isBackPaperTicket; private Integer isBackPaperTicket;
/**
* 用户退款快递票是否退快递费 1退回 0不退回
*/
private Integer isRefundExpressNew;
/** /**
* 是否退优惠券 * 是否退优惠券
* 这个是前后台通用的配置 其他都是针对用户自己退款的 * 这个是前后台通用的配置 其他都是针对用户自己退款的
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsRefundServiceImpl.java
View file @ 417a2829
...@@ -129,6 +129,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -129,6 +129,7 @@ public class KylinOrderTicketsRefundServiceImpl {
// 快递费 判断是否是最后一张入场人票 减去已经退的快递费 // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
BigDecimal canRefundPriceExpress = BigDecimal.valueOf(0); BigDecimal canRefundPriceExpress = BigDecimal.valueOf(0);
// 正在和已经退的快递票金额 正在和已经退的票数量 // 正在和已经退的快递票金额 正在和已经退的票数量
if (performanceVo.getIsRefundExpressNew() == 1) {
Integer refundNum = 0; Integer refundNum = 0;
BigDecimal priceExpressOld = BigDecimal.valueOf(0); BigDecimal priceExpressOld = BigDecimal.valueOf(0);
for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) { for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
...@@ -141,11 +142,13 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -141,11 +142,13 @@ public class KylinOrderTicketsRefundServiceImpl {
if (refundNum + 1 == orderTicketVo.getNumber()) { if (refundNum + 1 == orderTicketVo.getNumber()) {
canRefundPriceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld); canRefundPriceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
} }
}
// 整理返回数据 // 整理返回数据
BeanUtils.copyProperties(orderTicketVo, vo); BeanUtils.copyProperties(orderTicketVo, vo);
vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage()); vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage());
vo.setIsRefundVoucher(performanceVo.getIsRefundVoucher()); vo.setIsRefundVoucher(performanceVo.getIsRefundVoucher());
vo.setIsBackPaperTicket(performanceVo.getIsBackPaperTicket()); vo.setIsBackPaperTicket(performanceVo.getIsBackPaperTicket());
vo.setIsRefundExpressNew(performanceVo.getIsRefundExpressNew());
vo.setRefundPoundageAll(refundPoundageAll); vo.setRefundPoundageAll(refundPoundageAll);
vo.setOrderCouponList(orderCoupon); vo.setOrderCouponList(orderCoupon);
vo.setRefundAddress(refundAddress); vo.setRefundAddress(refundAddress);
...@@ -235,6 +238,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -235,6 +238,7 @@ public class KylinOrderTicketsRefundServiceImpl {
// 快递费 判断是否是最后一张入场人票 减去已经退的快递费 // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
BigDecimal priceExpress = BigDecimal.valueOf(0); BigDecimal priceExpress = BigDecimal.valueOf(0);
// 正在和已经退的快递票金额 正在和已经退的票数量 // 正在和已经退的快递票金额 正在和已经退的票数量
if (performanceVo.getIsRefundExpressNew() == 1) {
Integer refundNum = 0; Integer refundNum = 0;
BigDecimal priceExpressOld = BigDecimal.valueOf(0); BigDecimal priceExpressOld = BigDecimal.valueOf(0);
for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) { for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
...@@ -247,6 +251,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -247,6 +251,7 @@ public class KylinOrderTicketsRefundServiceImpl {
if (refundNum + 1 == orderTicketVo.getNumber()) { if (refundNum + 1 == orderTicketVo.getNumber()) {
priceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld); priceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
} }
}
Map token = CurrentUtil.getTokenClaims(); Map token = CurrentUtil.getTokenClaims();
String username = StringUtils.defaultString(((String) token.get("nickname")), ""); String username = StringUtils.defaultString(((String) token.get("nickname")), "");
......
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