扩容审批详情修改

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

@@ -112,6 +112,7 @@ public class TransferAccountsApprovalController {
                     vo.setRelationOrderType(orderDTO.getOrderType());
                     vo.setOperType(orderDTO.getOperType());
                     vo.setOperName(orderDTO.getOperName());
+                    vo.setPayDetail(orderDTO.getPayDetail());
                     String couponName = orderDTO.getCouponName();
                     if (!StringUtils.isBlank(couponName)) {
                         ServiceDiscountVO discountVO = new ServiceDiscountVO();
@@ -133,6 +134,7 @@ public class TransferAccountsApprovalController {
                                 serviceInfoVO.setTotalAmount(itemDTO.getSaleAmount());
                                 serviceInfoVO.setServeInfo(itemDTO.getServeInfo());
                                 serviceInfoVO.setApplicationId(itemDTO.getApplicationId());
+                                serviceInfoVO.setPayDetail(itemDTO.getPayDetail());
                                 serviceInfoVOList.add(serviceInfoVO);
                             } else if (itemDTO.getServeType() == 2) {
                                 //license
@@ -144,6 +146,7 @@ public class TransferAccountsApprovalController {
                                 licenseVO.setServeQuantity(itemDTO.getServeQuantity());
                                 licenseVO.setServeInfo(itemDTO.getServeInfo());
                                 licenseVO.setApplicationId(itemDTO.getApplicationId());
+                                licenseVO.setPayDetail(itemDTO.getPayDetail());
                                 licenseVOList.add(licenseVO);
                             } else if (itemDTO.getServeType() == 3) {
                                 //拓展包
@@ -153,6 +156,7 @@ public class TransferAccountsApprovalController {
                                 expandPackageVO.setServeQuantity(itemDTO.getServeQuantity());
                                 //销售价
                                 expandPackageVO.setTotalAmount(itemDTO.getSaleAmount());
+                                expandPackageVO.setPayDetail(itemDTO.getPayDetail());
                                 expandPackageVO.setServeInfo(itemDTO.getServeInfo());
                                 expandPackageVOList.add(expandPackageVO);
                             }

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

@@ -37,6 +37,11 @@ public class ExpandPackageVO implements Serializable{
      */
     private String serveInfo;
 
+    /**
+     * 支付详情json{100:现金 ,101:xxx}
+     */
+    private String payDetail;
+
 
     public String getServeName() {
         return serveName;
@@ -77,4 +82,12 @@ public class ExpandPackageVO implements Serializable{
     public void setServeInfo(String serveInfo) {
         this.serveInfo = serveInfo;
     }
+
+    public String getPayDetail() {
+        return payDetail;
+    }
+
+    public void setPayDetail(String payDetail) {
+        this.payDetail = payDetail;
+    }
 }

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

@@ -39,6 +39,11 @@ public class LicenseVO implements Serializable{
      */
     private Long applicationId;
 
+    /**
+     * 支付详情json{100:现金 ,101:xxx}
+     */
+    private String payDetail;
+
     public String getServeInfo() {
         return serveInfo;
     }
@@ -86,4 +91,12 @@ public class LicenseVO implements Serializable{
     public void setApplicationId(Long applicationId) {
         this.applicationId = applicationId;
     }
+
+    public String getPayDetail() {
+        return payDetail;
+    }
+
+    public void setPayDetail(String payDetail) {
+        this.payDetail = payDetail;
+    }
 }

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

@@ -43,6 +43,11 @@ public class ServiceInfoVO implements Serializable{
     private BigDecimal totalAmount;
 
     /**
+     * 支付详情json{100:现金 ,101:xxx}
+     */
+    private String payDetail;
+
+    /**
      * 应用id
      */
     private Long applicationId;
@@ -106,4 +111,12 @@ public class ServiceInfoVO implements Serializable{
     public void setLicenseVOList(List<LicenseVO> licenseVOList) {
         this.licenseVOList = licenseVOList;
     }
+
+    public String getPayDetail() {
+        return payDetail;
+    }
+
+    public void setPayDetail(String payDetail) {
+        this.payDetail = payDetail;
+    }
 }

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

@@ -105,6 +105,10 @@ public class TransferApprovalServiceVO implements Serializable{
      */
     private Double totalCountFee;
     /**
+     * 支付详情json{100:现金 ,101:xxx}
+     */
+    private String payDetail;
+    /**
      * 订单创建时间
      */
     private Date orderCreateTime;
@@ -435,4 +439,12 @@ public class TransferApprovalServiceVO implements Serializable{
     public void setOrderNumber(String orderNumber) {
         this.orderNumber = orderNumber;
     }
+
+    public String getPayDetail() {
+        return payDetail;
+    }
+
+    public void setPayDetail(String payDetail) {
+        this.payDetail = payDetail;
+    }
 }