加入黑名单，查询黑名单列表

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 import com.alibaba.druid.support.json.JSONUtils;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
@@ -64,10 +65,19 @@ public class SmileUserController extends BaseController {
     @PostMapping("/updateUserStateByUid")
     @ApiOperation(value = "根据uid修改用户状态 0：正常，1：黑名单")
     @ResponseBody
-    public AjaxResult updateUserStateById(@RequestParam(name = "uid", required = true) String uid, @RequestParam(name = "state", required = true) Integer state) {
-        return iSmileUserService.updateUserStateById(uid, state);
+    public AjaxResult updateUserStateById(SaveUserStateParam saveUserStateParam) {
+        return iSmileUserService.updateUserStateById(saveUserStateParam.getUid(), saveUserStateParam.getState());
     }
 
+    @PostMapping("/listByState")
+    @ApiOperation("获取黑名单列表")
+    @ResponseBody
+    public TableDataInfo listByState(SmileUserStateParam smileUserStateParam) {
+        PageHelper.startPage(smileUserStateParam.getPageNum(), smileUserStateParam.getPageSize());
+        return getDataTable(iSmileUserService.listByState(smileUserStateParam));
+    }
+
+
     @PostMapping("/check/list")
     @ApiOperation("获取审核列表")
     @ResponseBody
@@ -90,13 +100,13 @@ public class SmileUserController extends BaseController {
     @RequestMapping("getAreaJson")
     @ApiOperation("省市区json")
     @ResponseBody
-    public AjaxResult  getAreaJson(){
+    public AjaxResult getAreaJson() {
         String jsonStr = "";
         try {
             String path = Objects.requireNonNull(JSONUtils.class.getClassLoader().getResource("static/area.json")).getPath();
-            logger.info("path:{}",path);
+            logger.info("path:{}", path);
             InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("static/area.json");
-            if (inputStream != null){
+            if (inputStream != null) {
                 Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
                 int ch = 0;
                 StringBuilder sb = new StringBuilder();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserService.java

@@ -25,4 +25,5 @@ public interface ISmileUserService extends IService<SmileUser> {
 
     AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheck);
 
+    List<SmileUser> listByState(SmileUserStateParam smileUserStateParam);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -151,13 +151,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         } else {
             return AjaxResult.warn("清先为演出设置票提！");
         }
-
-        /*//获取排序演出id
-        List<String> collect = kylinPerformancesMapper.selectPerIdByAgent().stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
-        String perId = StringUtils.join(collect, ",");
-        //保存所有演出id带顺序
-        smileRedisUtils.setShowIds(perId);*/
-
     }
 
     @Override

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -187,6 +187,24 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         return AjaxResult.warn("参数错误");
     }
 
+    @Override
+    public List<SmileUser> listByState(SmileUserStateParam smileUserStateParam) {
+        LambdaQueryWrapper<SmileUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmpty(smileUserStateParam.getName())) {
+            lambdaQueryWrapper.like(SmileUser::getName, smileUserStateParam.getName());
+        }
+        if (!StringUtils.isEmpty(smileUserStateParam.getPhone())) {
+            lambdaQueryWrapper.eq(SmileUser::getPhone, smileUserStateParam.getPhone());
+        }
+        if (smileUserStateParam.getType() != null) {
+            lambdaQueryWrapper.eq(SmileUser::getType, smileUserStateParam.getType());
+        }
+        lambdaQueryWrapper.eq(SmileUser::getState, 1);
+        lambdaQueryWrapper.eq(SmileUser::getDelTag, 0);
+        lambdaQueryWrapper.orderByDesc(SmileUser::getUpdatedDate);
+        return smileUserMapper.selectList(lambdaQueryWrapper);
+    }
+
     private void updateUserVoRedis(SmileUserCheckVo smileUserCheckVo, SmileOrganization smileOrganization) {
         LambdaQueryWrapper<SmileUser> smileUserQueryWrapper = Wrappers.lambdaQuery(SmileUser.class);
         smileUserQueryWrapper.eq(SmileUser::getOrgId, smileOrganization.getId());
@@ -216,7 +234,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         //根据uid查询用户
         LambdaQueryWrapper<SmileUser> userQueryWrapper = Wrappers.lambdaQuery(SmileUser.class);
         userQueryWrapper.eq(SmileUser::getUid, uid);
-        userQueryWrapper.eq(SmileUser::getDelTag,0);
+        userQueryWrapper.eq(SmileUser::getDelTag, 0);
         SmileUser smileUser = smileUserMapper.selectOne(userQueryWrapper);
         SmileUserVO smileUserVO = new SmileUserVO();
         BeanUtils.copyProperties(smileUser, smileUserVO);

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -135,8 +135,9 @@
 
     <update id="updateUserStateById">
         update smile_user
-        set `state` = #{state},
-            where `uid` = #{uid}
+        set `state`     = #{state},
+            updated_date=NOW()
+        where `uid` = #{uid}
     </update>
 
     <update id="updateUserCheckByUid">