Merge branch 'bugfix/2023-03-01' into 'master'

Bugfix/2023 03 01

See merge request !970

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

 package com.gic.haoban.manage.web.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.authcenter.commons.dto.AuthcenterUserDetails;
@@ -480,7 +481,7 @@ public class EnterpriseController extends WebBaseController {
         wxEnterpriseDTO.setStoreTotal(departmentApiService.totalStoreCountByEnterpriseId(wxEnterpriseId));
         return resultResponse(HaoBanErrCode.ERR_1, wxEnterpriseDTO);
     }
-    
+
     //gic企业列表
     @RequestMapping("enterprise-search")
     public HaobanResponse gicEnterpriseDetail(String enterpriseId) {
@@ -493,14 +494,25 @@ public class EnterpriseController extends WebBaseController {
             vo.setEnterpriseId(enterpriseId);
             vo.setEnterpriseName(enterprise.getEnterpriseName());
             vo.setBrandName(enterprise.getBrandName());
-        }
-        ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
-        if (clerk != null) {
-            vo.setClerkId(clerk.getClerkId());
-            vo.setClerkCode(clerk.getClerkCode());
-            vo.setClerkName(clerk.getClerkName());
-            vo.setPhoneNumber(clerk.getPhoneNumber());
-            vo.setNationCode(clerk.getNationcode());
+            ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
+            if (clerk != null) {
+                vo.setClerkId(clerk.getClerkId());
+                vo.setClerkCode(clerk.getClerkCode());
+                vo.setClerkName(clerk.getClerkName());
+                vo.setPhoneNumber(clerk.getPhoneNumber());
+                vo.setNationCode(clerk.getNationcode());
+            }
+        }else {
+            //enterpriseId 参数可以是企业id，也可以是企业名称
+            //按名称去查
+            EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(enterpriseId);
+            vo = EntityUtil.changeEntityByJSON(EnterpriseSearchVO.class, dto);
+            if (vo != null) {
+                EnterpriseDTO enterprise1 = enterpriseService.getEnterpriseById(vo.getEnterpriseId());
+                if (enterprise1 != null) {
+                    vo.setBrandName(enterprise1.getBrandName());
+                }
+            }
         }
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }

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

 package com.gic.haoban.manage.web.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -225,14 +226,25 @@ public class WxEnterpriseController extends WebBaseController {
             vo.setEnterpriseId(enterpriseId);
             vo.setEnterpriseName(enterprise.getEnterpriseName());
             vo.setBrandName(enterprise.getBrandName());
-        }
-        ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
-        if (clerk != null) {
-            vo.setClerkId(clerk.getClerkId());
-            vo.setClerkCode(clerk.getClerkCode());
-            vo.setClerkName(clerk.getClerkName());
-            vo.setPhoneNumber(clerk.getPhoneNumber());
-            vo.setNationCode(clerk.getNationcode());
+            ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
+            if (clerk != null) {
+                vo.setClerkId(clerk.getClerkId());
+                vo.setClerkCode(clerk.getClerkCode());
+                vo.setClerkName(clerk.getClerkName());
+                vo.setPhoneNumber(clerk.getPhoneNumber());
+                vo.setNationCode(clerk.getNationcode());
+            }
+        }else {
+            //enterpriseId 参数可以是企业id，也可以是企业名称
+            //按名称去查
+            EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(enterpriseId);
+            vo = EntityUtil.changeEntityByJSON(EnterpriseSearchVO.class, dto);
+            if (vo != null) {
+                EnterpriseDTO enterprise1 = enterpriseService.getEnterpriseById(vo.getEnterpriseId());
+                if (enterprise1 != null) {
+                    vo.setBrandName(enterprise1.getBrandName());
+                }
+            }
         }
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }

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

@@ -50,6 +50,10 @@ public class MaidianLogController extends WebBaseController {
                 com.gic.clerk.api.dto.ClerkDTO clerkDTO = clerkService.getClerkByClerkCode(store.getEnterpriseId(), maidianLogDTO.getClerkCode());
                 maidianLogDTO.setEnterpriseId(store.getEnterpriseId());
                 if (clerkDTO != null) {
+                    //导购变更门店
+                    if (!clerkDTO.getStoreId().equals(maidianLogDTO.getStoreId())){
+                        continue;
+                    }
                     maidianLogDTO.setClerkId(clerkDTO.getClerkId());
                 }
             }