+会员卡列表;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

@@ -38,9 +38,9 @@ import java.util.stream.Collectors;
 
 @Api(tags = "登登登会员")
 @Controller
-@RequestMapping("adam/member/detail")
+@RequestMapping("adam/member")
 public class AdamMemberAdminController extends BaseController {
-    private final String prefix = "zhengzai/adam/member/detail";
+    private final String prefix = "zhengzai/adam/member";
     @Autowired
     IAdamMemberAdminService adamMemberService;
     @Autowired
@@ -54,11 +54,29 @@ public class AdamMemberAdminController extends BaseController {
     @Autowired
     ICandyCouponAdminService candyCouponAdminService;
 
-    @RequiresPermissions("adam:member:detail:view")
     @GetMapping()
-    public String detailInfo(ModelMap mmap) {
+    public String view() {
+        return prefix + "/member";
+    }
+
+    @RequiresPermissions("adam:member:view:list")
+    @PostMapping("list")
+    @ResponseBody
+    public TableDataInfo list() {
+        startPage();
+        return getDataTable(adamMemberService.list(
+                Wrappers.lambdaQuery(AdamMember.class).eq(AdamMember::getState, 1).select(
+                        AdamMember::getMemberId, AdamMember::getIcon, AdamMember::getName, AdamMember::getTitle
+                )
+        ));
+    }
+
+    @RequiresPermissions("adam:member:view:edit")
+    @GetMapping("info/{memberId}")
+    public String info(@PathVariable("memberId") String memberId, ModelMap mmap) {
         AdamMember member = adamMemberService.getOne(Wrappers.lambdaQuery(AdamMember.class)
                 .eq(AdamMember::getState, 1)
+                .eq(AdamMember::getMemberId, memberId)
                 .select(
                         AdamMember::getMemberId,
                         AdamMember::getName,
@@ -116,26 +134,26 @@ public class AdamMemberAdminController extends BaseController {
     }
 
     @ApiOperation(value = "会员设置:基础信息编辑")
-    @RequiresPermissions("adam:member:detail:edit")
-    @PostMapping("edit")
+    @RequiresPermissions("adam:member:edit:basic")
+    @PostMapping("edit_basic")
     @ResponseBody
-    public AjaxResult detailInfoEdit(@Validated AdamMemberBuildParam parameter) {
+    public AjaxResult editBasic(@Validated AdamMemberBuildParam parameter) {
         return this.toAjax(adamMemberService.edit(parameter));
     }
 
     @ApiOperation(value = "会员套餐:价格编辑")
-    @RequiresPermissions("adam:member:detail:price:edit")
-    @PostMapping("price_edit")
+    @RequiresPermissions("adam:member:edit:price")
+    @PostMapping("edit_price")
     @ResponseBody
-    public AjaxResult detailPriceEdit(@Validated AdamMemberPriceBuildParam parameter) {
+    public AjaxResult editPrice(@Validated AdamMemberPriceBuildParam parameter) {
         return this.toAjax(adamMemberPriceAdminService.edit(parameter));
     }
 
     @ApiOperation(value = "会员套餐:权益编辑")
-    @RequiresPermissions("adam:member:detail:rights:edit")
-    @PostMapping("rights_edit")
+    @RequiresPermissions("adam:member:edit:rights")
+    @PostMapping("edit_rights")
     @ResponseBody
-    public AjaxResult detailRightsEdit(@Validated AdamMemberRightsBuildParam parameter) {
+    public AjaxResult editRights(@Validated AdamMemberRightsBuildParam parameter) {
         if (null == parameter.getState() || parameter.getState() != 2) {
             // 这里编辑包含新增、更新、删除分别对应state:1,1,2
             parameter.setState(1);
@@ -144,10 +162,10 @@ public class AdamMemberAdminController extends BaseController {
     }
 
     @ApiOperation(value = "会员套餐:券编辑")
-    @RequiresPermissions("adam:member:detail:coupon:edit")
-    @PostMapping("coupon_edit")
+    @RequiresPermissions("adam:member:edit:coupon")
+    @PostMapping("edit_coupon")
     @ResponseBody
-    public AjaxResult detailCouponEdit(@RequestBody @Validated CandyMemberCouponBuildParam parameter) {
+    public AjaxResult editCoupon(@RequestBody @Validated CandyMemberCouponBuildParam parameter) {
         Integer busiType = parameter.getBusiType();// 业务类别[0-全场｜1-演出｜2-商品｜3-优先购]
         if (busiType > 0) {
             if (CollectionUtils.isEmpty(parameter.getCouponRuleList())) {
@@ -191,14 +209,14 @@ public class AdamMemberAdminController extends BaseController {
     }
 
     @ApiOperation(value = "会员码:列表")
-    @RequiresPermissions("adam:member:detail:code:list")
-    @PostMapping("code_list")
+    @RequiresPermissions("adam:member:view:list:code")
+    @PostMapping("list_code")
     @ResponseBody
-    public TableDataInfo detailCodeList(AdamMemberCodeListParam parameter) {
-        return getDataTable(detailCodeListQuery(parameter));
+    public TableDataInfo listCode(AdamMemberCodeListParam parameter) {
+        return getDataTable(codeListQuery(parameter));
     }
 
-    private List<AdamMemberCode> detailCodeListQuery(AdamMemberCodeListParam parameter) {
+    private List<AdamMemberCode> codeListQuery(AdamMemberCodeListParam parameter) {
         LambdaQueryWrapper<AdamMemberCode> queryWrapper = Wrappers.lambdaQuery(AdamMemberCode.class).orderByDesc(AdamMemberCode::getCreatedAt);
         queryWrapper.eq(AdamMemberCode::getMemberId, parameter.getMemberId())
                 .ne(AdamMemberCode::getState, 2)
@@ -211,11 +229,11 @@ public class AdamMemberAdminController extends BaseController {
     }
 
     @ApiOperation(value = "会员码:导出")
-    @RequiresPermissions("adam:member:detail:code:export")
-    @PostMapping("code_export")
+    @RequiresPermissions("adam:member:export:code")
+    @PostMapping("export_code")
     @ResponseBody
-    public AjaxResult detailCodeExport(AdamMemberCodeListParam parameter) {
-        List<AdamMemberCode> list = detailCodeListQuery(parameter);
+    public AjaxResult exportCode(AdamMemberCodeListParam parameter) {
+        List<AdamMemberCode> list = codeListQuery(parameter);
 
         ExcelUtil<AdamMemberCodeExcelDto> excelUtil = new ExcelUtil<>(AdamMemberCodeExcelDto.class);
         List<AdamMemberCodeExcelDto> excelList = new ArrayList<>();
@@ -226,10 +244,10 @@ public class AdamMemberAdminController extends BaseController {
     }
 
     @ApiOperation(value = "会员码:生成")
-    @RequiresPermissions("adam:member:detail:code:gen")
-    @PostMapping("code_gen")
+    @RequiresPermissions("adam:member:gen:code")
+    @PostMapping("gen_code")
     @ResponseBody
-    public AjaxResult detailCodeGen(@Validated AdamMemberCodeGenParam parameter) {
+    public AjaxResult genCode(@Validated AdamMemberCodeGenParam parameter) {
         int count = adamMemberPriceAdminService.count(
                 Wrappers.lambdaQuery(AdamMemberPrice.class)
                         .eq(AdamMemberPrice::getMemberPriceId, parameter.getMemberPriceId())

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/detail/info.html → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html

@@ -6,7 +6,6 @@
 </head>
 
 <body class="gray-bg" style="font: 14px Helvetica Neue, Helvetica, PingFang SC, 微软雅黑, Tahoma, Arial, sans-serif !important;">
-<!--<input id="userId" name="userId" type="hidden" th:value="${user.userId}" />-->
 <section class="section-content">
     <div class="row">
         <div class="col-sm-12 about">
@@ -128,30 +127,6 @@
 
 <th:block th:include="include :: footer" />
 <script>
-    function avatar() {
-        var url = ctx + 'system/user/profile/avatar';
-        top.layer.open({
-            type: 2,
-            area: [$(window).width() + 'px', $(window).height() + 'px'],
-            fix: false,
-            //不固定
-            maxmin: true,
-            shade: 0.3,
-            title: "修改头像",
-            content: url,
-            btn: ['确定', '关闭'],
-            // 弹层外区域关闭
-            shadeClose: true,
-            yes: function(index, layero) {
-                var iframeWin = layero.find('iframe')[0];
-                iframeWin.contentWindow.submitHandler(index, layero);
-            },
-            cancel: function(index) {
-                return true;
-            }
-        });
-    }
-
     /*基础信息-修改*/
     $("#form-member-edit").validate({
         onkeyup: false,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/member.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('会员卡列表')" />
+    <th:block th:include="include :: select2-css" />
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: select2-js" />
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('adam:member:view:edit')}]];
+    var prefix = ctx + "adam/member";
+
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            updateUrl: prefix + "/info/{id}",
+            sortName: "memberId",
+            sortOrder: "asc",
+            modalName: "设置",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'memberId',
+                    title: '会员卡ID'
+                },
+                {
+                    field: 'name',
+                    title: '会员卡名称',
+                },
+                {
+                    field: 'title',
+                    title: '会员卡标题',
+                    align: 'center',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.memberId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>
\ No newline at end of file