fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -4,12 +4,16 @@ import cn.hutool.core.lang.Validator;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.WxLoginService;
 import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.top.mall.bo.TopStoreQueryBo;
+import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
 import com.zhongzheng.modules.user.bo.*;
+import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserWxFollow;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserService;
@@ -27,6 +31,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -54,5 +59,19 @@ public class UserController extends BaseController {
         return toAjax(iUserService.openVip(bo) ? 1 : 0);
     }
 
+    @ApiOperation("会员用户列表")
+    @GetMapping("/vipUserList")
+    public TableDataInfo<UserVo> vipUserList(UserQueryBo bo) {
+        startPage();
+        List<UserVo> list = iUserService.vipUserList(bo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("通过手机查找客户端用户")
+    @Log(title = "通过手机查找客户端用户", businessType = BusinessType.UPDATE)
+    @PostMapping("/findByTel")
+    public AjaxResult<User> findByTel(@RequestBody UserEditBo bo){
+        return AjaxResult.success(iUserService.queryUserByTelphoneTenant(bo.getTelphone(),Long.parseLong("867735392558919680")));
+    }
 
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1057,7 +1057,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public List<UserVo> vipUserList(UserQueryBo bo) {
-        return null;
+        return baseMapper.vipUserList(bo);
     }
 
     private Long findSubjectId(String subject){

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -2976,7 +2976,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }
             TopDivideLog divideLog = iTopDivideLogService.getOne(new LambdaQueryWrapper<TopDivideLog>()
                     .eq(TopDivideLog::getId, bankPay.getDivideLogId()));
-            if(divideLog.getPayStatus()!=0){
+            if(divideLog.getPayStatus()!=3){
                 throw new CustomException("非法操作");
             }
             if(bo.getStatus()==1){

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -64,4 +64,6 @@ public interface UserMapper extends BaseMapper<User> {
 
     @InterceptorIgnore(tenantLine = "true")
     void editUserInfo(UserQueryBo bo);
+
+    List<UserVo> vipUserList(UserQueryBo bo);
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -485,7 +485,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             user_id = #{userId}
     </select>
 
-    <select id="vipUserList" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultMap="UserResult">
+    <select id="vipUserList" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultType="com.zhongzheng.modules.user.vo.UserVo">
         SELECT
             *
         FROM