Merge branch 'dev/2024/0511/update-app-Y' of feifan/mall-backend-app into master

修改用户签到判断是否升级

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/usersigninlog/UserSignInLogServiceImpl.java

@@ -3,7 +3,6 @@ package cn.newfeifan.mall.module.distri.service.usersigninlog;
 import cn.newfeifan.mall.module.distri.controller.admin.orderpercentage.vo.OrderPercentageRedisVO;
 import cn.newfeifan.mall.module.distri.controller.app.usersigninlog.vo.UserSignInLogPageReqVO;
 import cn.newfeifan.mall.module.distri.controller.app.usersigninlog.vo.UserSignInLogSaveReqVO;
-import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
 import cn.newfeifan.mall.module.distri.enums.SocialStatusEnum;
 import cn.newfeifan.mall.module.distri.service.duser.DuserService;
 import cn.newfeifan.mall.module.distri.service.socialstatus.SocialStatusService;
@@ -102,18 +101,18 @@ public class UserSignInLogServiceImpl implements UserSignInLogService {
         }
 
         //更新前用户身价等级
-        DuserDO duserByUserNow = duserService.getDuserByUser(loginUserId);
+        Long socialStatusIdNow = duserService.getDuserByUser(loginUserId).getSocialStatusId();
         //更新用户身价
         duserService.updateDuserSocial(loginUserId, social, SocialStatusEnum.SIGN_IN_SOCIAL.getStatus());
 
         //更新后用户身价等级
-        DuserDO duserByUserAfter = duserService.getDuserByUser(loginUserId);
+        Long socialStatusIdAfter = duserService.getDuserByUser(loginUserId).getSocialStatusId();
 
         //判断是否升级
-        boolean upgradeOrNot = !duserByUserNow.getSocialStatusId().equals(duserByUserAfter.getSocialStatusId());
+        boolean upgradeOrNot = !socialStatusIdNow.equals(socialStatusIdAfter);
         String socialStatusName = null;
         if(upgradeOrNot){
-            socialStatusName = socialStatusService.getSocialStatusName(duserByUserAfter.getSocialStatusId());
+            socialStatusName = socialStatusService.getSocialStatusName(socialStatusIdAfter);
         }
         // 返回
         return MemberSignInRecordConvert.INSTANCE.coverRecordToAppRecordVo(recordDO,upgradeOrNot,social,socialStatusName);
@@ -186,4 +185,4 @@ public class UserSignInLogServiceImpl implements UserSignInLogService {
         return userSignInLogMapper.selectPage(pageReqVO);
     }
 
-}
+}