irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix: 接口新返回等级信息

Browse Source
This commit is contained in:
huchuansai
2025-06-13 09:41:48 +08:00
parent da9771cb9d
commit d3fcd31510
17 changed files with 963 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
View File

@@ -16,6 +16,7 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo;
import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoQueryVo;
import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoReturnVo;
import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
import com.starry.admin.modules.clerk.service.IPlayClerkLevelInfoService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService;
@@ -56,8 +57,6 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
@Resource
private PlayClerkUserInfoMapper playClerkUserInfoMapper;
@Resource
private PlayClerkDataReviewInfoServiceImpl playClerkDataReviewInfoService;
@Resource
private PlayClerkUserReviewInfoServiceImpl playClerkUserReviewInfoService;
@Resource
private IPlayClerkCommodityService playClerkCommodityService;
@@ -77,7 +76,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
private LoginService loginService;
@Resource
private JwtToken jwtToken;
@Resource
private IPlayClerkLevelInfoService playClerkLevelInfoService;
@Override
public List<PlayClerkUserInfoEntity> listAllByTypeId(String typeId) {
@@ -182,6 +182,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
result.setArea(userInfo.getProvince() + "-" + userInfo.getCity());
result.setPcData(this.getPcData(userInfo));
result.setLevelInfo(playClerkLevelInfoService.selectPlayClerkLevelInfoById(userInfo.getLevelId()));
return result;
}
@@ -417,6 +418,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
record.setFollowState(customFollows.containsKey(record.getId()) ? "1" : "0");
record.setCommodity(playClerkCommodityService.getClerkCommodityList(record.getId(), "1"));
}
voPage.getRecords().parallelStream().forEach(ca -> {
ca.setLevelInfo(playClerkLevelInfoService.selectPlayClerkLevelInfoById(ca.getLevelId()));
});
return voPage;
}

5
play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java
View File

@@ -1,6 +1,7 @@
package com.starry.admin.modules.weichat.entity;
import com.alibaba.fastjson2.JSONObject;
import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo;
import lombok.Data;
@@ -144,5 +145,9 @@ public class PlayClerkUserLoginResponseVo {
private JSONObject pcData;
private PlayClerkLevelInfoEntity levelInfo;
}

2
play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoResultVo.java
View File

@@ -1,5 +1,6 @@
package com.starry.admin.modules.weichat.entity.clerk;
import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -32,6 +33,7 @@ public class PlayClerkUserInfoResultVo {
@ApiModelProperty(value = "店员等级ID")
private String levelId;
private PlayClerkLevelInfoEntity levelInfo;
/**
* 店员等级
*/