Merge branch 'developer' into 'master'

导购信息长度限制

See merge request !40

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

@@ -207,10 +207,13 @@ public class StoreApiServiceImpl implements StoreApiService {
         }
 
         // 保存店长 如果店长保存失败 回滚数据
-        ServiceResponse<Void> serviceResponse = saveClerkLeader(storeDTO);
-        if (!serviceResponse.isSuccess()) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return ServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        ServiceResponse<ClerkDTO> headClerk = this.clerkApiService.getHeadClerk(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
+        if(headClerk.isSuccess() && headClerk.getResult() == null){
+            ServiceResponse<Void> serviceResponse = saveClerkLeader(storeDTO);
+            if (!serviceResponse.isSuccess()) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return ServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+            }
         }
 
         // 自定义属性