Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/WxLoginVO.java

@@ -28,4 +28,7 @@ public class WxLoginVO implements Serializable {
     private Integer fromPort;
     @ApiModelProperty(value = "用户来源：0自然流，1海报，2抖音，3公众号，4社群，5招投标，默认0", example = "0")
     private Integer source;
+
+    @ApiModelProperty(value = "邀请人user_account_id")
+    private Integer rcdUserId;
 }

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

@@ -9,14 +9,22 @@ import com.mmc.iuav.user.auth.AuthHandler;
 import com.mmc.iuav.user.auth.PwdUtil;
 import com.mmc.iuav.user.client.PayClient;
 import com.mmc.iuav.user.constant.WxConstant;
+import com.mmc.iuav.user.controller.userpoints.config.NumberOfUserPoints;
+import com.mmc.iuav.user.controller.userpoints.config.UserPointsEnum;
 import com.mmc.iuav.user.dao.CompanyAuthDao;
 import com.mmc.iuav.user.dao.RealNameAuthDao;
 import com.mmc.iuav.user.dao.RoleDao;
+import com.mmc.iuav.user.dao.UserServiceDao;
+import com.mmc.iuav.user.dao.userpoints.UserPointsDao;
+import com.mmc.iuav.user.dao.userpoints.UserPointsDetailsDao;
 import com.mmc.iuav.user.entity.*;
+import com.mmc.iuav.user.entity.userpoints.UserPointsDO;
+import com.mmc.iuav.user.entity.userpoints.UserPointsDetails;
 import com.mmc.iuav.user.enums.UserAccountStatus;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.LoginUserQO;
 import com.mmc.iuav.user.model.vo.*;
+import com.mmc.iuav.user.model.vo.userpoints.UserPointsVO;
 import com.mmc.iuav.user.service.*;
 import com.mmc.iuav.user.service.wallet.PayWalletService;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +47,14 @@ import java.util.concurrent.TimeUnit;
 public class AuthServiceImpl implements AuthService {
 
     @Autowired
+    private UserServiceDao userServiceDao;
+    @Autowired
+    private ActivityService activityService;
+    @Autowired
+    private UserPointsDao userPointsDao;
+    @Autowired
+    private UserPointsDetailsDao userPointsDetailsDao;
+    @Autowired
     private WxService wxService;
 
     @Autowired
@@ -99,6 +115,7 @@ public class AuthServiceImpl implements AuthService {
         //数据库查询用户信息
         UserAccountVO userAccountVO = userAccountService.getUserAccountInfoByUnionId(unionId);
         Integer companyAuthStatus = 0;
+        Boolean isNewPilot = true;
         if (userAccountVO == null) {
             UserAccountDO userAccountDO = new UserAccountDO();
             userAccountDO.setUnionId(unionId);
@@ -120,10 +137,42 @@ public class AuthServiceImpl implements AuthService {
         } else {
             CompanyAuthDO companyAuthDO = companyAuthDao.getCompanyAuth(userAccountVO.getId());
             companyAuthStatus = companyAuthDO == null ? 0 : 1;
+            isNewPilot = false;
         }
         AppUserSucVO appUserSucVO = authHandler.addAppLoginCache(userAccountVO);
         appUserSucVO.setAuthStatus(companyAuthStatus);
         appUserSucVO.setSessionKey(sessionKey);
+
+        //判断是不是新用户只有新用户才会执行添加积分代码
+        if(!isNewPilot) {
+            return ResultBody.success(appUserSucVO);
+        }
+
+        Integer id = appUserSucVO.getUserAccountId();
+        Integer rcdUserId = wxLoginVO.getRcdUserId();
+        Integer countUser = userServiceDao.getCountUser(rcdUserId);
+
+        if (countUser != null && countUser !=0) {
+//        if (rcdUserId != null) {
+            UserRcdDO userRcd = new UserRcdDO();
+            userRcd.setUserAccountId(id);
+            userRcd.setRcdUserId(rcdUserId);
+            userServiceDao.insertUserRcd(userRcd);
+        }
+
+        /**
+         * 积分
+         */
+        extracted(id);
+        RealNameAuthDO realNameAuthByUId = realNameAuthDao.getRealNameAuthByUId(id);
+        if (realNameAuthByUId != null && realNameAuthByUId.getCheckStatus() == 1) {
+            realNameextracted(id);
+        }
+        // 奖励邀请人
+        if (rcdUserId != null) {
+            activityService.participateActivity(0, rcdUserId, id);
+        }
+
         return ResultBody.success(appUserSucVO);
     }
 
@@ -210,4 +259,45 @@ public class AuthServiceImpl implements AuthService {
         stringRedisTemplate.delete(randomLoginCode);
         return ResultBody.success(loginSuccessDTO);
     }
+
+
+    private void extracted(Integer id) {
+        UserPointsVO userPointsVO = new UserPointsVO(id, NumberOfUserPoints.match(0).getMessage());
+        //积分
+        UserPointsDO pointsDO = userPointsDao.selectUserPoints(userPointsVO.getUserAccountId());
+        UserPointsDO points = null;
+        if (pointsDO != null) {
+            Integer totalPoints = userPointsVO.getTotalPoints();
+            Integer totalPoints1 = pointsDO.getTotalPoints();
+            totalPoints += totalPoints1;
+            userPointsVO.setTotalPoints(totalPoints);
+            points = new UserPointsDO(userPointsVO);
+            userPointsDao.updatePoints(points);
+        } else if (pointsDO == null) {
+            points = new UserPointsDO(userPointsVO);
+            userPointsDao.insertPoints(points);
+        }
+        UserPointsDetails userPointsDetails = new UserPointsDetails(id, NumberOfUserPoints.match(0).getMessage(), UserPointsEnum.match(0).getMessage());
+        userPointsDetailsDao.insertPointsDetails(userPointsDetails);
+    }
+
+    private void realNameextracted(Integer id) {
+        UserPointsVO userPointsVO = new UserPointsVO(id, NumberOfUserPoints.match(1).getMessage());
+        //积分
+        UserPointsDO pointsDO = userPointsDao.selectUserPoints(userPointsVO.getUserAccountId());
+        UserPointsDO points = null;
+        if (pointsDO != null) {
+            Integer totalPoints = userPointsVO.getTotalPoints();
+            Integer totalPoints1 = pointsDO.getTotalPoints();
+            totalPoints += totalPoints1;
+            userPointsVO.setTotalPoints(totalPoints);
+            points = new UserPointsDO(userPointsVO);
+            userPointsDao.updatePoints(points);
+        } else if (pointsDO == null) {
+            points = new UserPointsDO(userPointsVO);
+            userPointsDao.insertPoints(points);
+        }
+        UserPointsDetails userPointsDetails = new UserPointsDetails(id, NumberOfUserPoints.match(1).getMessage(), UserPointsEnum.match(1).getMessage());
+        userPointsDetailsDao.insertPointsDetails(userPointsDetails);
+    }
 }

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

@@ -240,36 +240,36 @@ public class UserAccountServiceImpl implements UserAccountService {
         }
         String userPhoneNumber = wxService.getUserPhoneNumber(id, code);
         log.info("授权手机号，用户：{}，手机号：{}，上级推荐人:{}", id, userPhoneNumber, rcdUserId);
-        if (StringUtils.isBlank(userPhoneNumber)) {
-            return ResultBody.error(ResultEnum.AUTH_PHONE_NUMBER_ERROR);
-        }
+//        if (StringUtils.isBlank(userPhoneNumber)) {
+//            return ResultBody.error(ResultEnum.AUTH_PHONE_NUMBER_ERROR);
+//        }
         UserAccountDO userAccount = new UserAccountDO();
         userAccount.setId(id);
         userAccount.setPhoneNum(userPhoneNumber);
         userServiceDao.update(userAccount);
         System.out.println(userAccount);
-        Integer countUser = userServiceDao.getCountUser(rcdUserId);
-
-        if (countUser != null && countUser !=0) {
+//        Integer countUser = userServiceDao.getCountUser(rcdUserId);
+//
+//        if (countUser != null && countUser !=0) {
+////        if (rcdUserId != null) {
+//            UserRcdDO userRcd = new UserRcdDO();
+//            userRcd.setUserAccountId(id);
+//            userRcd.setRcdUserId(rcdUserId);
+//            userServiceDao.insertUserRcd(userRcd);
+//        }
+//
+//        /**
+//         * 积分
+//         */
+//        extracted(id);
+//        RealNameAuthDO realNameAuthByUId = realNameAuthDao.getRealNameAuthByUId(id);
+//        if (realNameAuthByUId != null && realNameAuthByUId.getCheckStatus() == 1) {
+//            realNameextracted(id);
+//        }
+//        // 奖励邀请人
 //        if (rcdUserId != null) {
-            UserRcdDO userRcd = new UserRcdDO();
-            userRcd.setUserAccountId(id);
-            userRcd.setRcdUserId(rcdUserId);
-            userServiceDao.insertUserRcd(userRcd);
-        }
-
-        /**
-         * 积分
-         */
-        extracted(id);
-        RealNameAuthDO realNameAuthByUId = realNameAuthDao.getRealNameAuthByUId(id);
-        if (realNameAuthByUId != null && realNameAuthByUId.getCheckStatus() == 1) {
-            realNameextracted(id);
-        }
-        // 奖励邀请人
-        if (rcdUserId != null) {
-            activityService.participateActivity(0, rcdUserId, id);
-        }
+//            activityService.participateActivity(0, rcdUserId, id);
+//        }
         return ResultBody.success();
     }
 

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: 6efcd8d5e996e5ce8112e0fdb849fdbe61d1266d
+  newTag: d57e7944a98a52f3d842cf3d6b315a427710f632