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

Commit afa823a8 authored by jiangxiulong's avatar jiangxiulong

批量退款前 先判断演出时候下架

parent 96d2ca8b
......@@ -80,16 +80,21 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
@Log(title = "演出退款管理", businessType = BusinessType.OTHER)
@PostMapping("applyPerformance")
@ResponseBody
public KylinOrderRefundBatchesPerformanceVo applyPerformance(RefundBatchApplyParam refundBatchApplyParam) {
public AjaxResult applyPerformance(RefundBatchApplyParam refundBatchApplyParam) {
String performancesId = refundBatchApplyParam.getTargetId();
//获取演出详情
KylinPerformanceMisVo performanceMisVo = kylinPerformancesService.performanceDetails(performancesId);
if (null == performanceMisVo) {
return error("未找到该演出数据");
}
if (performanceMisVo.getStatus() != 7) {
return error("当前演出未下架,不可能退款");
}
List<PerformanceOrderStatisticalDao> result = kylinPerformancesService.getPerformanceOrderStatisticalList(performancesId);
KylinOrderRefundBatchesPerformanceVo kylinOrderRefundBatchesPerformanceVo = new KylinOrderRefundBatchesPerformanceVo();
kylinOrderRefundBatchesPerformanceVo.setKylinPerformanceMisVo(performanceMisVo);
kylinOrderRefundBatchesPerformanceVo.setPerformanceOrderStatisticalDao(result);
return kylinOrderRefundBatchesPerformanceVo;
return AjaxResult.success(kylinOrderRefundBatchesPerformanceVo);
}
@Log(title = "演出退款管理", businessType = BusinessType.APPLY)
......
......@@ -56,14 +56,14 @@
$.modal.loading("正在查询演出,请稍后...");
},
success: function(result) {
if (result.msg) {
if (result.code > 0) {
$.modal.closeLoading();
layer.msg("未找到该演出信息");
layer.msg(result.msg);
return false;
}
$("#performanceTitle").text(result.kylinPerformanceMisVo.title);
$("#performanceTitle").text(result.data.kylinPerformanceMisVo.title);
var options = {
data: result.performanceOrderStatisticalDao,
data: result.data.performanceOrderStatisticalDao,
pagination: false,
columns: [
{
......
......@@ -664,17 +664,6 @@ public class DataUtils {
}
}
// 获取订单券的使用情况
public ArrayList<KylinOrderCoupons> getOrderCoupon(String orderId){
String redisKey = KylinRedisConst.ORDER_COUPON.concat(orderId);
Object obj = redisUtil.get(redisKey);
if (obj == null) {
return new ArrayList();
} else {
return (ArrayList<KylinOrderCoupons>) 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