转账审批服务订购详情修改：license项目挂在服务下面

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.finance.web.utils.UserInfoUtils;
 import com.gic.finance.web.vo.*;
 import com.gic.open.api.dto.OrderDTO;
@@ -28,7 +29,9 @@ import com.gic.finance.qo.TransferListQueryQO;
 import com.gic.finance.service.TransferAccountsApprovalApiService;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 转账审批
@@ -128,6 +131,7 @@ public class TransferAccountsApprovalController {
                                 serviceInfoVO.setSkuInfo(itemDTO.getSkuInfo());
                                 serviceInfoVO.setTotalAmount(itemDTO.getTotalAmount());
                                 serviceInfoVO.setServeInfo(itemDTO.getServeInfo());
+                                serviceInfoVO.setApplicationId(itemDTO.getApplicationId());
                                 serviceInfoVOList.add(serviceInfoVO);
                             } else if (itemDTO.getServeType() == 2) {
                                 //license
@@ -137,6 +141,7 @@ public class TransferAccountsApprovalController {
                                 licenseVO.setTotalAmount(itemDTO.getTotalAmount());
                                 licenseVO.setServeQuantity(itemDTO.getServeQuantity());
                                 licenseVO.setServeInfo(itemDTO.getServeInfo());
+                                licenseVO.setApplicationId(itemDTO.getApplicationId());
                                 licenseVOList.add(licenseVO);
                             } else if (itemDTO.getServeType() == 3) {
                                 //拓展包
@@ -149,12 +154,23 @@ public class TransferAccountsApprovalController {
                                 expandPackageVOList.add(expandPackageVO);
                             }
                         }
-                        if (serviceInfoVOList.size() > 0) {
-                            vo.setServiceInfoVOList(serviceInfoVOList);
-                        }
+                        Map<Long, List<LicenseVO>> licenseMap;
                         if (licenseVOList.size() > 0) {
+                            //license是在服务下面，进行匹配
+                            licenseMap = CollectionUtil.group(licenseVOList, "applicationId") ;
                             vo.setLicenseVOList(licenseVOList);
+                        } else {
+                            licenseMap = new HashMap<>(2);
+                        }
+                        if (serviceInfoVOList.size() > 0) {
+                            for (ServiceInfoVO serviceInfoVO : serviceInfoVOList) {
+                                if (licenseMap.containsKey(serviceInfoVO.getApplicationId())) {
+                                    serviceInfoVO.setLicenseVOList(licenseMap.get(serviceInfoVO.getApplicationId()));
+                                }
+                            }
+                            vo.setServiceInfoVOList(serviceInfoVOList);
                         }
+
                         if (expandPackageVOList.size() > 0) {
                             vo.setExpandPackageVOList(expandPackageVOList);
                         }

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

@@ -34,6 +34,11 @@ public class LicenseVO implements Serializable{
 
     private String licenseUnit;
 
+    /**
+     * 应用id
+     */
+    private Long applicationId;
+
     public String getServeInfo() {
         return serveInfo;
     }
@@ -73,4 +78,12 @@ public class LicenseVO implements Serializable{
     public void setLicenseUnit(String licenseUnit) {
         this.licenseUnit = licenseUnit;
     }
+
+    public Long getApplicationId() {
+        return applicationId;
+    }
+
+    public void setApplicationId(Long applicationId) {
+        this.applicationId = applicationId;
+    }
 }

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

@@ -5,6 +5,7 @@ import org.apache.commons.lang.StringUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 转账审批-service订单项
@@ -41,6 +42,13 @@ public class ServiceInfoVO implements Serializable{
      */
     private BigDecimal totalAmount;
 
+    /**
+     * 应用id
+     */
+    private Long applicationId;
+
+    private List<LicenseVO> licenseVOList;
+
     public void setServeName(String serveName) {
         this.serveName = serveName;
     }
@@ -82,4 +90,20 @@ public class ServiceInfoVO implements Serializable{
     public void setServeInfo(String serveInfo) {
         this.serveInfo = serveInfo;
     }
+
+    public Long getApplicationId() {
+        return applicationId;
+    }
+
+    public void setApplicationId(Long applicationId) {
+        this.applicationId = applicationId;
+    }
+
+    public List<LicenseVO> getLicenseVOList() {
+        return licenseVOList;
+    }
+
+    public void setLicenseVOList(List<LicenseVO> licenseVOList) {
+        this.licenseVOList = licenseVOList;
+    }
 }