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

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java

@@ -15,6 +15,7 @@ import com.gic.enterprise.qo.EnterpriseQO;
 import com.gic.enterprise.utils.AutoCreatePasswordUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.finance.constant.EnterprisePlatformTypeEnum;
+import com.gic.finance.constant.OrderTypeEnum;
 import com.gic.marketing.process.api.service.sms.SmsSendApiService;
 import com.gic.open.api.dto.market.MarketUserDTO;
 import com.gic.open.api.service.market.MarketAppCategoryApiService;
@@ -545,6 +546,7 @@ public class EnterpriseController {
             //如果是空的，说明订购记录不走财务转账审批
             if (vo == null) {
                 vo = new TransferApprovalServiceVO();
+                vo.setOrderNumber(orderNum);
             }
 
             ServiceResponse<OrderDTO> orderResult = orderApiService.getOrderForFinance(orderNum);
@@ -555,6 +557,21 @@ public class EnterpriseController {
                 vo.setPayType(orderDTO.getPayType());
                 //支付流水号
                 vo.setPayInfoSerialNumber(orderDTO.getPayNumber());
+
+                if (vo.getOrderType() == null) {
+                    //没有走财务转账审批
+                    Integer serveType = orderDTO.getServeType();
+                    if (serveType != null) {
+                        if (serveType.intValue() == 1) {
+                            vo.setOrderType(OrderTypeEnum.SERVICE.getCode());
+                        } else if (serveType.intValue() == 2) {
+                            vo.setOrderType(OrderTypeEnum.PACKAGE.getCode());
+                        } else if (serveType.intValue() == 3) {
+                            vo.setOrderType(OrderTypeEnum.EXTENSION_PACKAGE.getCode());
+                        }
+                    }
+                }
+
                 vo.setTotalCountFee(vo.getPlannedAmount());
                 vo.setRelationOrderType(orderDTO.getOrderType());
                 vo.setOperType(orderDTO.getOperType());

gic-platform-operation-web/src/main/java/com/gic/operation/web/vo/enterprise/TransferApprovalServiceVO.java

@@ -361,7 +361,7 @@ public class TransferApprovalServiceVO implements Serializable{
 
     public String getRelationOrderTypeStr() {
         //1购买 2续费 3升级 4扩容
-        if (orderType == null) {
+        if (relationOrderType == null) {
             return "--";
         }
         if (relationOrderType.intValue() == 1) {