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

Commit 8e9cd456 authored by 胡佳晨's avatar 胡佳晨

会员信息配置 修改提交

parent 63a0b483
...@@ -6,7 +6,6 @@ import lombok.Data; ...@@ -6,7 +6,6 @@ import lombok.Data;
import java.util.List; import java.util.List;
@ApiModel
@Data @Data
public class PerformanceMemberAuditParam { public class PerformanceMemberAuditParam {
@ApiModelProperty(value = "演出id") @ApiModelProperty(value = "演出id")
......
...@@ -11,7 +11,7 @@ import java.math.BigDecimal; ...@@ -11,7 +11,7 @@ import java.math.BigDecimal;
public class TicketMemberAuditParam { public class TicketMemberAuditParam {
@ApiModelProperty(value = "票id") @ApiModelProperty(value = "票id")
private String ticketsId; private String ticketsId;
@ApiModelProperty(value = "演出名称") @ApiModelProperty(value = "名称")
private String title; private String title;
@ApiModelProperty(value = "会员优惠价格") @ApiModelProperty(value = "会员优惠价格")
private BigDecimal priceDiscountMember; private BigDecimal priceDiscountMember;
......
...@@ -8,6 +8,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesA ...@@ -8,6 +8,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesA
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao; import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao; import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam; import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -79,4 +80,12 @@ public class KylinPerformancesController extends BaseController { ...@@ -79,4 +80,12 @@ public class KylinPerformancesController extends BaseController {
mmap.put("performanceMemberAuditDao", result); mmap.put("performanceMemberAuditDao", result);
return prefix + "/memberInfo"; return prefix + "/memberInfo";
} }
@RequiresPermissions("kylin:performances:member:change")
@PostMapping(value = "/memberInfo/submit")
@ResponseBody
public AjaxResult memberInfo(PerformanceMemberAuditParam performanceMemberAuditParam) {
boolean result = kylinPerformancesService.performanceMemberChange(performanceMemberAuditParam);
return toAjax(result);
}
} }
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
</div> </div>
<div id="tab-3" class="tab-pane"> <div id="tab-3" class="tab-pane">
<div class="panel-body"> <div class="panel-body">
<iframe id="content_iframe" name="content_iframe" marginwidth=0 marginheight=0 width=100% height=100% frameborder=0></iframe> <iframe id="content_iframe" name="content_iframe" marginwidth=0 marginheight=0 width=100% height=800px frameborder=0></iframe>
</div> </div>
</div> </div>
</div> </div>
...@@ -269,6 +269,8 @@ ...@@ -269,6 +269,8 @@
"rejectTxt": auditRejectTxt "rejectTxt": auditRejectTxt
}; };
$.operate.post(prefix + "/audit", param, function (res) { $.operate.post(prefix + "/audit", param, function (res) {
// $.modal.close();
$.table.refresh();
}); });
} }
} }
...@@ -279,7 +281,7 @@ ...@@ -279,7 +281,7 @@
//会员详情 //会员详情
function memberInfo() { function memberInfo() {
document.getElementById("content_iframe").src="../memberInfo/"+'[[${kylinPerformanceMisVo.performancesId}]]'; document.getElementById("content_iframe").src="../memberInfo/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
} }
</script> </script>
......
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