代金、满减，商品搜索字段赋值;

会员开售开关配置;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.domain.entity.SysUser;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberAdminService;
@@ -32,6 +33,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -137,6 +139,14 @@ public class AdamMemberAdminController extends BaseController {
         return prefix + "/info";
     }
 
+    @RequiresPermissions("adam:member:edit:onsale")
+    @Log(title = "会员管理:会员卡编辑:开售停售", businessType = BusinessType.UPDATE)
+    @PostMapping("edit_onsale")
+    @ResponseBody
+    public AjaxResult editOnsale(AdamMemberBuildParam parameter) {
+        return this.toAjax(adamMemberService.edit(parameter));
+    }
+
     @ApiOperation(value = "会员设置:基础信息编辑")
     @RequiresPermissions("adam:member:edit:basic")
     @Log(title = "会员管理:会员卡编辑:基础信息", businessType = BusinessType.UPDATE)

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

@@ -15,6 +15,7 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
 <script th:inline="javascript">
+    var editOnsaleFlag = [[${@permission.hasPermi('adam:member:edit:onsale')}]] == 'hidden';
     var editFlag = [[${@permission.hasPermi('adam:member:view:edit')}]];
     var viewMemberCodeMgtFlag = [[${@permission.hasPermi('adam:member:code:mgt:list')}]];
     var prefix = ctx + "adam/member";
@@ -56,11 +57,18 @@
                     field: 'onsale',
                     title: '开售状态',
                     align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        var listClass = "badge badge-" + (value === 1 ? 'primary' : 'danger');
-                        actions.push($.common.sprintf("<span class='%s'>%s</span>", listClass, value === 1 ? '开售' : '停售'));
-                        return actions;
+                    // formatter: function(value, row, index) {
+                    //     var actions = [];
+                    //     var listClass = "badge badge-" + (value === 1 ? 'primary' : 'danger');
+                    //     actions.push($.common.sprintf("<span class='%s'>%s</span>", listClass, value === 1 ? '开售' : '停售'));
+                    //     return actions;
+                    // }
+                    formatter: function (value, row, index) {
+                        if (value == 1) {
+                            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="onsaleDisable(\'' + row.memberId + '\')"></i> ';
+                        } else {
+                            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="onsaleEnable(\'' + row.memberId + '\')"></i> ';
+                        }
                     }
                 },
                 {
@@ -82,6 +90,24 @@
         $.modal.openTab("会员码管理", 'adam/mcode/mgt?memberId=' + memberId);
     }
 
+    /* 会员停售 */
+    function onsaleDisable(memberId) {
+        if (!editOnsaleFlag) {
+            $.modal.confirm("确认要停售VIP吗？", function() {
+                $.operate.post(prefix + "/edit_onsale", { "memberId": memberId, "onsale": 2 });
+            });
+        }
+    }
+
+    /* 会员开售 */
+    function onsaleEnable(memberId) {
+        if (!editOnsaleFlag) {
+            $.modal.confirm("确认要开售VIP吗？", function() {
+                $.operate.post(prefix + "/edit_onsale", { "memberId": memberId, "onsale": 1 });
+            });
+        }
+    }
+
     function setVipTabs () {
         window.localStorage.setItem('tabActive', 0);
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html

@@ -288,7 +288,7 @@
     };
     function getMallList() {
         let data = {
-            title: ''
+            title: searchVal
         }
         let str = '';
         promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html

@@ -290,7 +290,7 @@
     };
     function getMallList() {
         let data = {
-            title: ''
+            title: searchVal
         }
         let str = '';
         promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{