导购设置

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

@@ -15,6 +15,8 @@ public interface WxEnterpriseRelatedApiService {
 	 */
 	List<String> findAllEnterpriseId();
 	
+	public EnterpriseDetailDTO getByEnterpriseId(String wxEnterpriseId, String enterpriseId) ;
+	
 	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId);
 	
 	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId , String phoneNumber);
@@ -23,9 +25,6 @@ public interface WxEnterpriseRelatedApiService {
 
 	boolean enterpriseUseNew(String enterpriseId);
 
-    @Deprecated
-    EnterpriseDetailDTO getByEnterpriseId(String enterpriseId);
-
 	List<EnterpriseDetailDTO> queryAllHasGicEnterpriseId();
 	
 	List<EnterpriseDetailDTO> listEnterpriseByEnterpriseIds(List<String> enterpriseIds);
@@ -142,6 +141,8 @@ public interface WxEnterpriseRelatedApiService {
 	 * @return
 	 */
 	public boolean setClerkEditFlag(String wxEnterprieseRelatedId, int clerkEditFlag);
+	
+	public void saveClerkEditFlag(String wxEnterpriseId , String enterpriseId , int value) ;
 
 	/**
 	 * 判断企业是否是总部 true是 false 不是

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseRelatedMapper.java

@@ -51,4 +51,6 @@ public interface WxEnterpriseRelatedMapper {
      * @return : 返回好办关联的所有企业id
      */
     List<String> findAllEnterpriseId();
+
+    void saveClerkEditFlag(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseId")String enterpriseId, @Param("clerkEditFlag")int value);
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -9,7 +27,12 @@ import com.gic.clerk.api.service.RightService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.commons.util.ToolUtil;
-import com.gic.enterprise.api.dto.*;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
+import com.gic.enterprise.api.dto.EnterpriseWxaRelationDTO;
+import com.gic.enterprise.api.dto.PowerStoreGroupDTO;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.dto.StoreGroupDTO;
+import com.gic.enterprise.api.dto.StoreSimpleDTO;
 import com.gic.enterprise.api.service.AuthorizeService;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreGroupService;
@@ -18,31 +41,32 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.UuidUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.BindStoreInfoDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.FlushStoreMqDTO;
+import com.gic.haoban.manage.api.dto.StoreOrGroupInfoDTO;
+import com.gic.haoban.manage.api.dto.StoreRangeInfoDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseRelationDetailDTO;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
-import com.gic.haoban.manage.service.entity.*;
-import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.entity.TabHaobanStaff;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
+import com.gic.haoban.manage.service.entity.TabMiniprogramSetting;
+import com.gic.haoban.manage.service.entity.TabStoreRange;
+import com.gic.haoban.manage.service.entity.TabStoreRelation;
+import com.gic.haoban.manage.service.service.DepartmentService;
+import com.gic.haoban.manage.service.service.MiniprogramSettingService;
+import com.gic.haoban.manage.service.service.StaffService;
+import com.gic.haoban.manage.service.service.StoreRangeService;
+import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
 import com.google.common.collect.Sets;
 
-import cn.hutool.core.collection.CollectionUtil;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 @Service
 public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApiService {
     private static final Logger logger = LogManager.getLogger(WxEnterpriseRelatedApiServiceImpl.class);
@@ -94,6 +118,13 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     }
     
     @Override
+    public EnterpriseDetailDTO getByEnterpriseId(String wxEnterpriseId, String enterpriseId) {
+        TabHaobanWxEnterpriseRelated entity = wxEnterpriseRelatedService.getByEnterpriseId(wxEnterpriseId, enterpriseId);
+        EnterpriseDetailDTO dto = EntityUtil.changeEntityByJSON(EnterpriseDetailDTO.class, entity);
+        return dto ;
+    }
+    
+    @Override
     public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId, String phoneNumber) {
         logger.info("listEnterpriseByWxEnterpriseId,wxeid={},phone={}",wxEnterpriseId,phoneNumber);
         List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
@@ -140,21 +171,6 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     }
 
     @Override
-    public EnterpriseDetailDTO getByEnterpriseId(String enterpriseId) {
-        List<TabHaobanWxEnterprise> wxEnterprises = wxEnterpriseRelatedService.listByEnterpriseId(enterpriseId);
-        if (CollectionUtils.isEmpty(wxEnterprises)) {
-            return null;
-        }
-        if (wxEnterprises.size() > 1) {
-            logger.info("改企业关联多个企业，需要带上wxEnterpriseId");
-            return null;
-        }
-        TabHaobanWxEnterprise tab = wxEnterprises.get(0);
-        EnterpriseDetailDTO detail = EntityUtil.changeEntityByJSON(EnterpriseDetailDTO.class, tab);
-        return detail;
-    }
-
-    @Override
     public List<EnterpriseDetailDTO> queryAllHasGicEnterpriseId() {
         List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.queryAllHasGicEnterpriseId();
         List<EnterpriseDetailDTO> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
@@ -632,6 +648,11 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         wxEnterpriseRelatedService.setClerkEdit(wxEnterprieseRelatedId, clerkEditFlag);
         return true;
     }
+    
+    @Override
+    public void saveClerkEditFlag(String wxEnterpriseId, String enterpriseId, int value) {
+        this.wxEnterpriseRelatedMapper.saveClerkEditFlag(wxEnterpriseId,enterpriseId,value) ;
+    }
 
     @Override
     public boolean checkIsGeneral(String wxEnterpriseId, String enterpriseId) {

haoban-manage3-service/src/main/resources/mapper/WxEnterpriseRelatedMapper.xml

@@ -235,4 +235,9 @@
     from tab_haoban_wx_enterprise_related
     where status_flag = 1
   </select>
+  
+  <update id="saveClerkEditFlag">
+		update tab_haoban_wx_enterprise_related set clerk_edit_flag = #{clerkEditFlag} 	
+		where  wx_enterprise_id = #{wxEnterpriseId} and  enterprise_id = #{enterpriseId}
+  </update>
 </mapper>
\ No newline at end of file

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

@@ -26,6 +26,7 @@ import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.ApplicationDTO;
 import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.QywxCorpInfoDTO;
 import com.gic.haoban.manage.api.dto.SecretSettingDTO;
 import com.gic.haoban.manage.api.dto.WxApplicationDTO;
@@ -37,8 +38,10 @@ import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.WxApplicationApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.ClerkEditInfoVO;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -58,6 +61,8 @@ public class ApplicationController extends WebBaseController {
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
     @Autowired
+    private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
+    @Autowired
     private Config config;
     @Autowired
     private DepartmentApiService departmentApiService;
@@ -121,11 +126,21 @@ public class ApplicationController extends WebBaseController {
         }
         map.put("open", openList);
         map.put("close", closeList);
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser() ;
+        if(null != loginUser) {
+            String enterpriseId = loginUser.getEnterpriseId() ;
+            EnterpriseDetailDTO dto = this.wxEnterpriseRelatedApiService.getByEnterpriseId(wxEnterpriseId, enterpriseId) ;
+            Integer clerkEditInfo = dto.getClerkEditFlag() ;
+            map.put("clerkEditInfo", ClerkEditInfoVO.info(clerkEditInfo)) ;
+        }
         return resultResponse(HaoBanErrCode.ERR_1, map);
     }
 
     @RequestMapping("open-or-close")
-    public HaobanResponse applicationList(String wxEnterpriseId, String dataJson) {
+    public HaobanResponse applicationList(String dataJson , ClerkEditInfoVO clerkEditInfo) {
+        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = login.getWxEnterpriseId();
+        String enterpriseId = login.getEnterpriseId();
         log.info("dataJson={}",dataJson);
         if(StringUtils.isBlank(dataJson)) {
             return resultResponse(HaoBanErrCode.ERR_2); 
@@ -134,6 +149,7 @@ public class ApplicationController extends WebBaseController {
         if(jsonArr.size()<=0) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
+        this.wxEnterpriseRelatedApiService.saveClerkEditFlag(wxEnterpriseId, enterpriseId, ClerkEditInfoVO.getValue(clerkEditInfo));
         applicationSettingApiService.saveSetting(wxEnterpriseId,jsonArr);
         return resultResponse(HaoBanErrCode.ERR_1);
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/ClerkEditInfoVO.java

+package com.gic.haoban.manage.web.vo;
+
+import com.alibaba.fastjson.JSON;
+
+public class ClerkEditInfoVO {
+
+    private int editClerkFlag ;  // 1
+    private int addClerkFlag ;   // 2
+    private int delClerkFlag ;   // 4
+    public int getEditClerkFlag() {
+        return editClerkFlag;
+    }
+    public int getAddClerkFlag() {
+        return addClerkFlag;
+    }
+    public int getDelClerkFlag() {
+        return delClerkFlag;
+    }
+    public void setEditClerkFlag(int editClerkFlag) {
+        this.editClerkFlag = editClerkFlag;
+    }
+    public void setAddClerkFlag(int addClerkFlag) {
+        this.addClerkFlag = addClerkFlag;
+    }
+    public void setDelClerkFlag(int delClerkFlag) {
+        this.delClerkFlag = delClerkFlag;
+    }
+    
+    public static ClerkEditInfoVO info(int v) {
+        ClerkEditInfoVO vo = new ClerkEditInfoVO();
+        vo.setEditClerkFlag(v & 1);
+        vo.setAddClerkFlag((v & 2) >> 1);
+        vo.setDelClerkFlag((v & 4) >> 2);
+        return vo ;
+    }
+    
+    public static int getValue(ClerkEditInfoVO vo) {
+        int editClerkFlag = vo.getEditClerkFlag() ;
+        int addClerkFlag = vo.getAddClerkFlag() << 1;
+        int delClerkFlag = vo.getDelClerkFlag() << 2;
+        return editClerkFlag | addClerkFlag | delClerkFlag ;
+    }
+    
+    
+    public static void main(String[] args) {
+        ClerkEditInfoVO vo = new ClerkEditInfoVO();
+        vo.setAddClerkFlag(1);
+        vo.setDelClerkFlag(0);
+        vo.setEditClerkFlag(0);
+        System.out.println(getValue(vo));
+        
+        System.out.println(JSON.toJSONString(info(getValue(vo))));
+        
+    }
+}