From 1110e717afecf1cc78950a5f054bfa0c1b159ae1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 17:20:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 99113a8..b277c83 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -5,6 +5,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
@@ -18,6 +19,8 @@
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
@@ -25,6 +28,7 @@
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;
@@ -61,9 +65,47 @@
@Autowired
private ERPSyncService erpSyncService;
@Autowired
+ private SystemUserMapper systemUserMapper;
+ @Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private DataSyncConfig dataSyncConfig;
+
+ /**
+ * 缁戝畾娴峰悍鐢ㄦ埛openId
+ * {
+ * "openId" : "ovmre6R7w-vEQCHg52-UN2mV_abI",
+ * "userName" : "13856591439",
+ * "appKey" : "wx173e6caf5abc718a",
+ * "oaId" : "atwl",
+ * "platformName" : "瀹夋嘲鐗╂祦鍥尯",
+ *
+ * }
+ */
+ @Override
+ public String syncHkUserOpenid(Integer id){
+ SystemUser user = systemUserMapper.selectById(id);
+ if(user == null ||StringUtils.isBlank(user.getOpenid()) ||Constants.equalsInteger(user.getOpenidHkStatus(),Constants.ONE)){
+ return null;
+ }
+ UserOpenidSaveRequest request = new UserOpenidSaveRequest();
+ request.setUserName(user.getUsername());
+ request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode());
+ request.setOaId("atwl");
+ request.setOpenId(user.getOpenid());
+ 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);
+ user.setOpenidHkInfo("缁戝畾鎴愬姛");
+ }else{
+ user.setOpenidHkStatus(Constants.TWO);
+ user.setOpenidHkInfo(response!=null?StringUtils.defaultString(response.getMsg(),"銆愭湭鐭ュけ璐ュ師鍥犮��"):"缁戝畾澶辫触");
+ }
+ user.setOpenidHkDate(new Date());
+ systemUserMapper.updateById(user);
+ return "鎴愬姛";
+ }
/**
* 鍚屾娴峰悍缁勭粐淇℃伅,鏍规嵁erp鍚屾缁勭粐缁撴灉锛屽畾鏃舵鏌ラ渶瑕佷笅鍙戝埌娴峰悍鐨勭粍缁囦俊鎭�
@@ -148,7 +190,7 @@
if(addList!=null &&addList.size()>0){
//澶勭悊鏂板
BaseResponse<OrgOrUserAddResponse> result = HKService.addBatchOrg(addList);
- if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ if(result !=null && StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE)){
OrgOrUserAddResponse data = result.getData();
if(data.getSuccesses()!=null && data.getSuccesses().size()>0){
//澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵��
@@ -284,7 +326,7 @@
return;
}
Date date = new Date();
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
for(Member c : list){
dealMemberInfoBiz(c,date,path) ;
--
Gitblit v1.9.3