Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -320,7 +320,7 @@ public class CooperationServiceImpl implements CooperationService {
         }
         List<CompanyInfoVO> list = cooperationDao.listCompanyInfoByCoopId(coopId, lon, lat, (pageNo - 1) * pageSize, pageSize)
                 .stream().map(CompanyInfoDO::buildCompanyInfoVO).collect(Collectors.toList());
-        this.computerDistance(list, lon, lat);
+        // this.computerDistance(list, lon, lat);
         return PageResult.buildPage(pageNo, pageSize, count, list);
     }
 

csm-service/cms-service-user/src/main/resources/mapper/CooperationDao.xml

@@ -453,7 +453,8 @@
                ci.score,
                ci.brand_name,
                ci.brand_logo,
-               cbu.back_user_account_id
+               cbu.back_user_account_id,
+               round(st_distance_sphere(point(ci.lon, ci.lat),point(#{lon}, #{lat}))/1000, 2) AS distance
         FROM user_apply_tag uat
                  INNER JOIN cooperation_tag ct ON uat.cooperation_tag_id = ct.id
                  INNER JOIN company_member cm ON cm.user_account_id = uat.user_account_id
@@ -461,6 +462,7 @@
                  INNER JOIN company_back_user cbu ON cbu.company_info_id = ci.id
         WHERE ct.id = #{coopId}
           and uat.is_deleted = 0 and uat.apply_status = 1 and ci.is_deleted = 0
+          ORDER BY distance ASC
             LIMIT #{pageNo}, #{pageSize}
     </select>
 </mapper>

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 1315a5a06bf60cdc4c78a1493648d24d27a93f65
+  newTag: af55c66e9935fdc316c1f338ca46fe45bc16a77f