|
@@ -37,6 +37,7 @@ import com.diagbot.enums.ConstantEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.OrganizationTypeEnum;
|
|
import com.diagbot.enums.OrganizationTypeEnum;
|
|
import com.diagbot.enums.RejectEnum;
|
|
import com.diagbot.enums.RejectEnum;
|
|
|
|
+import com.diagbot.enums.StatusEnum;
|
|
import com.diagbot.enums.VisibleIdTypeEnum;
|
|
import com.diagbot.enums.VisibleIdTypeEnum;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
@@ -950,6 +951,22 @@ public class UserFacade extends UserServiceImpl {
|
|
map.put("userId", baseIdVO.getId());
|
|
map.put("userId", baseIdVO.getId());
|
|
map.put("modifier", UserUtils.getCurrentPrincipleID());
|
|
map.put("modifier", UserUtils.getCurrentPrincipleID());
|
|
map.put("gmtModified", DateUtil.now());
|
|
map.put("gmtModified", DateUtil.now());
|
|
|
|
+ List<Long> userIds = new ArrayList<>();
|
|
|
|
+ userIds.add(baseIdVO.getId());
|
|
|
|
+ RespDTO<List<UserAndProdutDTO>> InformationData = diagbotmanClient.getInformationAvailableAll(userIds);
|
|
|
|
+
|
|
|
|
+ if (InformationData == null || !"0".equals(InformationData.code)) {
|
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
|
|
|
|
+ "获取所有开通信息失败");
|
|
|
|
+ }
|
|
|
|
+ //获取该用户开通的产品信息的状态
|
|
|
|
+ List<UserAndProdutDTO> dataList = InformationData.data;
|
|
|
|
+ for(UserAndProdutDTO InformationDataNew :dataList){
|
|
|
|
+ Integer serviceStatus =InformationDataNew.getServiceStatus();
|
|
|
|
+ if(serviceStatus.equals(StatusEnum.Enable.getKey())){
|
|
|
|
+ return RespDTO.onError("请先停用所有产品");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
boolean res = updateDeleted(map);
|
|
boolean res = updateDeleted(map);
|
|
if (!res) {
|
|
if (!res) {
|
|
throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
|
|
throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
|