新增修改活码

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

@@ -423,44 +423,48 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             return null;
         }
         String enterpriseId = hmQrcodeQDTO.getEnterpriseId();
-        //单人活码
+
         String clerkId = clerkIdList.get(0);
+        ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
+
+        if (clerkDTO != null) {
+            String name = hmQrcodeQDTO.getName();
+            if (StringUtils.isBlank(name)) {
+                hmQrcodeQDTO.setName(clerkDTO.getClerkName());
+            }
+        }
+
         if (hmType == 2) {
             //多人活码
             insertHmClerkRelation(enterpriseId, wxEnterpriseId, hmId, clerkIdList, addFlag);
         } else if (hmType == 1) {
+            //单人活码
             HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId);
             if (addFlag && hmQrcodeBO != null) {
                 logger.error("已经生成过活码,clerkId：{}", clerkId);
                 return null;
             }
-        }
-
-        hmQrcodeQDTO.setClerkId(clerkId);
-        ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
-        if (clerkDTO != null) {
-            String name = hmQrcodeQDTO.getName();
-            String clerkName = clerkDTO.getClerkName();
-            if (StringUtils.isBlank(name)) {
-                hmQrcodeQDTO.setName(clerkName);
-            }
-            hmQrcodeQDTO.setClerkName(clerkName);
-            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());
+            hmQrcodeQDTO.setClerkId(clerkId);
+            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) {
-            hmQrcodeQDTO.setStaffId(staffClerkRelationDTO.getStaffId());
-            TabHaobanStaff tabHaobanStaff = staffService.selectById(staffClerkRelationDTO.getStaffId());
-            if (tabHaobanStaff != null) {
-                hmQrcodeQDTO.setStaffName(tabHaobanStaff.getStaffName());
-                hmQrcodeQDTO.setWxUserId(tabHaobanStaff.getWxUserId());
+
+            StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
+            if (staffClerkRelationDTO != null) {
+                hmQrcodeQDTO.setStaffId(staffClerkRelationDTO.getStaffId());
+                TabHaobanStaff tabHaobanStaff = staffService.selectById(staffClerkRelationDTO.getStaffId());
+                if (tabHaobanStaff != null) {
+                    hmQrcodeQDTO.setStaffName(tabHaobanStaff.getStaffName());
+                    hmQrcodeQDTO.setWxUserId(tabHaobanStaff.getWxUserId());
+                }
             }
         }
         return clerkIdList;