|
|
@ -7,18 +7,12 @@ import com.huoran.common.exception.CustomException; |
|
|
|
import com.huoran.common.exception.ExceptionEnum; |
|
|
|
import com.huoran.common.exception.ExceptionEnum; |
|
|
|
import com.huoran.common.response.R; |
|
|
|
import com.huoran.common.response.R; |
|
|
|
import com.huoran.common.utils.TokenUtils; |
|
|
|
import com.huoran.common.utils.TokenUtils; |
|
|
|
import com.huoran.nakadai.entity.PlatformTeam; |
|
|
|
import com.huoran.nakadai.entity.*; |
|
|
|
import com.huoran.nakadai.entity.PlatformTeamAccount; |
|
|
|
|
|
|
|
import com.huoran.nakadai.entity.PlatformTeamClassification; |
|
|
|
|
|
|
|
import com.huoran.nakadai.entity.SupplierClassificationConfig; |
|
|
|
|
|
|
|
import com.huoran.nakadai.entity.req.*; |
|
|
|
import com.huoran.nakadai.entity.req.*; |
|
|
|
import com.huoran.nakadai.entity.res.PartnerAccountResp; |
|
|
|
import com.huoran.nakadai.entity.res.PartnerAccountResp; |
|
|
|
import com.huoran.nakadai.entity.res.PlatformTeamAccountResp; |
|
|
|
import com.huoran.nakadai.entity.res.PlatformTeamAccountResp; |
|
|
|
import com.huoran.nakadai.entity.vo.TeamClassificationVO; |
|
|
|
import com.huoran.nakadai.entity.vo.TeamClassificationVO; |
|
|
|
import com.huoran.nakadai.service.PlatformTeamAccountService; |
|
|
|
import com.huoran.nakadai.service.*; |
|
|
|
import com.huoran.nakadai.service.PlatformTeamClassificationService; |
|
|
|
|
|
|
|
import com.huoran.nakadai.service.PlatformTeamService; |
|
|
|
|
|
|
|
import com.huoran.nakadai.service.SupplierClassificationConfigService; |
|
|
|
|
|
|
|
import com.huoran.nakadai.utils.GenerateCodeUtil; |
|
|
|
import com.huoran.nakadai.utils.GenerateCodeUtil; |
|
|
|
import com.huoran.nakadai.utils.ali.HttpUtils; |
|
|
|
import com.huoran.nakadai.utils.ali.HttpUtils; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.Api; |
|
|
@ -60,6 +54,9 @@ public class PlatformTeamAccountController { |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
public PlatformTeamService platformTeamService; |
|
|
|
public PlatformTeamService platformTeamService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
|
|
public CollectionProviderService collectionProviderService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
public PlatformTeamClassificationService platformTeamClassificationService; |
|
|
|
public PlatformTeamClassificationService platformTeamClassificationService; |
|
|
|
|
|
|
|
|
|
|
@ -284,11 +281,15 @@ public class PlatformTeamAccountController { |
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "查询团队信息") |
|
|
|
@ApiOperation(value = "查询团队信息") |
|
|
|
@GetMapping("/queryTeamInfo") |
|
|
|
@GetMapping("/queryTeamInfo") |
|
|
|
public R queryTeamInfo(@ApiParam(value = "团队id") @RequestParam("teamId") Integer teamId) { |
|
|
|
public R queryTeamInfo(@ApiParam(value = "团队id") @RequestParam("teamId") Integer teamId, HttpServletRequest request) { |
|
|
|
|
|
|
|
String accountId = TokenUtils.getIdByJwtToken(request); |
|
|
|
PlatformTeamClassification teamInfo = platformTeamClassificationService.getById(teamId); |
|
|
|
PlatformTeamClassification teamInfo = platformTeamClassificationService.getById(teamId); |
|
|
|
//查询供应商的分类信息(只有当前团队为供应商才有supplierClassification数据)
|
|
|
|
//查询供应商的分类信息(只有当前团队为供应商才有supplierClassification数据)
|
|
|
|
List<TeamClassificationVO> supplierClassification = platformTeamService.getTeamClassificationVOByTeamId(teamId); |
|
|
|
List<TeamClassificationVO> supplierClassification = platformTeamService.getTeamClassificationVOByTeamId(teamId); |
|
|
|
return R.ok().put("teamInfo", teamInfo).put("supplierClassification", supplierClassification); |
|
|
|
|
|
|
|
|
|
|
|
CollectionProvider collectionProviders = collectionProviderService.getCollectionProviderByUserIdAndProviderId(teamId, Integer.valueOf(accountId)); |
|
|
|
|
|
|
|
return R.ok().put("teamInfo", teamInfo).put("supplierClassification", supplierClassification).put("collectionInformation",collectionProviders); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("/inviteJoinOrganization") |
|
|
|
@PostMapping("/inviteJoinOrganization") |
|
|
|