扩容审批详情修改

gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/TransferAccountsApprovalController.java

 package com.gic.finance.web.controller;
 
 import com.gic.commons.util.CollectionUtil;
+import com.gic.enterprise.dto.EnterpriseDTO;
+import com.gic.enterprise.service.EnterpriseApiService;
+import com.gic.finance.constant.EnterprisePlatformTypeEnum;
 import com.gic.finance.web.utils.UserInfoUtils;
 import com.gic.finance.web.vo.*;
 import com.gic.open.api.dto.OrderDTO;
@@ -53,6 +56,8 @@ public class TransferAccountsApprovalController {
     private BillingRechargeRecordApiService billingRechargeRecordApiService;
     @Autowired
     private OrderApiService orderApiService;
+    @Autowired
+    private EnterpriseApiService enterpriseApiService;
 
     @RequestMapping("/get-approval")
     public RestResponse getById(Integer id) {
@@ -164,7 +169,7 @@ public class TransferAccountsApprovalController {
                         Map<Long, List<LicenseVO>> licenseMap;
                         if (licenseVOList.size() > 0) {
                             //license是在服务下面，进行匹配
-                            licenseMap = CollectionUtil.group(licenseVOList, "applicationId") ;
+                            licenseMap = CollectionUtil.group(licenseVOList, "applicationId");
                             vo.setLicenseVOList(licenseVOList);
                         } else {
                             licenseMap = new HashMap<>(2);
@@ -179,6 +184,19 @@ public class TransferAccountsApprovalController {
                         } else if (licenseVOList.size() > 0) {
                             //没有服务，只有license数据，比如扩容
                             ServiceInfoVO temp = new ServiceInfoVO();
+                            boolean isGicEnterprise = transfer.getPlatformType() != null && transfer.getPlatformType()
+                                    .intValue() == EnterprisePlatformTypeEnum.GIC.getCode();
+                            if (isGicEnterprise) {
+                                ServiceResponse<EnterpriseDTO> tempResult = enterpriseApiService
+                                        .getEnterpriseById(transfer.getEnterpriseId());
+                                if (tempResult.isSuccess()) {
+                                    temp.setVersionName(orderDTO.getServeName() + "-" + tempResult.getResult().getVersionName());
+                                } else {
+                                    LOGGER.warn(tempResult.getMessage());
+                                }
+                            } else {
+                                temp.setVersionName(orderDTO.getServeName());
+                            }
                             temp.setLicenseVOList(licenseVOList);
                             serviceInfoVOList.add(temp);
                             vo.setServiceInfoVOList(serviceInfoVOList);

gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/ServiceInfoVO.java

@@ -28,6 +28,8 @@ public class ServiceInfoVO implements Serializable{
      */
     private String serveInfo;
 
+    private String versionName;
+
     /**
      * 服务描述
      */
@@ -72,6 +74,9 @@ public class ServiceInfoVO implements Serializable{
 
     public String getServcieDesc() {
         if (StringUtils.isBlank(skuInfo)) {
+            if (StringUtils.isNotBlank(versionName)) {
+                return versionName;
+            }
             return "--";
         }
         JSONObject jsonObject = JSONObject.parseObject(skuInfo);
@@ -119,4 +124,8 @@ public class ServiceInfoVO implements Serializable{
     public void setPayDetail(String payDetail) {
         this.payDetail = payDetail;
     }
+
+    public void setVersionName(String versionName) {
+        this.versionName = versionName;
+    }
 }