Merge branch 'feature/xgh/2502基础零散' into 'master'

Feature/xgh/2502基础零散

See merge request !2498

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/OpenStaffImportDTO.java

@@ -13,6 +13,15 @@ public class OpenStaffImportDTO implements Serializable {
     private String loginName;
     private String realName;
     private String clerkCode ;
+    private String sourceUrl ;
+
+    public String getSourceUrl() {
+        return sourceUrl;
+    }
+
+    public void setSourceUrl(String sourceUrl) {
+        this.sourceUrl = sourceUrl;
+    }
 
     public String getLoginName() {
         return loginName;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java

@@ -129,6 +129,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
      */
     @Override
     public boolean delBind(String oldClerkId, String optStaffId, int channelCode, String newClerkId, String wxEnterpriseId) {
+        boolean isChangeStore = (StringUtils.isNotBlank(oldClerkId) && StringUtils.isNotBlank(newClerkId)) ;
         boolean changeClerkFlag = StringUtils.isNotEmpty(newClerkId) ;
         logger.info("导购解绑/换导购={},oldClerkId={},optStaffId={},newClerkId={},channelCode={}",changeClerkFlag,oldClerkId,optStaffId,newClerkId,channelCode);
         if(StringUtils.isNotEmpty(optStaffId) && !"-1".equals(optStaffId)) {
@@ -218,6 +219,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         if(StringUtils.isNotBlank(newClerkId)) {
             List<String> memberIdList = this.externalClerkRelatedMapper.listByClerkId(staffId, oldClerkId) ;
             this.externalClerkRelatedService.updateClerkInfo(staffId , oldClerkId , newClerkId) ;
+            logger.info("是否导购更换门店={}",isChangeStore);
             if(CollectionUtils.isNotEmpty(memberIdList)) {
                 for(String memberId : memberIdList) {
                     logger.info("会员={}",memberId);
@@ -227,6 +229,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                     map.put("enterpriseId", enterpriseId) ;
                     map.put("memberId", memberId) ;
                     map.put("clerkId", newClerkId) ;
+                    map.put("source","1") ;
+                    if(!isChangeStore) {
+                        map.put("source","2") ;
+                    }
                     dto.setParams(map);
                     this.haobanCommonMQApiService.putCommonMessage(dto);
                 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HaobanCommonMQApiServiceImpl.java

@@ -136,7 +136,12 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
             String memberId = map.get("memberId") ;
             enterpriseId = map.get("enterpriseId") ;
             String clerkId = map.get("clerkId") ;
-            this.memberOpenCardBusinessService.memberClerkByQywx(enterpriseId, memberId, clerkId);
+            String source = map.get("source") ;
+            if(null != source) {
+                this.memberOpenCardBusinessService.memberClerkByQywx(enterpriseId, memberId, clerkId , Integer.valueOf(source));
+            }else {
+                this.memberOpenCardBusinessService.memberClerkByQywx(enterpriseId, memberId, clerkId);
+            }
             break ;
         case 4:
             Long planId = Long.valueOf(map.get("planId")) ;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/OpenStaffImportTaskApiServiceImpl.java

@@ -133,6 +133,7 @@ public class OpenStaffImportTaskApiServiceImpl extends AbstractTaskCenterManageO
         initTaskQo.setTaskModelName("好办企微托管");
         initTaskQo.setTaskName("导入托管账号");
         initTaskQo.setTaskContent("批量导入托管账号" + dto.getClerkCodeList().size() + "个");
+        initTaskQo.setSourceUrl(dto.getSourceUrl());
         try {
             TaskAllocationSdkClient instance = TaskAllocationSdkClient.getInstance();
             String taskId = instance.initTask(initTaskQo);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenController.java

@@ -35,10 +35,15 @@ import com.gic.haoban.manage.web.vo.open.OpenClerkVO;
 import com.gic.haoban.manage.web.vo.open.OpenQwAccountInfoVO;
 import com.gic.haoban.manage.web.vo.open.OpenStaffVO;
 import com.gic.qcloud.BucketNameEnum;
+import com.gic.thirdparty.cloudfile.CloudFileUtil;
+import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
+import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
+import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
 import com.gic.web.common.download.DownloadTask;
 import com.gic.web.common.download.DownloadTaskUtil;
 import com.gic.web.common.download.constants.TaskTypeEnum;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -49,6 +54,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -470,6 +476,17 @@ public class QywxOpenController {
         if (CollectionUtils.isEmpty(clerkCodeList)) {
             return RestResponse.failure("9999", "导入文件无数据");
         }
+
+        File excelFile = File.createTempFile("tmp", null);
+        FileUtils.copyInputStreamToFile(file.getInputStream(), excelFile);
+        EnterpriseDTO en = this.enterpriseService.getEnterpriseById(enterpriseId) ;
+        String fileName = file.getOriginalFilename();
+        CloudFileInfo uploadInfo = CloudFileUtil.uploadTempFile(excelFile,  fileName.substring(fileName.lastIndexOf(".") + 1), CloudFileTypeEnum.FILE, en.getFactoryCode() , CloudFileBusinessOptEnum.TASK_CENTER, 365L) ;
+        log.info("上传返回的实体信息为:{}",uploadInfo);
+        String sourceUrl = null ;
+        if (uploadInfo != null) {
+            sourceUrl = uploadInfo.getOrgFileUrl() ;
+        }
         OpenStaffImportDTO qdto = new OpenStaffImportDTO() ;
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
@@ -477,8 +494,10 @@ public class QywxOpenController {
         qdto.setClerkCodeList(clerkCodeList);
         qdto.setLoginName(login.getClerkName());
         qdto.setRealName(login.getClerkName());
+        qdto.setSourceUrl(sourceUrl);
         ServiceResponse<String> serviceResponse = this.openStaffImportTaskApiService.createTask(qdto);
         log.info("批量导入导购任务结果 result:{}", JSON.toJSONString(serviceResponse));
+        excelFile.delete();
         if (serviceResponse.isSuccess()) {
             return RestResponse.successResult(serviceResponse.getResult());
         }