fix:活码

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

@@ -334,12 +334,6 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
      */
     private List<String> setStoreClerk(HmQrcodeQDTO hmQrcodeQDTO, String wxEnterpriseId, Long hmId, Integer hmType) {
         List<String> clerkIdList = hmQrcodeQDTO.getClerkIdList();
-        String storeId = hmQrcodeQDTO.getStoreId();
-        StoreDTO storeDTO = storeService.getStore(storeId);
-        if (storeDTO != null) {
-            storeDTO.setStoreCode(storeDTO.getStoreCode());
-            storeDTO.setStoreName(storeDTO.getStoreName());
-        }
 
         if (hmType == 2) {
             //多人活码
@@ -357,6 +351,13 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             if (clerkDTO != null) {
                 hmQrcodeQDTO.setClerkName(clerkDTO.getClerkName());
                 hmQrcodeQDTO.setClerkCode(clerkDTO.getClerkCode());
+                String storeId = clerkDTO.getStoreId();
+                hmQrcodeQDTO.setStoreId(storeId);
+                StoreDTO storeDTO = storeService.getStore(storeId);
+                if (storeDTO != null) {
+                    hmQrcodeQDTO.setStoreCode(storeDTO.getStoreCode());
+                    hmQrcodeQDTO.setStoreName(storeDTO.getStoreName());
+                }
             }
             StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
             if (staffClerkRelationDTO != null) {
@@ -389,12 +390,16 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             hmClerkRelationQDTO.setWxUserId(clerkRelationDTO.getWxUserId());
             hmClerkRelationQDTO.setWxEnterpriseId(wxEnterpriseId);
             hmClerkRelationQDTO.setEnterpriseId(hmQrcodeQDTO.getEnterpriseId());
-            hmClerkRelationQDTO.setStoreId(hmQrcodeQDTO.getStoreId());
-            hmClerkRelationQDTO.setStoreName(hmQrcodeQDTO.getStoreName());
-            hmClerkRelationQDTO.setStoreCode(hmQrcodeQDTO.getStoreCode());
             hmClerkRelationQDTO.setClerkId(clerkId);
             ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
             if (clerkDTO != null) {
+                String storeId = clerkDTO.getStoreId();
+                hmClerkRelationQDTO.setStoreId(storeId);
+                StoreDTO storeDTO = storeService.getStore(storeId);
+                if (storeDTO != null) {
+                    hmClerkRelationQDTO.setStoreCode(storeDTO.getStoreCode());
+                    hmClerkRelationQDTO.setStoreName(storeDTO.getStoreName());
+                }
                 hmClerkRelationQDTO.setClerkName(clerkDTO.getClerkName());
                 hmClerkRelationQDTO.setClerkCode(clerkDTO.getClerkCode());
             }