fix:增加是否为代开发字段

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SecretTypeEnum.java

@@ -4,14 +4,15 @@ package com.gic.haoban.manage.api.enums;
  * Created by hua on 2020/6/3.
  */
 public enum SecretTypeEnum {
-    CONTACT_CUSTOMER(1,"顾客联系"),
-    CONTACT_SECRET(2,"通讯录"),
-    HAOBAN_HELP(3,"好办助手"),
-    MEMBER_WAPP(4,"会员小程序");
+    CONTACT_CUSTOMER(1, "顾客联系"),
+    CONTACT_SECRET(2, "通讯录"),
+    HAOBAN_HELP(3, "好办助手"),
+    MEMBER_WAPP(4, "会员小程序"),
+    CUSTOMIZED_APP(5, "自建代开发");
     private int val;
     private String name;
 
-    SecretTypeEnum(int val,String name) {
+    SecretTypeEnum(int val, String name) {
         this.val = val;
         this.name = name;
     }

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

@@ -15,7 +15,6 @@ import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.enterprise.api.dto.StoreDTO;
-import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.app.customer.dto.ChildDTO;
 import com.gic.haoban.app.customer.dto.CustomerDTO;
@@ -29,7 +28,9 @@ import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
+import com.gic.haoban.manage.api.service.MaterialApiService;
+import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMapper;
@@ -42,10 +43,8 @@ import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.util.EmojiFilterUtil;
 import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.MemberOpenCardBusinessService;
-import com.gic.member.api.service.MemberService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
-import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
 import com.gic.wechat.api.dto.qywx.*;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -63,7 +62,10 @@ import java.util.stream.Collectors;
 
 @Service
 public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedApiService {
+
     private static final Logger log = LogManager.getLogger(MemberUnionidRelatedApiServiceImpl.class);
+    private static final String SELF_APP = "selfSuiteId";
+
     @Autowired
     private MemberUnionRelatedService memberUnionRelatedService;
     @Autowired
@@ -71,32 +73,19 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     @Autowired
     private QywxUserApiService qywxUserApiService;
     @Autowired
-    private com.gic.enterprise.api.service.StoreGroupService gicDepartmentService;
-    @Autowired
-    private MemberService memberService;
-    @Autowired
     private WxEnterpriseRelatedService wxEnterpriseRelatedService;
     @Autowired
     private WxEnterpriseService wxEnterpriseService;
 
-    private static final String SELF_APP = "selfSuiteId";
-
     @Autowired
     private MemberOpenCardBusinessService memberOpenCardBusinessService;
 
     @Autowired
     private ClerkService clerkService;
     @Autowired
-    private DepartmentApiService departmentApiService;
-
-    @Autowired
     private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
 
     @Autowired
-    private StaffDepartmentRelatedService staffDepartmentRelatedService;
-    @Autowired
-    private ESDataDynamicOperationApiService eSDataDynamicOperationApiService;
-    @Autowired
     private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
     @Autowired
     private StoreService storeService;
@@ -116,10 +105,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private ExternalClerkRelatedService externalClerkRelatedService;
     @Autowired
     private PowerService powerService;
-
-    @Autowired
-    private EnterpriseService enterpriseService;
-
     @Autowired
     private MiniprogramSettingService miniprogramSettingService;
 
@@ -132,9 +117,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     @Autowired
     private CustomerApiService customerApiService;
 
-    @Autowired
-    private QywxTagApiService qywxTagApiService;
-
     @Override
     public void dealQywxExternalUser(String params) {
         log.info("回调：{}", params);
@@ -202,7 +184,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
             memberInfoListParamsDTO.setFilterList(filterList);
 
-
             boolean flag = customerApiService.checkMemberRangeByMemberId(params, memberInfoListParamsDTO);
             MemberStoreDTO dto = new MemberStoreDTO();
             dto.setMemberId(tab.getMemberId());

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

@@ -348,7 +348,7 @@ public class WxEnterpriseController extends WebBaseController {
     @IgnoreLogin
     @RequestMapping("wx-enterprise-wx-secret-set")
     public HaobanResponse wxEnterpriseWxSecretSet(String wxSecretKey) {
-        if (org.apache.commons.lang3.StringUtils.isAnyBlank(wxSecretKey)) {
+        if (StringUtils.isAnyBlank(wxSecretKey)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         String wxEnterpriseId = "";
@@ -386,7 +386,7 @@ public class WxEnterpriseController extends WebBaseController {
     @IgnoreLogin
     @RequestMapping("wx-enterprise-member-secret-set")
     public HaobanResponse wxEnterpriseMemberSecretSet(String memberSecret, String enterpriseId, String secretName) {
-        if (org.apache.commons.lang3.StringUtils.isAnyBlank(memberSecret)) {
+        if (StringUtils.isAnyBlank(memberSecret)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         String wxEnterpriseId = "";
@@ -437,10 +437,10 @@ public class WxEnterpriseController extends WebBaseController {
     @IgnoreLogin
     @RequestMapping("wx-enterprise-haoban-secret-set")
     public HaobanResponse wxEnterpriseHaobanSecretSet(String contactSecret, String memberSecret) {
-        if (!StringUtils.isEmpty(memberSecret)) {
+        if (StringUtils.isNotBlank(memberSecret)) {
             contactSecret = memberSecret;
         }
-        if (org.apache.commons.lang3.StringUtils.isAnyBlank(contactSecret)) {
+        if (StringUtils.isAnyBlank(contactSecret)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         String wxEnterpriseId = "";
@@ -507,7 +507,7 @@ public class WxEnterpriseController extends WebBaseController {
     @IgnoreLogin
     @RequestMapping("member-secret-del")
     public HaobanResponse delMemberSecret(String secretId) {
-        if (org.apache.commons.lang3.StringUtils.isAnyBlank(secretId)) {
+        if (StringUtils.isAnyBlank(secretId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
 
@@ -597,7 +597,7 @@ public class WxEnterpriseController extends WebBaseController {
     @IgnoreLogin
     @RequestMapping("wx-enterprise-bind-detail")
     public HaobanResponse wxEnterpriseBindDetail(String enterpriseId) {
-        if (org.apache.commons.lang3.StringUtils.isAnyBlank(enterpriseId)) {
+        if (StringUtils.isAnyBlank(enterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();