Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

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

@@ -99,10 +99,10 @@ public class ClerkApiServiceImpl implements ClerkApiService {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店下导购手机号重复");
             }
         }
-        if (clerkService.isRepeatByClerkName(clerkDTO.getStoreInfoId(), clerkDTO.getClerkName(),
-                clerkDTO.getClerkId())) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店下导购名称重复");
-        }
+//        if (clerkService.isRepeatByClerkName(clerkDTO.getStoreInfoId(), clerkDTO.getClerkName(),
+//                clerkDTO.getClerkId())) {
+//            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店下导购名称重复");
+//        }
 
         if (clerkDTO.getPositionId() == null) {
             clerkDTO.setPositionId(com.gic.store.constant.Constants.CLERK_POSITION_ID);

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

@@ -581,7 +581,8 @@ public class StoreApiServiceImpl implements StoreApiService {
             sortJson = QueryConditionAssemblyUtil.createSortNodeByLocation(StoreESFieldsEnum.LOCATION.getField(), QueryConditionAssemblyUtil.SORT_RULE_ASC,
                     Double.valueOf(storeSearchDTO.getLatitude()), Double.valueOf(storeSearchDTO.getLongitude()));
         }else {
-            sortJson = QueryConditionAssemblyUtil.createSortNode(StoreESFieldsEnum.UPDATETIME.getField(), QueryConditionAssemblyUtil.SORT_RULE_DESC);
+            sortJson = QueryConditionAssemblyUtil.createSortNode(StoreESFieldsEnum.STATUS.getField(), QueryConditionAssemblyUtil.SORT_RULE_ASC);
+//            sortJson = QueryConditionAssemblyUtil.createSortNode(StoreESFieldsEnum.UPDATETIME.getField(), QueryConditionAssemblyUtil.SORT_RULE_DESC);
         }
         ServiceResponse<ESResponseQueryBatchDTO> response = this.queryStoreFromES(enterpriseJson, pageNum, pageSize, sortJson, returnFileds);
         if (response.isSuccess() && response.getResult() != null) {
@@ -1133,7 +1134,12 @@ public class StoreApiServiceImpl implements StoreApiService {
         if(response.isSuccess() && response.getResult() != null){
             List<StoreDTO> result = response.getResult().getResult();
             if(CollectionUtils.isNotEmpty(result)){
-                return ServiceResponse.success(result.get(0));
+                StoreDTO storeDTO = result.get(0);
+                if (CollectionUtils.isNotEmpty(storeDTO.getLocation())) {
+                    storeDTO.setLongitude(storeDTO.getLocation().get(0).toString());
+                    storeDTO.setLatitude(storeDTO.getLocation().get(1).toString());
+                }
+                return ServiceResponse.success(storeDTO);
             }
         }
         return ServiceResponse.success();