Skip to content

H
haoban-manage3.0
Commit 92daf5dc by 墨竹
Options

Merge remote-tracking branch 'origin/developer' into developer 

# Conflicts:
#	haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java
parents a8a6fa0e a621d903
Showing with 35 additions and 194 deletions
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java
package com.gic.haoban.manage.web.controller.test; package com.gic.haoban.manage.web.controller.test;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.GICMQClientUtil; import com.gic.commons.util.GICMQClientUtil;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.StaffDTO; import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
import com.gic.haoban.manage.api.enums.QuartzEnum; import com.gic.haoban.manage.api.enums.QuartzEnum;
import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum; import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
import com.gic.haoban.manage.api.service.*; import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.TestApiService;
import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService; import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
import com.gic.haoban.manage.web.controller.WebBaseController; import com.gic.haoban.manage.web.controller.WebBaseController;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
...@@ -17,17 +31,6 @@ import com.gic.mq.sdk.GicMQClient; ...@@ -17,17 +31,6 @@ import com.gic.mq.sdk.GicMQClient;
import com.gic.sharing.core.service.api.service.MqApiService; import com.gic.sharing.core.service.api.service.MqApiService;
import com.task.allocation.qo.AllocationTaskQo; import com.task.allocation.qo.AllocationTaskQo;
import com.task.allocation.qo.TaskAllocationComputed; import com.task.allocation.qo.TaskAllocationComputed;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.stream.Collectors;
import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Created 2018/12/17. * Created 2018/12/17.
...@@ -57,8 +60,6 @@ public class TestController extends WebBaseController { ...@@ -57,8 +60,6 @@ public class TestController extends WebBaseController {
private HaobanQywxFeeApiService haobanQywxFeeApiService; private HaobanQywxFeeApiService haobanQywxFeeApiService;
@Autowired @Autowired
private ExternalClerkRelatedApiService externalClerkRelatedApiService ; private ExternalClerkRelatedApiService externalClerkRelatedApiService ;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
/** /**
* 创建定时器 * 创建定时器
...@@ -154,16 +155,10 @@ public class TestController extends WebBaseController { ...@@ -154,16 +155,10 @@ public class TestController extends WebBaseController {
continue; continue;
} }
String wxEnterpriseId = staff.getWxEnterpriseId(); String wxEnterpriseId = staff.getWxEnterpriseId();
String wxUserId = staff.getWxUserId();
WxEnterpriseQwDTO qwInfo = wxEnterpriseApiService.getQwInfo(wxEnterpriseId);
if (qwInfo.needOpenUserId3th()) {
wxUserId = staff.getWxOpenUseId();
}
String taskName = "刷新企业微信好友（" + staff.getStaffName() + "）"; String taskName = "刷新企业微信好友（" + staff.getStaffName() + "）";
String taskId = dealSyncOperationApiService.createWxFriendTaskSingle(staff.getWxEnterpriseId(), taskName, staffId, staff.getStaffName(), SyncTaskTypeEnum.FRIEND_SINGLE.getType()); String taskId = dealSyncOperationApiService.createWxFriendTaskSingle(staff.getWxEnterpriseId(), taskName, staffId, staff.getStaffName(), SyncTaskTypeEnum.FRIEND_SINGLE.getType());
if (StringUtils.isNotBlank(taskId)) { if (StringUtils.isNotBlank(taskId)) {
dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, wxUserId, staffId, wxEnterpriseId); dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staffId, staffId, wxEnterpriseId);
} }
} }
return resultResponse(HaoBanErrCode.ERR_1); return resultResponse(HaoBanErrCode.ERR_1);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/HandoverExternalMapper.java
...@@ -9,21 +9,6 @@ import java.util.List; ...@@ -9,21 +9,6 @@ import java.util.List;
@Mapper @Mapper
public interface HandoverExternalMapper { public interface HandoverExternalMapper {
/**
*/
int deleteByPrimaryKey(String handoverExternalId);
/**
*/
int insert(TabHandoverExternal record);
/**
*/
int insertSelective(TabHandoverExternal record);
/**
*/
TabHandoverExternal selectByPrimaryKey(String handoverExternalId);
/** /**
*/ */
...@@ -31,10 +16,6 @@ public interface HandoverExternalMapper { ...@@ -31,10 +16,6 @@ public interface HandoverExternalMapper {
/** /**
*/ */
int updateByPrimaryKey(TabHandoverExternal record);
/**
*/
int insertBatch(@Param("list") List<TabHandoverExternal> list); int insertBatch(@Param("list") List<TabHandoverExternal> list);
/** /**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ClerkMainStoreRelatedServiceImpl.java
...@@ -72,7 +72,7 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe ...@@ -72,7 +72,7 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
logger.info("刷新好友失败或正在刷新：{},{}", staffId, storeId); logger.info("刷新好友失败或正在刷新：{},{}", staffId, storeId);
return; return;
} }
dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staff.getWxUserId(), staffId, wxEnterpriseId); dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staffId, staffId, wxEnterpriseId);
logger.info("任务id：{}", taskId); logger.info("任务id：{}", taskId);
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
...@@ -836,6 +836,9 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -836,6 +836,9 @@ public class StaffApiServiceImpl implements StaffApiService {
//获取微信信息 //获取微信信息
String wxUserId = staff.getWxUserId(); String wxUserId = staff.getWxUserId();
if(qwDTO.needOpenUserIdDk()) {
wxUserId = staff.getWxOpenUseId() ;
}
UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId); UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId);
if (null == user) { if (null == user) {
logger.info("企业微信用户不存在:wxEnterpriseId:{}:wxUserId:{}", wxEnterpriseId, wxUserId); logger.info("企业微信用户不存在:wxEnterpriseId:{}:wxUserId:{}", wxEnterpriseId, wxUserId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java
...@@ -373,7 +373,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService { ...@@ -373,7 +373,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
remarkMap.put("dthmKey", dthmKey); remarkMap.put("dthmKey", dthmKey);
if (null != dthmKey) { if (null != dthmKey) {
WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ; WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, qwDTO.getThirdCorpid(), retDTO); ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, qwDTO, retDTO);
if (!addResp.isSuccess()) { if (!addResp.isSuccess()) {
remarkMap.put("sm", "创建动态活码失败,取单人活码"); remarkMap.put("sm", "创建动态活码失败,取单人活码");
if (StringUtils.isBlank(hm.getWxQrcode())) { if (StringUtils.isBlank(hm.getWxQrcode())) {
...@@ -425,7 +425,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService { ...@@ -425,7 +425,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
} }
// 创建活码 // 创建活码
private ServiceResponse<String> addQrcode(HmQrcodeBO hm, String key, String corpid, HmLinkWxaDTO retDTO) { private ServiceResponse<String> addQrcode(HmQrcodeBO hm, String key, WxEnterpriseQwDTO qwDTO, HmLinkWxaDTO retDTO) {
String limitQrcode = this.limitIp(hm); String limitQrcode = this.limitIp(hm);
if (StringUtils.isNotEmpty(limitQrcode)) { if (StringUtils.isNotEmpty(limitQrcode)) {
return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "超限制数"); return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "超限制数");
...@@ -439,11 +439,15 @@ public class HmLinkApiServiceImpl implements HmLinkApiService { ...@@ -439,11 +439,15 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
paramsDTO.setState("DT" + key); paramsDTO.setState("DT" + key);
TabHaobanStaff tabHaobanStaff = staffService.selectById(hm.getStaffId()); TabHaobanStaff tabHaobanStaff = staffService.selectById(hm.getStaffId());
if (tabHaobanStaff != null) { if (tabHaobanStaff != null) {
paramsDTO.setUser(Arrays.asList(tabHaobanStaff.getWxUserId())); if(qwDTO.needOpenUserId3th()) {
paramsDTO.setUser(Arrays.asList(tabHaobanStaff.getWxOpenUseId()));
}else {
paramsDTO.setUser(Arrays.asList(tabHaobanStaff.getWxUserId()));
}
} }
QywxExternalcontactResultDTO wxResp = qywxUserApiService.addContactWay(corpid, config.getWxSuiteid(), QywxExternalcontactResultDTO wxResp = qywxUserApiService.addContactWay(qwDTO.getThirdCorpid(), config.getWxSuiteid(),
paramsDTO); paramsDTO);
log.info("创建动态活码参数corpid={},app={},param={},返回={}", corpid, config.getWxSuiteid(), JSON.toJSONString(paramsDTO), log.info("创建动态活码参数corpid={},app={},param={},返回={}", qwDTO.getThirdCorpid(), config.getWxSuiteid(), JSON.toJSONString(paramsDTO),
JSON.toJSONString(wxResp)); JSON.toJSONString(wxResp));
if (null != wxResp && 0 == wxResp.getErrcode()) { if (null != wxResp && 0 == wxResp.getErrcode()) {
retDTO.setHmQrcode(wxResp.getQr_code()); retDTO.setHmQrcode(wxResp.getQr_code());
...@@ -452,7 +456,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService { ...@@ -452,7 +456,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
qo.setWxConfigId(wxResp.getConfig_id()); qo.setWxConfigId(wxResp.getConfig_id());
qo.setWxQrcode(wxResp.getQr_code()); qo.setWxQrcode(wxResp.getQr_code());
qo.setRelationId(key); qo.setRelationId(key);
qo.setCorpid(corpid); qo.setCorpid(qwDTO.getThirdCorpid());
this.hmQrcodeTempService.save(qo); this.hmQrcodeTempService.save(qo);
return ServiceResponse.success(wxResp.getQr_code()); return ServiceResponse.success(wxResp.getQr_code());
} }
......
haoban-manage3-service/src/main/resources/mapper/HandoverExternalMapper.xml
...@@ -30,133 +30,7 @@ ...@@ -30,133 +30,7 @@
haoban_friend_flag, external_head_url, status_flag, handover_transfer_id, takeover_time, haoban_friend_flag, external_head_url, status_flag, handover_transfer_id, takeover_time,
transfer_status, transfer_time, create_time, update_time transfer_status, transfer_time, create_time, update_time
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_handover_external
where handover_external_id = #{handoverExternalId,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from tab_haoban_handover_external
where handover_external_id = #{handoverExternalId,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHandoverExternal">
insert into tab_haoban_handover_external (handover_external_id, wx_enterprise_id,
staff_id, user_id, external_user_id,
external_user_name,relation_id, haoban_friend_flag, external_head_url,
status_flag, handover_transfer_id, takeover_time,
transfer_status, transfer_time, create_time,
update_time)
values (#{handoverExternalId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR},
#{staffId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{externalUserId,jdbcType=VARCHAR},
#{externalUserName,jdbcType=VARCHAR},#{relationId}, #{haobanFriendFlag,jdbcType=INTEGER}, #{externalHeadUrl,jdbcType=VARCHAR},
#{statusFlag,jdbcType=INTEGER}, #{handoverTransferId,jdbcType=VARCHAR}, #{takeoverTime,jdbcType=TIMESTAMP},
#{transferStatus}, #{transferTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHandoverExternal">
insert into tab_haoban_handover_external
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="handoverExternalId != null">
handover_external_id,
</if>
<if test="wxEnterpriseId != null">
wx_enterprise_id,
</if>
<if test="staffId != null">
staff_id,
</if>
<if test="userId != null">
user_id,
</if>
<if test="externalUserId != null">
external_user_id,
</if>
<if test="externalUserName != null">
external_user_name,
</if>
<if test="relationId != null">
relation_id,
</if>
<if test="haobanFriendFlag != null">
haoban_friend_flag,
</if>
<if test="externalHeadUrl != null">
external_head_url,
</if>
<if test="statusFlag != null">
status_flag,
</if>
<if test="handoverTransferId != null">
handover_transfer_id,
</if>
<if test="takeoverTime != null">
takeover_time,
</if>
<if test="transferStatus != null">
transfer_status,
</if>
<if test="transferTime != null">
transfer_time,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="handoverExternalId != null">
#{handoverExternalId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="staffId != null">
#{staffId,jdbcType=VARCHAR},
</if>
<if test="userId != null">
#{userId,jdbcType=VARCHAR},
</if>
<if test="externalUserId != null">
#{externalUserId,jdbcType=VARCHAR},
</if>
<if test="externalUserName != null">
#{externalUserName,jdbcType=VARCHAR},
</if>
<if test="relationId != null">
#{relationId,jdbcType=VARCHAR},
</if>
<if test="haobanFriendFlag != null">
#{haobanFriendFlag,jdbcType=INTEGER},
</if>
<if test="externalHeadUrl != null">
#{externalHeadUrl,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER},
</if>
<if test="handoverTransferId != null">
#{handoverTransferId,jdbcType=VARCHAR},
</if>
<if test="takeoverTime != null">
#{takeoverTime,jdbcType=TIMESTAMP},
</if>
<if test="transferStatus != null">
#{transferStatus},
</if>
<if test="transferTime != null">
#{transferTime,jdbcType=TIMESTAMP},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHandoverExternal"> <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHandoverExternal">
update tab_haoban_handover_external update tab_haoban_handover_external
<set> <set>
...@@ -208,25 +82,6 @@ ...@@ -208,25 +82,6 @@
</set> </set>
where handover_external_id = #{handoverExternalId,jdbcType=VARCHAR} where handover_external_id = #{handoverExternalId,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHandoverExternal">
update tab_haoban_handover_external
set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
staff_id = #{staffId,jdbcType=VARCHAR},
user_id = #{userId,jdbcType=VARCHAR},
external_user_id = #{externalUserId,jdbcType=VARCHAR},
external_user_name = #{externalUserName,jdbcType=VARCHAR},
relation_id = #{relationId,jdbcType=VARCHAR},
haoban_friend_flag = #{haobanFriendFlag,jdbcType=INTEGER},
external_head_url = #{externalHeadUrl,jdbcType=VARCHAR},
status_flag = #{statusFlag,jdbcType=INTEGER},
handover_transfer_id = #{handoverTransferId,jdbcType=VARCHAR},
takeover_time = #{takeoverTime,jdbcType=TIMESTAMP},
transfer_status = #{transferStatus},
transfer_time = #{transferTime,jdbcType=TIMESTAMP},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where handover_external_id = #{handoverExternalId,jdbcType=VARCHAR}
</update>
<insert id="insertBatch"> <insert id="insertBatch">
insert into tab_haoban_handover_external (handover_external_id, wx_enterprise_id, insert into tab_haoban_handover_external (handover_external_id, wx_enterprise_id,
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
...@@ -1223,6 +1223,9 @@ public class ClerkController extends WebBaseController { ...@@ -1223,6 +1223,9 @@ public class ClerkController extends WebBaseController {
return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_400002.getMsg()); return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_400002.getMsg());
} }
String wxUserId = staffDTO.getWxUserId(); String wxUserId = staffDTO.getWxUserId();
if(qwDTO.needOpenUserId3th()) {
wxUserId = staffDTO.getWxOpenUseId() ;
}
String openid = qywxUserApiService.getSelfOpenIdByUserId(qwDTO.getThirdCorpid(), config.getWxSuiteid(), wxUserId); String openid = qywxUserApiService.getSelfOpenIdByUserId(qwDTO.getThirdCorpid(), config.getWxSuiteid(), wxUserId);
if (StringUtils.isBlank(openid)) { if (StringUtils.isBlank(openid)) {
int code = HaoBanErrCode.ERR_600003.getCode(); int code = HaoBanErrCode.ERR_600003.getCode();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment