Commit 7952ed79 by guojuxing

订购详情服务修改,如果是空,不再返回错误,而是null

parent 742a367d
......@@ -555,7 +555,7 @@ public class EnterpriseController {
vo.setPayType(orderDTO.getPayType());
//支付流水号
vo.setPayInfoSerialNumber(orderDTO.getPayNumber());
vo.setTotalCountFee(transfer.getPlannedAmount());
vo.setTotalCountFee(vo.getPlannedAmount());
vo.setRelationOrderType(orderDTO.getOrderType());
vo.setOperType(orderDTO.getOperType());
vo.setOperName(orderDTO.getOperName());
......@@ -632,8 +632,8 @@ public class EnterpriseController {
} else if (licenseVOList.size() > 0) {
//没有服务,只有license数据,比如扩容
ServiceInfoVO temp = new ServiceInfoVO();
boolean isGicEnterprise = transfer.getPlatformType() != null
&& transfer.getPlatformType().intValue() == EnterprisePlatformTypeEnum.GIC.getCode();
boolean isGicEnterprise = vo.getPlatformType() != null
&& vo.getPlatformType().intValue() == EnterprisePlatformTypeEnum.GIC.getCode();
if (isGicEnterprise) {
ServiceResponse<EnterpriseDTO> tempResult = enterpriseApiService
.getEnterpriseById(transfer.getEnterpriseId());
......
......@@ -203,6 +203,10 @@ public class TransferApprovalServiceVO implements Serializable{
this.platformType = platformType;
}
public Integer getPlatformType() {
return platformType;
}
public String getPlatformTypeStr() {
return EnterprisePlatformTypeEnum.getMessageByCode(platformType);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment