Merge remote-tracking branch 'origin/developer' into developer

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -93,6 +93,9 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         if (!clerkDTO.getClerkCode().matches(com.gic.store.constant.Constants.CLERK_CODE_REGEX)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "导购代码仅支持数字和英文字符");
         }
+        if (clerkPositionService.getByClerkPositionId(clerkDTO.getPositionId()) == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店下导购角色不存在");
+        }
 
         try {
 
@@ -184,6 +187,10 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         if (clerkService.isRepeatByPhoneNumber(clerkDTO.getStoreInfoId(), clerkDTO.getPhoneNumber(), clerkDTO.getClerkId(), clerkDTO.getNationcode())) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店下导购手机号重复");
         }
+        if (clerkPositionService.getByClerkPositionId(clerkDTO.getPositionId()) == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店下导购角色不存在");
+        }
+
         return ServiceResponse.success();
     }
 

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java

@@ -188,7 +188,8 @@ public class ClerkController extends DownloadUtils {
                         List<ClerkDTO> clerkList = clerkStoreListDTO.getClerkList();
                         for (ClerkDTO clerkDTO : clerkList) {
                             QrcodeContent qrcodeContent = new QrcodeContent();
-                            qrcodeContent.setTitle(clerkDTO.getClerkName());
+                            qrcodeContent.setTitle(clerkDTO.getClerkName() + "_" + clerkDTO.getClerkCode());
+                            qrcodeContent.setTitleTmp(clerkStoreListDTO.getStoreName());
                             qrcodeContent.setCustomParams(clerkDTO.getClerkId()+"");
                             clerkDTOS.add(qrcodeContent);
                         }

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -578,6 +578,7 @@ public class StoreController extends DownloadUtils {
                                 QrcodeContent qrcodeContent = new QrcodeContent();
                                 qrcodeContent.setCustomParams(dto.getStoreInfoId()+"");
                                 qrcodeContent.setTitle(dto.getStoreName());
+                                qrcodeContent.setTitleTmp(dto.getStoreName());
                                 list.add(qrcodeContent);
                             }
                             return list;