From 8ead63412bbda132ba9404583c1704121dfbcbaf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 10 十二月 2024 20:16:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 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 4c8ffca..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
@@ -19,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;
@@ -26,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;
@@ -62,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鍚屾缁勭粐缁撴灉锛屽畾鏃舵鏌ラ渶瑕佷笅鍙戝埌娴峰悍鐨勭粍缁囦俊鎭�
@@ -285,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