Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-03-12 908ce43ff21c2068ef5148b0a417423c8ed9eae5

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java

@@ -10,15 +10,17 @@
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ext.ERPSyncService;
@@ -28,7 +30,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -93,7 +94,7 @@
        request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode());
        request.setOaId("atwl");
        request.setOpenId(user.getOpenid());
        request.setPlatformName("安泰物流园区");
        request.setPlatformName(user.getRealname());
        BaseResponse<Integer>  response = HKService.userOpenidSave(request);
        if(response!=null &&response.getCode().equals(HKConstants.RESPONSE_SUCCEE) && Constants.equalsInteger(response.getData(),Constants.ONE)){
            user.setOpenidHkStatus(Constants.ONE);
@@ -104,6 +105,22 @@
        }
        user.setOpenidHkDate(new Date());
        systemUserMapper.updateById(user);
        return  "成功";
    }
    @Override
    public    String delHkUserOpenid(UserOpenidSaveRequest param){
        UserOpenidSaveRequest request = new UserOpenidSaveRequest();
        request.setUserName(param.getUserName());
        request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode());
        BaseResponse response = HKService.userOpenidDel(request);
        if(response!=null &&response.getCode().equals(HKConstants.RESPONSE_SUCCEE)){
        }
        request.setUserName(null);
        request.setOpenId(param.getOpenId());
        request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode());
        response = HKService.userOpenidDel(request);
        if(response!=null &&response.getCode().equals(HKConstants.RESPONSE_SUCCEE)){
        }
        return  "成功";
    }

@@ -731,7 +748,7 @@
            //处理新增数据
            BaseResponse result =  HKService.editUser(addHkModel);
            if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
                if(StringUtils.isNotBlank(c.getFaceImg()) && Constants.equalsInteger(c.getFaceStatus(),Constants.ZERO)){
                if(StringUtils.isNotBlank(c.getFaceImg()) && !Constants.equalsInteger(c.getFaceStatus(),Constants.TWO)){
                    //如果有人脸照片，处理人脸照片同步
                    String faceid = dealMemberFace(c,path);
                    if(StringUtils.isBlank(faceid)){