Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -3,7 +3,6 @@ package com.gic.haoban.manage.service.service.out.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
-import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.RightService;
@@ -16,6 +15,7 @@ import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.UuidUtil;
@@ -215,20 +215,28 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
             resp.setMessage("总部已经被设置不能存在多个总部！");
             return resp;
         }
-
+        String enterpriseId = detailDTO.getEnterpriseId();
+        String wxEnterpriseId = detailDTO.getWxEnterpriseId();
         //校验关联已经企业绑定
-        TabHaobanWxEnterpriseRelated tab = wxEnterpriseRelatedMapper.findOneByEIdAndWxEid(detailDTO.getEnterpriseId(), detailDTO.getWxEnterpriseId());
+        TabHaobanWxEnterpriseRelated tab = wxEnterpriseRelatedMapper.findOneByEIdAndWxEid(enterpriseId, wxEnterpriseId);
         if (tab != null && (!tab.getWxEnterpriseRelatedId().equals(detailDTO.getWxEnterpriseRelatedId()))) {
             logger.info("该企业已经被绑定过");
             resp.setCode(2);
             resp.setMessage("该企业已经被绑定过！");
             return resp;
         }
-
+        EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
+        if (enterpriseDTO == null) {
+            logger.info("该企业为空：{}",enterpriseId);
+            resp.setCode(2);
+            resp.setMessage("该企业为空");
+            return resp;
+        }
         if (tab == null) {
             logger.info("该gicEnterpriseId已经绑定过了:{}", JSONObject.toJSONString(detailDTO));
             //保存企业关联关系
             tab = EntityUtil.changeEntityNew(TabHaobanWxEnterpriseRelated.class, detailDTO);
+            tab.setEnterpriseName(enterpriseDTO.getEnterpriseName());
             tab.setStatusFlag(1);
             tab.setRangeType(1);
             tab.setVersion("3.0");
@@ -245,18 +253,9 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         }
 
         //保存门店范围
-        storeRangeService.saveStoreRange(detailDTO.getRelations(), detailDTO.getEnterpriseId(), detailDTO.getWxEnterpriseId());
-        /*//超级管理员新增
-        TabHaobanStaff sStaff = staffMapper.selectSuperByWxEnterpriseId(detailDTO.getWxEnterpriseId());
-        if (sStaff == null) {
-            TabHaobanStaff staff = new TabHaobanStaff();
-            staff.setStaffName("超级管理员");
-            staff.setWxEnterpriseId(detailDTO.getWxEnterpriseId());
-            staff.setSuperManagerFlag(1);
-            staffService.add(staff);
-        }*/
-        EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(detailDTO.getEnterpriseId());
-        List<EnterpriseWxaRelationDTO> relationDTOList = authorizeService.queryList(detailDTO.getEnterpriseId());
+        storeRangeService.saveStoreRange(detailDTO.getRelations(), enterpriseId, wxEnterpriseId);
+
+        List<EnterpriseWxaRelationDTO> relationDTOList = authorizeService.queryList(enterpriseId);
         if (CollectionUtils.isEmpty(relationDTOList)) {
             logger.info("relationDTOList is null");
             return resp;
@@ -266,30 +265,30 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
             logger.info("relationDTO is null");
             return resp;
         }
-        TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSettingNoMedia(detailDTO.getWxEnterpriseId(), detailDTO.getEnterpriseId());
+        TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSettingNoMedia(wxEnterpriseId, enterpriseId);
         if (null == miniprogramSetting) {
             miniprogramSetting = new TabMiniprogramSetting();
         }
-        miniprogramSetting.setWxEnterpriseId(detailDTO.getWxEnterpriseId());
+        miniprogramSetting.setWxEnterpriseId(wxEnterpriseId);
         miniprogramSetting.setAppId(relationDTO.getWxaAppkey());
         miniprogramSetting.setImageUrl(enterpriseDTO.getMallMiniprogramLogoUrl());
         miniprogramSetting.setMiniprogramName(relationDTO.getAuthName());
-        miniprogramSetting.setEnterpriseId(detailDTO.getEnterpriseId());
+        miniprogramSetting.setEnterpriseId(enterpriseId);
         miniprogramSetting.setTitle(relationDTO.getAuthName());
 
         miniprogramSettingService.saveMiniprogramSetting(miniprogramSetting);
         //刷新门店信息
-        ServiceResponse response = this.flushBindStoreByEnterpriseId(detailDTO.getEnterpriseId(), detailDTO.getWxEnterpriseId(), detailDTO.getStaffId(), ChannelCodeEnum.RIGHT_CHANGE_UNBIND.getCode());
+        ServiceResponse response = this.flushBindStoreByEnterpriseId(enterpriseId, wxEnterpriseId, detailDTO.getStaffId(), ChannelCodeEnum.RIGHT_CHANGE_UNBIND.getCode());
         logger.info("刷新返回信息：{}", JSONObject.toJSONString(response));
         //如果已经在刷新了 需要放入队列再刷新
         if (response.getCode() == 2) {
-            logger.info("放入队列刷新：{}", detailDTO.getEnterpriseId());
+            logger.info("放入队列刷新：{}", enterpriseId);
             FlushStoreMqDTO flushStoreMqDTO = new FlushStoreMqDTO();
-            flushStoreMqDTO.setEnterpriseId(detailDTO.getEnterpriseId());
+            flushStoreMqDTO.setEnterpriseId(enterpriseId);
             flushStoreMqDTO.setOptStaffId(detailDTO.getStaffId());
-            flushStoreMqDTO.setWxEnterpriseId(detailDTO.getWxEnterpriseId());
+            flushStoreMqDTO.setWxEnterpriseId(wxEnterpriseId);
             flushStoreMqDTO.setChannalCode(ChannelCodeEnum.ADMIN_UNBIND.getCode());
-            this.flushBindStoreToDelayMq(detailDTO.getEnterpriseId(), flushStoreMqDTO);
+            this.flushBindStoreToDelayMq(enterpriseId, flushStoreMqDTO);
         }
         return resp;
     }