Merge remote-tracking branch 'origin/master'

jiangping

2024-07-22 b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233

 server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java

@@ -182,31 +182,52 @@
        request.setPageSize(100);
        request.setTiming(Constants.ONE+"");
        request.setCreationDate(date);
        this.syncData(request);
    }

    @Override
    @Transactional
    public void syncByPhone(String phone) {
        CrmDaogouBindListRequest request = new CrmDaogouBindListRequest();
        request.setPage(0);
        request.setPageSize(100);
        request.setTiming(Constants.ZERO+"");
        request.setKeyWords(phone);
        this.syncData(request);
    }

    public void syncData(CrmDaogouBindListRequest request){
        boolean hasMore = true;
        int currentNum = 0;
        Date cdate = new Date();
        List<CRMDaogouBindListResponse> allList = new ArrayList<>();
        while (hasMore){
            try {
                request.setPage(request.getPage()+1);
                currentNum += currentNum;
                CRMBaseResponse<List<CRMDaogouBindListResponse>> response = zbomCRMService.getDaogouBindList(request);
                if(response==null
                        || !StringUtils.equals(response.getCode(), CRMConstants.CODE_SUCCESS)
                        || response.getData() ==null
                        || response.getData().size() ==0){
                    hasMore = false;
                }else{
                    allList.addAll(response.getData());
                    currentNum += response.getTotal();
                }
                if(currentNum >= response.getTotal()){
                    hasMore = false;
                }
                dealSyncDataBiz(cdate,response.getData());
            }catch (Exception e){
               hasMore = false;
                hasMore = false;
            }
        }
        dealSyncDataBiz(cdate,allList);
    }

    private void dealSyncDataBiz(Date date,List<CRMDaogouBindListResponse> list) {
        if(list ==null && list.size()==0){
            return;
        }
        List<CustomerUser> addList = new ArrayList<>();
        List<String> phoneList = new ArrayList<>();
        for(CRMDaogouBindListResponse data : list){
@@ -234,7 +255,10 @@
            model.setOrgName(data.getOrgName());
            model.setCustomerName(data.getCustomerName());
            model.setCustomerPhone(data.getCustomerPhone());
            model.setUsername(data.getUseName());
            model.setUsername(data.getUserName());
            model.setSource(Constants.ONE);
            model.setZtStatus(Constants.ONE);
            model.setZtInfo("crm同步");
            model.setIamUserId(data.getUserId());
            model.setUserId(user== null?null:user.getId());
            model.setCreationDate(data.getCreationDate());
@@ -246,6 +270,7 @@
             */
            customerUserMapper.update(null,new UpdateWrapper<CustomerUser>().lambda()
                    .in(CustomerUser::getPhone,phoneList)
                    .eq(CustomerUser::getZtStatus,Constants.ONE)
                    .eq(CustomerUser::getIsdeleted,Constants.ZERO)
                    .set(CustomerUser::getIsdeleted,Constants.ONE)
            );