Merge remote-tracking branch 'origin/master'

linkwe-api/src/main/java/com/linkwechat/controller/WeCustomerUserController.java

@@ -39,14 +39,9 @@ public class WeCustomerUserController extends BaseController {
     @GetMapping("/findWeCustomerUserList")
     @ApiOperation(value = "查询微信客户列表(分页)",httpMethod = "GET")
     public TableDataInfo findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery) {
-        List<WeCustomerUserVo> list = weCustomerUserService.findWeCustomerUserList(weCustomerUserQuery, TableSupport.buildPageRequest());
-        TableDataInfo dataTable = getDataTable(list);
-        //设置总条数
-        dataTable.setTotal(
-                weCustomerUserService.countWeCustomerUserList(weCustomerUserQuery)
-        );
-
-        return dataTable;
+        startPage();
+        List<WeCustomerUserVo> list = weCustomerUserService.findWeCustomerUserList(weCustomerUserQuery);
+        return getDataTable(list);
     }
 
 

linkwe-api/src/main/java/com/linkwechat/controller/WeUserController.java

@@ -47,14 +47,9 @@ public class WeUserController extends BaseController {
     @GetMapping("/findWeUserList")
     @ApiOperation(value = "询同步用户列表(分页)",httpMethod = "GET")
     public TableDataInfo findWeUserList(WeCuUserQuery weUserQuery) {
-        List<WeUserVo> list = weUserService.findWeUserList(weUserQuery, TableSupport.buildPageRequest());
-        TableDataInfo dataTable = getDataTable(list);
-        //设置总条数
-        dataTable.setTotal(
-                weUserService.countWeUserList(weUserQuery)
-        );
-
-        return dataTable;
+        startPage();
+        List<WeUserVo> list = weUserService.findWeUserList(weUserQuery);
+        return getDataTable(list);
     }
 
     /**

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/bdshdb/customer/controller/LocalAppUserController.java

@@ -7,6 +7,7 @@ import com.linkwechat.coal.modules.bdshdb.customer.domain.dto.LocalAppUserDto;
 import com.linkwechat.coal.modules.bdshdb.customer.domain.vo.LocalAppUserVo;
 import com.linkwechat.coal.modules.bdshdb.customer.service.ILocalAppUserService;
 import com.linkwechat.common.core.domain.AjaxResult;
+import com.linkwechat.common.utils.StringUtils;
 import com.linkwechat.domain.WeCustomerUser;
 import com.linkwechat.domain.WeUser;
 import com.linkwechat.service.IWeCustomerUserService;
@@ -43,6 +44,7 @@ public class LocalAppUserController {
     @ApiOperation(value = "同步用户",httpMethod = "POST")
     public AjaxResult syncUserData(@RequestBody LocalAppUserDto localAppUserDto) {
 
+        log.info("同步本地生活用户 start ==================================");
         // 查询本地生活 所有的用户 条件 普通用户 创建时间
         List<LocalAppUserVo> localAppUserList = localAppUserService.selectUserList(localAppUserDto);
         List<LocalAppUserVo> distinctList = localAppUserList.stream()
@@ -77,7 +79,13 @@ public class LocalAppUserController {
                 weUser.setSex(localAppUserVo.getGender().equals(1) ? 1 : 0);
                 weUser.setBirthday(localAppUserVo.getBirthdayTime());
                 weUser.setSource(1); // 本地生活
-                weUser.setStatus(localAppUserVo.getIsFormal().equals(1)? 1 : 0);
+                if(Objects.nonNull(localAppUserVo.getUserStatusType())){
+                    if (localAppUserVo.getUserStatusType().equals(0)) {
+                        weUser.setStatus(1);
+                    } else if(localAppUserVo.getUserStatusType().equals(1)){
+                        weUser.setStatus(0);
+                    }
+                }
                 weUser.setType(0);
                 weUser.setRegisterTime(localAppUserVo.getCreateTime());
                 weUser.setDeliveredStatus(0);
@@ -86,6 +94,7 @@ public class LocalAppUserController {
             }
             weUserService.saveBatch(users);
         }
+        log.info("同步本地生活用户 end ==================================");
         return AjaxResult.success();
     }
 
@@ -96,6 +105,7 @@ public class LocalAppUserController {
     @ApiOperation(value = "同步用户",httpMethod = "POST")
     public AjaxResult syncCustomerUserData(@RequestBody LocalAppUserDto localAppUserDto) {
 
+        log.info("同步本地生活微信用户 start ==================================");
         // 查询本地生活 所有的用户 条件 普通用户 创建时间
         localAppUserDto.setIsWx(1);
         List<LocalAppUserVo> localAppUserList = localAppUserService.selectUserList(localAppUserDto);
@@ -116,7 +126,7 @@ public class LocalAppUserController {
         phoenWrapper.select(WeUser::getId);
         phoenWrapper.select(WeUser::getUserCode);
         phoenWrapper.select(WeUser::getPhone);
-        phoenWrapper.eq(WeUser::getPhone, userPhoneList);
+        phoenWrapper.in(WeUser::getPhone, userPhoneList);
         phoenWrapper.eq(WeUser::getSource, 1);
         List<WeUser> users = weUserService.list(phoenWrapper);
         // 转为 Map，手机号为 key
@@ -153,15 +163,16 @@ public class LocalAppUserController {
                 }else{
                     customerUser.setStatus(0);
                 }
-                customerUser.setWxNickname(localAppUserVo.getWechatNickname());
-                customerUser.setWxPhone(localAppUserVo.getPhone());
-                customerUser.setWxOpenid(localAppUserVo.getOpenId());
-                customerUser.setWxAvatar(localAppUserVo.getWechatHeadPhoto());
+                customerUser.setWxNickname(StringUtils.isNotEmpty(localAppUserVo.getWechatNickname())? localAppUserVo.getWechatNickname(): null);
+                customerUser.setWxPhone(StringUtils.isNotEmpty(localAppUserVo.getPhone())? localAppUserVo.getPhone() : null);
+                customerUser.setWxOpenid(StringUtils.isNotEmpty(localAppUserVo.getOpenId())? localAppUserVo.getOpenId() : null);
+                customerUser.setWxAvatar(StringUtils.isNotEmpty(localAppUserVo.getWechatHeadPhoto())? localAppUserVo.getWechatHeadPhoto(): null);
                 customerUser.setCreateTime(now);
                 weCustomerUserList.add(customerUser);
             }
             weCustomerUserService.saveBatch(weCustomerUserList);
         }
+        log.info("同步本地生活微信用户 end ==================================");
         return AjaxResult.success();
     }
 }

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/bdshdb/customer/domain/vo/LocalAppUserVo.java

@@ -63,9 +63,9 @@ public class LocalAppUserVo {
 
 
     /**
-     * 是否临时用户 (1.临时 2.正式)
+     * 用户状态(0.临时用户 1.正式用户  2.失效用户  )
      */
-    private Integer isFormal;
+    private Integer userStatusType;
 
     /**
      * 创建时间

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/bdshdb/customer/scheduled/ScheduledIntelligentService.java

@@ -82,6 +82,7 @@ public class ScheduledIntelligentService {
                 .orderByAsc(WeIntelligentMark::getActionId));
 
         markList.forEach(s -> {
+            log.info("----------打标类型：-----------" + s.getActionName());
             String actionId = s.getActionId();
             WeTag weTag1 = weTagMapper.selectOne(new LambdaQueryWrapper<WeTag>().eq(WeTag::getTagId, s.getTagId()));
             if ("ACT001".equals(actionId)) { //好友添加
@@ -90,6 +91,7 @@ public class ScheduledIntelligentService {
                 //查询企业客户未打添加好友标签的人员,打标签
                 List<WeCustomer> customerList = weCustomerList.stream().filter(weCustomer -> weCustomer.getTrackState() == 1)
                         .collect(Collectors.toList());
+                log.info("----------未打添加好友标签的人员数量：-----------" + customerList.size());
                 if (customerList.size() > 0) {
                     customerList.forEach(c -> {
                         List<String> list = getStrings(c);
@@ -318,7 +320,12 @@ public class ScheduledIntelligentService {
 
     private List<String> getStrings(WeCustomer t) {
         String tagIds = t.getTagIds();
-        String[] split = tagIds.split(",");
+        String[] split = new String[0];
+        if (tagIds != null) {
+            split = tagIds.split(",");
+        }else {
+            return new ArrayList<>();
+        }
         return new ArrayList<>(Arrays.asList(split));
     }
 

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/bdshdb/customer/scheduled/SyncUserDataScheduledService.java

@@ -9,6 +9,7 @@ import com.linkwechat.coal.modules.bdshdb.customer.service.ILocalAppUserService;
 import com.linkwechat.coal.modules.jzgdb.customer.domain.dto.SysUserJzgDto;
 import com.linkwechat.coal.modules.jzgdb.customer.domain.vo.SysUserJzgVo;
 import com.linkwechat.coal.modules.jzgdb.customer.service.ISysUserJzgService;
+import com.linkwechat.common.utils.StringUtils;
 import com.linkwechat.domain.WeCustomerUser;
 import com.linkwechat.domain.WeUser;
 import com.linkwechat.service.IWeCustomerUserService;
@@ -19,6 +20,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.PostConstruct;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -48,8 +50,7 @@ public class SyncUserDataScheduledService {
      * 定义一个按一定频率执行的定时任务 每天三点执行一次 更新同步用户
      * 本地生活
      */
-//    @Scheduled(cron = "0 0 3 * * ?")
-//    @PostConstruct
+    @Scheduled(cron = "0 0 3 * * ?")
     @Transactional(rollbackFor = Exception.class)
     public void syncUserDataScheduled() {
         try {
@@ -58,6 +59,7 @@ public class SyncUserDataScheduledService {
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
+        log.info("同步本地生活用户 start ==================================");
         LocalAppUserDto localAppUserDto = new LocalAppUserDto();
         this.setDate(localAppUserDto);
         Date now = new Date();
@@ -94,7 +96,13 @@ public class SyncUserDataScheduledService {
                 weUser.setSex(localAppUserVo.getGender().equals(1) ? 1 : 0);
                 weUser.setBirthday(localAppUserVo.getBirthdayTime());
                 weUser.setSource(1); // 本地生活
-                weUser.setStatus(localAppUserVo.getIsFormal().equals(1)? 1 : 0);
+                if(Objects.nonNull(localAppUserVo.getUserStatusType())){
+                    if (localAppUserVo.getUserStatusType().equals(0)) {
+                        weUser.setStatus(1);
+                    } else if(localAppUserVo.getUserStatusType().equals(1)){
+                        weUser.setStatus(0);
+                    }
+                }
                 weUser.setType(0);
                 weUser.setRegisterTime(localAppUserVo.getCreateTime());
                 weUser.setDeliveredStatus(0);
@@ -104,8 +112,8 @@ public class SyncUserDataScheduledService {
             weUserService.saveBatch(users);
         }
 
-
-
+        log.info("同步本地生活用户 end ==================================");
+        log.info("同步晋掌柜用户 start ==================================");
         SysUserJzgDto sysUserDto = new SysUserJzgDto();
         this.setDate(sysUserDto);
         // 查询本地生活 所有的用户 条件 普通用户 创建时间
@@ -137,8 +145,12 @@ public class SyncUserDataScheduledService {
                 weUser.setUserCode(sysUserJzgVo.getId().toString());
                 weUser.setName(sysUserJzgVo.getName());
                 weUser.setPhone(sysUserJzgVo.getMobile());
-                weUser.setSex(sysUserJzgVo.getSex().equals("M") ? 1 : 0);
-                weUser.setBirthday(sysUserJzgVo.getBirthday());
+                if (StringUtils.isNotEmpty(sysUserJzgVo.getSex())){
+                    weUser.setSex(sysUserJzgVo.getSex().equals("M") ? 1 : 0);
+                }
+                if (Objects.nonNull(sysUserJzgVo.getBirthday())){
+                    weUser.setBirthday(sysUserJzgVo.getBirthday());
+                }
                 weUser.setSource(0); // 晋掌柜
                 weUser.setType(0);
                 weUser.setRegisterTime(sysUserJzgVo.getCreateTime());
@@ -149,13 +161,14 @@ public class SyncUserDataScheduledService {
             weUserService.saveBatch(users);
         }
 
+        log.info("同步晋掌柜用户 end ==================================");
     }
 
     /**
      * 定义一个按一定频率执行的定时任务 每天三点半执行一次 更新微信客户
      * 本地生活
      */
-//    @Scheduled(cron = "0 30 3 * * ?")
+    @Scheduled(cron = "0 30 3 * * ?")
 //    @PostConstruct
     @Transactional(rollbackFor = Exception.class)
     public void syncCustomerUserDataScheduled() {
@@ -165,6 +178,7 @@ public class SyncUserDataScheduledService {
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
+        log.info("同步本地生活微信用户 start ==================================");
         LocalAppUserDto localAppUserDto = new LocalAppUserDto();
         this.setDate(localAppUserDto);
         // 查询本地生活 所有的用户 条件 普通用户 创建时间
@@ -187,7 +201,7 @@ public class SyncUserDataScheduledService {
         phoenWrapper.select(WeUser::getId);
         phoenWrapper.select(WeUser::getUserCode);
         phoenWrapper.select(WeUser::getPhone);
-        phoenWrapper.eq(WeUser::getPhone, userPhoneList);
+        phoenWrapper.in(WeUser::getPhone, userPhoneList);
         phoenWrapper.eq(WeUser::getSource, 1);
         List<WeUser> users = weUserService.list(phoenWrapper);
         // 转为 Map，手机号为 key
@@ -224,15 +238,16 @@ public class SyncUserDataScheduledService {
                 }else{
                     customerUser.setStatus(0);
                 }
-                customerUser.setWxNickname(localAppUserVo.getWechatNickname());
-                customerUser.setWxPhone(localAppUserVo.getPhone());
-                customerUser.setWxOpenid(localAppUserVo.getOpenId());
-                customerUser.setWxAvatar(localAppUserVo.getWechatHeadPhoto());
+                customerUser.setWxNickname(StringUtils.isNotEmpty(localAppUserVo.getWechatNickname())? localAppUserVo.getWechatNickname(): null);
+                customerUser.setWxPhone(StringUtils.isNotEmpty(localAppUserVo.getPhone())? localAppUserVo.getPhone() : null);
+                customerUser.setWxOpenid(StringUtils.isNotEmpty(localAppUserVo.getOpenId())? localAppUserVo.getOpenId() : null);
+                customerUser.setWxAvatar(StringUtils.isNotEmpty(localAppUserVo.getWechatHeadPhoto())? localAppUserVo.getWechatHeadPhoto(): null);
                 customerUser.setCreateTime(now);
                 weCustomerUserList.add(customerUser);
             }
             weCustomerUserService.saveBatch(weCustomerUserList);
         }
+        log.info("同步本地生活微信用户 end ==================================");
     }
 
     private void setDate(LocalAppUserDto localAppUserDto){

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/jzgdb/customer/controller/SysUserJzgController.java

@@ -40,6 +40,7 @@ public class SysUserJzgController {
     @ApiOperation(value = "同步用户",httpMethod = "POST")
     public AjaxResult syncUserData(@RequestBody SysUserJzgDto sysUserDto) {
 
+        log.info("同步晋掌柜用户 start ==================================");
         // 查询本地生活 所有的用户 条件 普通用户 创建时间
         List<SysUserJzgVo> sysUserJzgVoList = sysUserJzgService.selectUserList(sysUserDto);
         List<SysUserJzgVo> distinctList = sysUserJzgVoList.stream()
@@ -71,8 +72,12 @@ public class SysUserJzgController {
                 weUser.setUserCode(sysUserJzgVo.getId().toString());
                 weUser.setName(sysUserJzgVo.getName());
                 weUser.setPhone(sysUserJzgVo.getMobile());
-                weUser.setSex(sysUserJzgVo.getSex().equals("M") ? 1 : 0);
-                weUser.setBirthday(sysUserJzgVo.getBirthday());
+                if (StringUtils.isNotEmpty(sysUserJzgVo.getSex())){
+                    weUser.setSex(sysUserJzgVo.getSex().equals("M") ? 1 : 0);
+                }
+                if (Objects.nonNull(sysUserJzgVo.getBirthday())){
+                    weUser.setBirthday(sysUserJzgVo.getBirthday());
+                }
                 weUser.setSource(0); // 晋掌柜
                 weUser.setType(0);
                 weUser.setRegisterTime(sysUserJzgVo.getCreateTime());
@@ -82,6 +87,7 @@ public class SysUserJzgController {
             }
             weUserService.saveBatch(users);
         }
+        log.info("同步晋掌柜用户 end ==================================");
         return AjaxResult.success();
     }
 }

linkwe-chinacoal/src/main/resources/mapper/modules/bdshdb/customer/LocalAppUserMapper.xml

@@ -9,7 +9,7 @@
         SELECT
             lau.id, lau.name, lau.phone, lau.user_type as userType,
             lau.wechat_nickname as wechatNickname, lau.wechat_head_photo as wechatHeadPhoto,
-            loup.gender, loup.birthday_time AS birthdayTime, lau.is_formal as isFormal,lau.create_time as createTime,
+            loup.gender, loup.birthday_time AS birthdayTime, lau.user_status_type as userStatusType,lau.create_time as createTime,
             lau.open_id AS openId
         FROM local_app_user as lau
         LEFT JOIN local_ordinary_user_process loup ON lau.ordinary_user_id = loup.ordinary_user_id
@@ -24,6 +24,5 @@
                 AND lau.open_id is not null
             </if>
         </where>
-        limit 10
     </select>
 </mapper>

linkwe-chinacoal/src/main/resources/mapper/modules/jzgdb/customer/SysUserJzgMapper.xml

@@ -18,6 +18,5 @@
                 date_format(#{sysUserDto.startDate},'%Y-%m-%d') AND date_format(#{sysUserDto.endDate},'%Y-%m-%d')
             </if>
         </where>
-        limit 10
     </select>
 </mapper>

linkwe-service/src/main/java/com/linkwechat/mapper/WeCustomerUserMapper.java

@@ -15,31 +15,12 @@ import java.util.List;
 
 public interface WeCustomerUserMapper extends BaseMapper<WeCustomerUser> {
 
-    /**
-     * 分页获取微信客户id列表
-     *
-     * @param weCustomerUserQuery
-     * @param pageDomain
-     * @return
-     */
-    @DataScope(type = "2", value = @DataColumn(alias = "wcu", name = "create_by_id", userid = "user_id"))
-    List<String> findWeCustomerUserListIds(@Param("weCustomerUserList")WeCustomerUserQuery weCustomerUserQuery, @Param("pageDomain") PageDomain pageDomain);
 
     /**
      * 微信客户列表接口
      *
-     * @param ids
      * @return
      */
-    List<WeCustomerUserVo> findWeCustomerUserList(@Param("ids") List<String> ids);
-
+    List<WeCustomerUserVo> findWeCustomerUserList(@Param("weCustomerUserList") WeCustomerUserQuery weCustomerUserQuery);
 
-    /**
-     * 微信客户客户总数统计
-     *
-     * @param weCustomerUserQuery
-     * @return
-     */
-    @DataScope(type = "2", value = @DataColumn(alias = "wcu", name = "create_by_id", userid = "user_id"))
-    long countWeCustomerUserList(@Param("weCustomerUserList") WeCustomerUserQuery weCustomerUserQuery);
 }

linkwe-service/src/main/java/com/linkwechat/mapper/WeUserMapper.java

@@ -8,37 +8,17 @@ import com.linkwechat.domain.WeUser;
 import com.linkwechat.domain.customer.query.WeCuUserQuery;
 import com.linkwechat.domain.customer.vo.WeUserVo;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
 public interface WeUserMapper extends BaseMapper<WeUser> {
 
-    /**
-     * 分页获取同步用户id列表
-     *
-     * @param weUserQuery
-     * @param pageDomain
-     * @return
-     */
-    @DataScope(type = "2", value = @DataColumn(alias = "wur", name = "create_by_id", userid = "user_id"))
-    List<String> findWeUserListIds(@Param("weUserList") WeCuUserQuery weUserQuery, @Param("pageDomain") PageDomain pageDomain);
-
     /**
      * 同步用户列表接口
      *
-     * @param ids
+     * @param weCuUserQuery
      * @return
      */
-    List<WeUserVo> findWeUserList(@Param("ids") List<String> ids);
+    List<WeUserVo> findWeUserList(@Param("weUserList") WeCuUserQuery weCuUserQuery);
 
-
-    /**
-     * 客户总数统计
-     *
-     * @param weUserQuery
-     * @return
-     */
-    @DataScope(type = "2", value = @DataColumn(alias = "wur", name = "create_by_id", userid = "user_id"))
-    long countWeUserList(@Param("weUserList") WeCuUserQuery weUserQuery);
 }

linkwe-service/src/main/java/com/linkwechat/service/IWeCustomerUserService.java

@@ -17,15 +17,8 @@ public interface IWeCustomerUserService  extends IService<WeCustomerUser> {
      * @param weCustomerUserQuery
      * @return
      */
-    List<WeCustomerUserVo> findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery, PageDomain pageDomain);
+    List<WeCustomerUserVo> findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery);
 
-    /**
-     * 微信客户总数统计
-     *
-     * @param weCustomerUserQuery
-     * @return
-     */
-    long countWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery);
 
     /**
      * 微信客户详情
@@ -46,4 +39,6 @@ public interface IWeCustomerUserService  extends IService<WeCustomerUser> {
      * @param id
      */
     void unbindUser(String id);
+
+
 }

linkwe-service/src/main/java/com/linkwechat/service/IWeUserService.java

@@ -17,15 +17,7 @@ public interface IWeUserService extends IService<WeUser> {
      * @param weUserQuery
      * @return
      */
-    List<WeUserVo> findWeUserList(WeCuUserQuery weUserQuery, PageDomain pageDomain);
-
-    /**
-     * 同步用户总数统计
-     *
-     * @param weUserQuery
-     * @return
-     */
-    long countWeUserList(WeCuUserQuery weUserQuery);
+    List<WeUserVo> findWeUserList(WeCuUserQuery weUserQuery);
 
     /**
      * 分配/转出
@@ -41,4 +33,5 @@ public interface IWeUserService extends IService<WeUser> {
      * @return
      */
     WeUserDetailInfoVo findWeUserBaseInfo(String id);
+
 }

linkwe-service/src/main/java/com/linkwechat/service/impl/WeCustomerUserServiceImpl.java

@@ -34,23 +34,12 @@ public class WeCustomerUserServiceImpl extends ServiceImpl<WeCustomerUserMapper,
     private IWeUserService weUserService;
 
     @Override
-    public List<WeCustomerUserVo> findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery, PageDomain pageDomain) {
-
-        List<WeCustomerUserVo> weCustomerUserVos = new ArrayList<>();
-        List<String> ids = this.baseMapper.findWeCustomerUserListIds(weCustomerUserQuery, pageDomain);
-
-        if (CollectionUtil.isNotEmpty(ids)) {
-            weCustomerUserVos = this.baseMapper.findWeCustomerUserList(ids);
-        }
+    public List<WeCustomerUserVo> findWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery) {
 
+        List<WeCustomerUserVo> weCustomerUserVos = this.baseMapper.findWeCustomerUserList(weCustomerUserQuery);
         return weCustomerUserVos;
     }
 
-    @Override
-    public long countWeCustomerUserList(WeCustomerUserQuery weCustomerUserQuery) {
-        return this.baseMapper.countWeCustomerUserList(weCustomerUserQuery);
-    }
-
     @Override
     public WeCustomerUserDetailInfoVo findWeCustomerUserBaseInfo(String id) {
         WeCustomerUserDetailInfoVo weCustomerUserDetailInfoVo = new WeCustomerUserDetailInfoVo();

linkwe-service/src/main/java/com/linkwechat/service/impl/WeUserServiceImpl.java

@@ -21,23 +21,11 @@ public class WeUserServiceImpl extends ServiceImpl<WeUserMapper, WeUser> impleme
 
 
     @Override
-    public List<WeUserVo> findWeUserList(WeCuUserQuery weUserQuery, PageDomain pageDomain) {
-
-        List<WeUserVo> weUserVos = new ArrayList<>();
-        List<String> ids = this.baseMapper.findWeUserListIds(weUserQuery, pageDomain);
-
-        if (CollectionUtil.isNotEmpty(ids)) {
-            weUserVos = this.baseMapper.findWeUserList(ids);
-        }
-
+    public List<WeUserVo> findWeUserList(WeCuUserQuery weUserQuery) {
+        List<WeUserVo> weUserVos = this.baseMapper.findWeUserList(weUserQuery);
         return weUserVos;
     }
 
-    @Override
-    public long countWeUserList(WeCuUserQuery weUserQuery) {
-        return this.baseMapper.countWeUserList(weUserQuery);
-    }
-
     @Override
     public void transferOwner(Long id, Long userId) {
         WeUser weUser = this.baseMapper.selectById(id);

linkwe-service/src/main/resources/mapper/wecom/WeCustomerUserMapper.xml

@@ -4,70 +4,32 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.linkwechat.mapper.WeCustomerUserMapper">
 
-    <select id="findWeCustomerUserListIds" resultType="java.lang.String">
-        SELECT wcu.id FROM we_customer_user wcu
-        <where>
-            <if test="weCustomerUserList.wxOpenid != null">
-                AND wcu.wx_openid = #{weCustomerUserList.wxOpenid}
-            </if>
-            <if test="weCustomerUserList.userCode != null">
-                AND wcu.user_code = #{weCustomerUserList.userCode}
-            </if>
-            <if test="weCustomerUserList.wxNickname != null">
-                AND wcu.wx_nickname = #{weCustomerUserList.wxNickname}
-            </if>
-            <if test="weCustomerUserList.status != null">
-                AND wcu.status = #{weCustomerUserList.status}
-            </if>
-        </where>
-        ORDER BY wcu.create_time desc
-        <if test="pageDomain !=null">
-            <if test="pageDomain.pageNum !=null and pageDomain.pageSize !=null">
-                limit ${pageDomain.pageSize * (pageDomain.pageNum-1)}, #{pageDomain.pageSize}
-            </if>
-        </if>
-
-    </select>
-
-    <select id="countWeCustomerUserList" resultType="long">
+    <select id="findWeCustomerUserList" resultType="com.linkwechat.domain.customer.vo.WeCustomerUserVo">
         SELECT
-        count(0)
+        wcu.id,
+        wcu.user_code as userCode,
+        wcu.wx_phone as wxPhone,
+        wcu.wx_nickname as wxNickname,
+        wcu.wx_avatar as wxAvatar,
+        wcu.wx_openid as wxOpenid,
+        wcu.bind_time as bindTime,
+        wcu.create_time as createTime,
+        wcu.`status`
         FROM we_customer_user wcu
         <where>
-            <if test="weCustomerUserList.wxOpenid != null">
+            <if test="weCustomerUserList.wxOpenid != null and weCustomerUserList.wxOpenid !=  ''">
                 AND wcu.wx_openid = #{weCustomerUserList.wxOpenid}
             </if>
-            <if test="weCustomerUserList.userCode != null">
+            <if test="weCustomerUserList.userCode != null and weCustomerUserList.userCode != ''">
                 AND wcu.user_code = #{weCustomerUserList.userCode}
             </if>
-            <if test="weCustomerUserList.wxNickname != null">
+            <if test="weCustomerUserList.wxNickname != null and weCustomerUserList.wxNickname != ''">
                 AND wcu.wx_nickname = #{weCustomerUserList.wxNickname}
             </if>
             <if test="weCustomerUserList.status != null">
                 AND wcu.status = #{weCustomerUserList.status}
             </if>
         </where>
-
-    </select>
-
-
-    <select id="findWeCustomerUserList" resultType="com.linkwechat.domain.customer.vo.WeCustomerUserVo">
-        SELECT
-        wcu.id,
-        wcu.user_code as userCode,
-        wcu.wx_phone as wxPhone,
-        wcu.wx_nickname as wxNickname,
-        wcu.wx_avatar as wxAvatar,
-        wcu.wx_openid as wxOpenid,
-        wcu.bind_time as bindTime,
-        wcu.create_time as createTime,
-        wcu.`status`
-        FROM we_customer_user wcu
-        WHERE
-        wcu.id in
-        <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
         ORDER BY wcu.create_time desc
     </select>
 </mapper>

linkwe-service/src/main/resources/mapper/wecom/WeUserMapper.xml

@@ -3,43 +3,24 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.linkwechat.mapper.WeUserMapper">
-
-    <select id="findWeUserListIds" resultType="java.lang.String">
-        SELECT wur.id FROM we_user wur
-        <where>
-            <if test="weUserList.userCode != null and weUserList.userCode != ''">
-                AND wur.user_code=#{weUserList.userCode}
-            </if>
-            <if test="weUserList.name != null and weUserList.name != ''">
-                AND wur.name=#{weUserList.name}
-            </if>
-            <if test="weUserList.phone != null and weUserList.phone != ''">
-                AND wur.phone=#{weUserList.phone}
-            </if>
-
-            <if test="weUserList.source != null">
-                AND wur.source=#{weUserList.source}
-            </if>
-            <if test="weUserList.status != null">
-                AND wur.status=#{weUserList.status}
-            </if>
-            <if test="weUserList.deliveredStatus != null">
-                AND wur.delivered_status=#{weUserList.deliveredStatus}
-            </if>
-        </where>
-        ORDER BY wur.create_time desc
-        <if test="pageDomain !=null">
-            <if test="pageDomain.pageNum !=null and pageDomain.pageSize !=null">
-                limit ${pageDomain.pageSize * (pageDomain.pageNum-1)}, #{pageDomain.pageSize}
-            </if>
-        </if>
-
-    </select>
-
-    <select id="countWeUserList" resultType="long">
+    <select id="findWeUserList" resultType="com.linkwechat.domain.customer.vo.WeUserVo">
         SELECT
-        count(0)
-        FROM we_user wur
+        wur.id,
+        wur.user_code as userCode,
+        wur.name ,
+        wur.sex ,
+        wur.birthday,
+        wur.phone,
+        wur.source,
+        wur.status,
+        wur.delivered_status as deliveredStatus,
+        wur.type,
+        wur.owner_user_id as ownerUserId,
+        wur.register_time as registerTime,
+        wur.add_time as addTime,
+        wur.last_Interaction_time as lastInteractionTime
+        FROM
+            we_user wur
         <where>
             <if test="weUserList.userCode != null and weUserList.userCode != ''">
                 AND wur.user_code=#{weUserList.userCode}
@@ -61,33 +42,6 @@
                 AND wur.delivered_status=#{weUserList.deliveredStatus}
             </if>
         </where>
-
-    </select>
-
-
-    <select id="findWeUserList" resultType="com.linkwechat.domain.customer.vo.WeUserVo">
-        SELECT
-            wu.id,
-            wu.user_code as userCode,
-            wu.name ,
-            wu.sex ,
-            wu.birthday,
-            wu.phone,
-            wu.source,
-            wu.status,
-            wu.delivered_status as deliveredStatus,
-            wu.type,
-            wu.owner_user_id as ownerUserId,
-            wu.register_time as registerTime,
-            wu.add_time as addTime,
-            wu.last_Interaction_time as lastInteractionTime
-        FROM
-            we_user wu
-        WHERE
-            wu.id in
-            <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        ORDER BY wu.create_time desc
+        ORDER BY wur.create_time desc
     </select>
 </mapper>