Merge branch 'develop'

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

@@ -82,6 +82,10 @@ public class UserPointsServiceImpl implements UserPointsService {
     @Override
     public ResultBody change(ChangeUserPointVO changePoint) {
         UserPointsDO userPointsDO = userPointsDao.selectUserPoints(changePoint.getUserAccountId());
+        //如果邀请人没有绑定手机号 是没有积分的
+        if(userPointsDO == null) {
+            return ResultBody.success();
+        }
         userPointsDO.setTotalPoints(userPointsDO.getTotalPoints() + changePoint.getChangePoint());
         // 修改用户积分
         userPointsDao.updatePoints(userPointsDO);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/LocationUtils.java

@@ -6,6 +6,8 @@ package com.mmc.iuav.user.util;
  * @explain 高德地图对应经纬度计算距离
  */
 public class LocationUtils {
+
+
     // 地球赤道半径
     private static double EARTH_RADIUS = 6378.137;
 

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: 1976db65260dc9cb7999ba6eda7fad3e4f16ee15
+  newTag: 8e5d222f6c6a90b1782f79aa5664f0a2307c7410