转账审批详情接口修改

gic-platform-finance-service/src/main/java/com/gic/finance/entity/TabTransferAccountsApproval.java

@@ -121,16 +121,6 @@ public class TabTransferAccountsApproval {
      */
     private Integer orderType;
 
-    /**
-     * 回调接口路径，例如 com.gic.enterprise.service.BillingPayInfoApiService
-     */
-    private String callbackInterface;
-
-    /**
-     * 回调接口名称，例如 offlineCallBack
-     */
-    private String callbackMethod;
-
     public Integer getTransferApprovalId() {
         return transferApprovalId;
     }
@@ -314,20 +304,4 @@ public class TabTransferAccountsApproval {
     public void setOrderType(Integer orderType) {
         this.orderType = orderType;
     }
-
-    public String getCallbackInterface() {
-        return callbackInterface;
-    }
-
-    public void setCallbackInterface(String callbackInterface) {
-        this.callbackInterface = callbackInterface;
-    }
-
-    public String getCallbackMethod() {
-        return callbackMethod;
-    }
-
-    public void setCallbackMethod(String callbackMethod) {
-        this.callbackMethod = callbackMethod;
-    }
 }
\ No newline at end of file

gic-platform-finance-service/src/main/resources/mapper/TabTransferAccountsApprovalMapper.xml

@@ -25,15 +25,12 @@
     <result column="company_name" jdbcType="VARCHAR" property="companyName" />
     <result column="logo" jdbcType="VARCHAR" property="logo" />
     <result column="order_type" jdbcType="INTEGER" property="orderType" />
-    <result column="callback_interface" jdbcType="VARCHAR" property="callbackInterface" />
-    <result column="callback_method" jdbcType="VARCHAR" property="callbackMethod" />
   </resultMap>
   <sql id="Base_Column_List">
     transfer_approval_id, order_number, platform_type, initiator_type, initiator_name, 
     enterprise_id, planned_amount, bad_amount, account_amount, verify_code, approval_number, 
     approval_status, approval_id, approval_name, approval_time, create_time, update_time, 
-    approval_phone, approval_phone_area_code, enterprise_name, company_name, logo, order_type,
-    callback_interface, callback_method
+    approval_phone, approval_phone_area_code, enterprise_name, company_name, logo, order_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -53,7 +50,7 @@
       approval_status, approval_id, approval_name, 
       approval_time, create_time, update_time, 
       approval_phone, approval_phone_area_code, enterprise_name, 
-      company_name, logo, order_type, callback_interface, callback_method
+      company_name, logo, order_type
       )
     values (#{transferApprovalId,jdbcType=INTEGER}, #{orderNumber,jdbcType=VARCHAR}, 
       #{platformType,jdbcType=INTEGER}, #{initiatorType,jdbcType=INTEGER}, #{initiatorName,jdbcType=VARCHAR}, 
@@ -62,8 +59,7 @@
       #{approvalStatus,jdbcType=INTEGER}, #{approvalId,jdbcType=VARCHAR}, #{approvalName,jdbcType=VARCHAR}, 
       #{approvalTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{approvalPhone,jdbcType=VARCHAR}, #{approvalPhoneAreaCode,jdbcType=VARCHAR}, #{enterpriseName,jdbcType=VARCHAR}, 
-      #{companyName,jdbcType=VARCHAR}, #{logo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER},
-      #{callbackInterface,jdbcType=VARCHAR}, #{callbackMethod,jdbcType=VARCHAR}
+      #{companyName,jdbcType=VARCHAR}, #{logo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.finance.entity.TabTransferAccountsApproval">
@@ -138,12 +134,6 @@
       <if test="orderType != null">
         order_type,
       </if>
-      <if test="callbackInterface != null">
-        callback_interface,
-      </if>
-      <if test="callbackMethod != null">
-        callback_method,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="transferApprovalId != null">
@@ -215,12 +205,6 @@
       <if test="orderType != null">
         #{orderType,jdbcType=INTEGER},
       </if>
-      <if test="callbackInterface != null">
-        #{callbackInterface,jdbcType=VARCHAR},
-      </if>
-      <if test="callbackMethod != null">
-        #{callbackMethod,jdbcType=VARCHAR},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.finance.entity.TabTransferAccountsApproval">
@@ -292,12 +276,6 @@
       <if test="orderType != null">
         order_type = #{orderType,jdbcType=INTEGER},
       </if>
-      <if test="callbackInterface != null">
-        callback_interface = #{callbackInterface,jdbcType=VARCHAR},
-      </if>
-      <if test="callbackMethod != null">
-        callback_method = #{callbackMethod,jdbcType=VARCHAR},
-      </if>
     </set>
     where transfer_approval_id = #{transferApprovalId,jdbcType=INTEGER}
   </update>
@@ -324,9 +302,7 @@
       enterprise_name = #{enterpriseName,jdbcType=VARCHAR},
       company_name = #{companyName,jdbcType=VARCHAR},
       logo = #{logo,jdbcType=VARCHAR},
-      order_type = #{orderType,jdbcType=INTEGER},
-      callback_interface = #{callbackInterface,jdbcType=VARCHAR},
-      callback_method = #{callbackMethod,jdbcType=VARCHAR}
+      order_type = #{orderType,jdbcType=INTEGER}
     where transfer_approval_id = #{transferApprovalId,jdbcType=INTEGER}
   </update>
 

gic-platform-finance-web/pom.xml

@@ -137,6 +137,12 @@
             <artifactId>gic-authcenter-api</artifactId>
             <version>${gic-authcenter-api}</version>
         </dependency>
+        <!--开放平台-->
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-open-platform-api</artifactId>
+            <version>4.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

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

 package com.gic.finance.web.controller;
 
+import com.gic.finance.web.vo.*;
+import com.gic.open.api.dto.OrderDTO;
+import com.gic.open.api.dto.OrderItemDTO;
+import com.gic.open.api.service.OrderApiService;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +25,9 @@ import com.gic.finance.constant.OrderTypeEnum;
 import com.gic.finance.dto.TransferAccountsApprovalDTO;
 import com.gic.finance.qo.TransferListQueryQO;
 import com.gic.finance.service.TransferAccountsApprovalApiService;
-import com.gic.finance.web.vo.TransferApprovalListVO;
-import com.gic.finance.web.vo.TransferApprovalRechargeVO;
-import com.gic.finance.web.vo.TransferApprovalSmsVO;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 转账审批
@@ -42,6 +47,8 @@ public class TransferAccountsApprovalController {
     private BillingOrderApiService billingOrderApiService;
     @Autowired
     private BillingRechargeRecordApiService billingRechargeRecordApiService;
+    @Autowired
+    private OrderApiService orderApiService;
 
     @RequestMapping("/get-approval")
     public RestResponse getById(Integer id) {
@@ -87,7 +94,68 @@ public class TransferAccountsApprovalController {
                     return EnterpriseRestResponse.failure(rechargeResult);
                 }
             } else {
-                return RestResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "目前没有该类型的数据");
+                TransferApprovalServiceVO vo = EntityUtil.changeEntityNew(TransferApprovalServiceVO.class, transfer);
+
+                ServiceResponse<OrderDTO> orderResult = orderApiService.getOrderForFinance(transfer.getOrderNumber());
+                if (orderResult.isSuccess()) {
+                    OrderDTO orderDTO = orderResult.getResult();
+                    vo.setOrderCreateTime(orderDTO.getCreateTime());
+                    //支付类型
+                    vo.setPayType(orderDTO.getPayType());
+                    //支付流水号
+                    vo.setPayInfoSerialNumber(orderDTO.getPayNumber());
+                    vo.setTotalCountFee(transfer.getPlannedAmount());
+                    String couponName = orderDTO.getCouponName();
+                    if (!StringUtils.isBlank(couponName)) {
+                        ServiceDiscountVO discountVO = new ServiceDiscountVO();
+                        discountVO.setDiscountDetail(orderDTO.getDiscountDetail());
+                        discountVO.setDiscountName(couponName);
+                        vo.setServiceDiscountVO(discountVO);
+                    }
+                    if (orderDTO.getOrderItemList() != null) {
+                        List<ServiceInfoVO> serviceInfoVOList = new ArrayList<>();
+                        List<ExpandPackageVO> expandPackageVOList = new ArrayList<>();
+                        List<LicenseVO> licenseVOList = new ArrayList<>();
+                        for (OrderItemDTO itemDTO : orderDTO.getOrderItemList()) {
+                            if (itemDTO.getServeType() == 1) {
+                                //服务
+                                ServiceInfoVO serviceInfoVO = new ServiceInfoVO();
+                                serviceInfoVO.setServeName(itemDTO.getServeName());
+                                serviceInfoVO.setSkuInfo(itemDTO.getSkuInfo());
+                                serviceInfoVO.setTotalAmount(itemDTO.getTotalAmount());
+                                serviceInfoVOList.add(serviceInfoVO);
+                            } else if (itemDTO.getServeType() == 2) {
+                                //license
+                                LicenseVO licenseVO = new LicenseVO();
+                                licenseVO.setLicenseUnit(itemDTO.getLicenseUnit());
+                                licenseVO.setServeName(itemDTO.getServeName());
+                                licenseVO.setTotalAmount(itemDTO.getTotalAmount());
+                                licenseVO.setServeQuantity(itemDTO.getServeQuantity());
+                                licenseVOList.add(licenseVO);
+                            } else if (itemDTO.getServeType() == 3) {
+                                //拓展包
+                                ExpandPackageVO expandPackageVO = new ExpandPackageVO();
+                                expandPackageVO.setImageUrl(itemDTO.getImageUrl());
+                                expandPackageVO.setServeName(itemDTO.getServeName());
+                                expandPackageVO.setServeQuantity(itemDTO.getServeQuantity());
+                                expandPackageVO.setTotalAmount(itemDTO.getTotalAmount());
+                                expandPackageVOList.add(expandPackageVO);
+                            }
+                        }
+                        if (serviceInfoVOList.size() > 0) {
+                            vo.setServiceInfoVOList(serviceInfoVOList);
+                        }
+                        if (licenseVOList.size() > 0) {
+                            vo.setLicenseVOList(licenseVOList);
+                        }
+                        if (expandPackageVOList.size() > 0) {
+                            vo.setExpandPackageVOList(expandPackageVOList);
+                        }
+                    }
+                    return RestResponse.success(orderDTO);
+                } else {
+                    return EnterpriseRestResponse.failure(orderResult);
+                }
             }
         } else {
             return EnterpriseRestResponse.failure(transferResult);

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

+package com.gic.finance.web.vo;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 转账审批详情个-拓展包信息
+ * @ClassName: ExpandPackageVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/9/11 3:18 PM

+ */
+public class ExpandPackageVO implements Serializable{
+    private static final long serialVersionUID = 8184386301939808866L;
+
+    /**
+     * 名称
+     */
+    private String serveName;
+
+    /**
+     * 订单原价
+     */
+    private BigDecimal totalAmount;
+
+
+    // 购买数量
+    private Integer serveQuantity;
+
+    /**
+     * 图片
+     */
+    private String imageUrl;
+
+
+    public String getServeName() {
+        return serveName;
+    }
+
+    public void setServeName(String serveName) {
+        this.serveName = serveName;
+    }
+
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public Integer getServeQuantity() {
+        return serveQuantity;
+    }
+
+    public void setServeQuantity(Integer serveQuantity) {
+        this.serveQuantity = serveQuantity;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+}

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

+package com.gic.finance.web.vo;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 转账审批-license信息
+ * @ClassName: LicenseVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/9/11 3:11 PM

+ */
+public class LicenseVO implements Serializable{
+    private static final long serialVersionUID = 5364676075681956671L;
+
+    /**
+     * 名称
+     */
+    private String serveName;
+
+    /**
+     * 订单原价
+     */
+    private BigDecimal totalAmount;
+
+
+    // 购买数量
+    private Integer serveQuantity;
+
+    private String licenseUnit;
+
+    public String getServeName() {
+        return serveName;
+    }
+
+    public void setServeName(String serveName) {
+        this.serveName = serveName;
+    }
+
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public Integer getServeQuantity() {
+        return serveQuantity;
+    }
+
+    public void setServeQuantity(Integer serveQuantity) {
+        this.serveQuantity = serveQuantity;
+    }
+
+    public String getLicenseUnit() {
+        return licenseUnit;
+    }
+
+    public void setLicenseUnit(String licenseUnit) {
+        this.licenseUnit = licenseUnit;
+    }
+}

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

+package com.gic.finance.web.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.Serializable;
+/**
+ * 转账审批-优惠方式
+ * @ClassName: ServiceDiscountVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/9/11 2:35 PM

+ */
+public class ServiceDiscountVO implements Serializable{
+    private static final long serialVersionUID = -8918828388480825357L;
+    /**
+     * 优惠方式名称
+     */
+    private String discountTypeStr;
+    /**
+     * 优惠名称
+     */
+    private String discountName;
+
+    /**
+     * 优惠金额
+     */
+    private String fee;
+
+    /**
+     * 优惠详情{200:卡券}
+     */
+    private String discountDetail;
+
+
+    public String getDiscountTypeStr() {
+        if (StringUtils.isBlank(discountDetail)) {
+            return "--";
+        }
+        JSONObject jsonObject = JSONObject.parseObject(discountDetail);
+        if (jsonObject.containsKey("200")) {
+            return "卡券";
+        }
+        return "--";
+    }
+
+    public String getDiscountName() {
+        return discountName;
+    }
+
+    public void setDiscountName(String discountName) {
+        this.discountName = discountName;
+    }
+
+    public String getFee() {
+        if (StringUtils.isBlank(discountDetail)) {
+            return "--";
+        }
+        JSONObject jsonObject = JSONObject.parseObject(discountDetail);
+        if (jsonObject.containsKey("200")) {
+            return jsonObject.getString("200");
+        }
+        return "--";
+    }
+
+    public void setDiscountDetail(String discountDetail) {
+        this.discountDetail = discountDetail;
+    }
+}

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

+package com.gic.finance.web.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 转账审批-service订单项
+ * @ClassName: ServiceInfoVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/9/11 2:50 PM

+ */
+public class ServiceInfoVO implements Serializable{
+    private static final long serialVersionUID = -1533446055799811700L;
+
+    /**
+     * 名称
+     */
+    private String serveName;
+    private String skuInfo;
+
+
+    /**
+     * 服务描述
+     */
+    private String servcieDesc;
+
+    /**
+     * 周期
+     */
+    private String serviceCycle;
+    /**
+     * 订单项原价
+     */
+    private BigDecimal totalAmount;
+
+    public void setServeName(String serveName) {
+        this.serveName = serveName;
+    }
+
+    public void setSkuInfo(String skuInfo) {
+        this.skuInfo = skuInfo;
+    }
+
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public String getServcieDesc() {
+        if (StringUtils.isBlank(skuInfo)) {
+            return "--";
+        }
+        JSONObject jsonObject = JSONObject.parseObject(skuInfo);
+        JSONObject version = jsonObject.getJSONObject("version");
+        return serveName + "-" +  version.get("name");
+    }
+
+    public String getServiceCycle() {
+        if (StringUtils.isBlank(skuInfo)) {
+            return "--";
+        }
+        JSONObject jsonObject = JSONObject.parseObject(skuInfo);
+        JSONObject period = jsonObject.getJSONObject("period");
+        return period.get("effect_time") + (String) period.get("name");
+    }
+}

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

+package com.gic.finance.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.gic.finance.constant.EnterprisePlatformTypeEnum;
+import com.gic.finance.constant.TransferAccountApprovalStatusEnum;
+import com.gic.finance.web.utils.DateUtils;
+
+/**
+ * 转账审批详情VO-服务、套餐包、拓展包
+ * @ClassName: TransferApprovalListVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/9 5:38 PM

+ */
+public class TransferApprovalServiceVO implements Serializable{
+
+    private static final long serialVersionUID = -4742066959808656137L;
+    private Integer transferApprovalId;
+
+    /**
+     * 关联订单平台方（商户类型）1:GIC 2: 好办
+     */
+    private Integer platformType;
+    /**
+     * 商户类型名称
+     */
+    private String platformTypeStr;
+
+    /**
+     * 计划金额
+     */
+    private Double plannedAmount;
+
+    /**
+     * 坏账金额
+     */
+    private Double badAmount;
+
+    /**
+     * 验证码
+     */
+    private String verifyCode;
+
+    /**
+     * 审批流水号
+     */
+    private String approvalNumber;
+
+    /**
+     * 审批状态 1:待审批 2:已取消 3:已驳回 4:审批通过
+     */
+    private Integer approvalStatus;
+    /**
+     * 审批状态 名称
+     */
+    private String approvalStatusStr;
+
+    /**
+     * 审批人姓名
+     */
+    private String approvalName;
+
+    /**
+     * 审批人手机号码
+     */
+    private String approvalPhone;
+
+    /**
+     * 审批人手机号国际区号
+     */
+    private String approvalPhoneAreaCode;
+
+    /**
+     * 审批时间
+     */
+    private Date approvalTime;
+
+    /**
+     * 支付流水号
+     */
+    private String payInfoSerialNumber;
+    /**
+     *
+     */
+    private Date createTime;
+    /**
+     * 商户名称
+     */
+    private String enterpriseName;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+    /**
+     * 到账金额
+     */
+    private Double accountAmount;
+    /**
+     * 总计费用
+     */
+    private Double totalCountFee;
+    /**
+     * 订单创建时间
+     */
+    private Date orderCreateTime;
+
+    /**
+     * 1购买 2续费 3升级 4扩容
+     */
+    private Integer orderType;
+    /**
+     * 订购类型
+     */
+    private String orderTypeStr;
+    /**
+     * 支付方式
+     */
+    private Integer payType;
+    /**
+     * 支付方式
+     */
+    private String payTypeStr;
+
+    /**
+     * 优惠方式
+     */
+    private ServiceDiscountVO serviceDiscountVO;
+    /**
+     * 服务信息
+     */
+    private List<ServiceInfoVO> serviceInfoVOList;
+    /**
+     * license信息
+     */
+    private List<LicenseVO> licenseVOList;
+    /**
+     * 拓展包
+     */
+    private List<ExpandPackageVO> expandPackageVOList;
+
+
+    public Integer getTransferApprovalId() {
+        return transferApprovalId;
+    }
+
+    public void setTransferApprovalId(Integer transferApprovalId) {
+        this.transferApprovalId = transferApprovalId;
+    }
+
+    public void setPlatformType(Integer platformType) {
+        this.platformType = platformType;
+    }
+
+    public String getPlatformTypeStr() {
+        return EnterprisePlatformTypeEnum.getMessageByCode(platformType);
+    }
+
+    public Double getPlannedAmount() {
+        return plannedAmount;
+    }
+
+    public void setPlannedAmount(Double plannedAmount) {
+        this.plannedAmount = plannedAmount;
+    }
+
+    public Double getBadAmount() {
+        return badAmount;
+    }
+
+    public void setBadAmount(Double badAmount) {
+        this.badAmount = badAmount;
+    }
+
+    public String getVerifyCode() {
+        return verifyCode;
+    }
+
+    public void setVerifyCode(String verifyCode) {
+        this.verifyCode = verifyCode;
+    }
+
+    public String getApprovalNumber() {
+        return approvalNumber;
+    }
+
+    public void setApprovalNumber(String approvalNumber) {
+        this.approvalNumber = approvalNumber;
+    }
+
+    public void setApprovalStatus(Integer approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getApprovalStatusStr() {
+        return TransferAccountApprovalStatusEnum.getMessageBuCode(approvalStatus);
+    }
+
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
+    }
+
+    public Long getApprovalTime() {
+        return DateUtils.dateToLong(approvalTime);
+    }
+
+    public void setApprovalTime(Date approvalTime) {
+        this.approvalTime = approvalTime;
+    }
+
+    public String getApprovalPhone() {
+        return approvalPhone;
+    }
+
+    public void setApprovalPhone(String approvalPhone) {
+        this.approvalPhone = approvalPhone;
+    }
+
+    public String getApprovalPhoneAreaCode() {
+        return approvalPhoneAreaCode;
+    }
+
+    public void setApprovalPhoneAreaCode(String approvalPhoneAreaCode) {
+        this.approvalPhoneAreaCode = approvalPhoneAreaCode;
+    }
+
+    public String getPayInfoSerialNumber() {
+        return payInfoSerialNumber;
+    }
+
+    public void setPayInfoSerialNumber(String payInfoSerialNumber) {
+        this.payInfoSerialNumber = payInfoSerialNumber;
+    }
+
+    public Long getCreateTime() {
+        return DateUtils.dateToLong(createTime);
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public Double getAccountAmount() {
+        return accountAmount;
+    }
+
+    public void setAccountAmount(Double accountAmount) {
+        this.accountAmount = accountAmount;
+    }
+
+    public Double getTotalCountFee() {
+        return totalCountFee;
+    }
+
+    public void setTotalCountFee(Double totalCountFee) {
+        this.totalCountFee = totalCountFee;
+    }
+
+    public Long getOrderCreateTime() {
+        return DateUtils.dateToLong(orderCreateTime);
+    }
+
+    public void setOrderCreateTime(Date orderCreateTime) {
+        this.orderCreateTime = orderCreateTime;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getOrderTypeStr() {
+        //1购买 2续费 3升级 4扩容
+        if (orderType == null) {
+            return "--";
+        }
+        if (orderType.intValue() == 1) {
+            return "购买";
+        } else if (orderType.intValue() == 2) {
+            return "续费";
+        } else if (orderType.intValue() == 3) {
+            return "升级";
+        } else if (orderType.intValue() == 4) {
+            return "扩容";
+        }
+        return "未知";
+    }
+
+    public void setOrderTypeStr(String orderTypeStr) {
+        this.orderTypeStr = orderTypeStr;
+    }
+
+    public Integer getPayType() {
+        return payType;
+    }
+
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
+
+    public String getPayTypeStr() {
+        if (payType == null) {
+            return "--";
+        }
+        switch (payType.intValue()) {
+            case 1:
+                return "余额";
+            case 2:
+                return "微信";
+            case 3:
+                return "支付宝";
+            case 4:
+                return "银行对公转账";
+            default:
+                return "未知";
+        }
+    }
+
+    public void setPayTypeStr(String payTypeStr) {
+        this.payTypeStr = payTypeStr;
+    }
+
+    public ServiceDiscountVO getServiceDiscountVO() {
+        return serviceDiscountVO;
+    }
+
+    public void setServiceDiscountVO(ServiceDiscountVO serviceDiscountVO) {
+        this.serviceDiscountVO = serviceDiscountVO;
+    }
+
+    public List<ServiceInfoVO> getServiceInfoVOList() {
+        return serviceInfoVOList;
+    }
+
+    public void setServiceInfoVOList(List<ServiceInfoVO> serviceInfoVOList) {
+        this.serviceInfoVOList = serviceInfoVOList;
+    }
+
+    public List<LicenseVO> getLicenseVOList() {
+        return licenseVOList;
+    }
+
+    public void setLicenseVOList(List<LicenseVO> licenseVOList) {
+        this.licenseVOList = licenseVOList;
+    }
+
+    public List<ExpandPackageVO> getExpandPackageVOList() {
+        return expandPackageVOList;
+    }
+
+    public void setExpandPackageVOList(List<ExpandPackageVO> expandPackageVOList) {
+        this.expandPackageVOList = expandPackageVOList;
+    }
+}

gic-platform-finance-web/src/main/resources/dubbo-gic-platform-finance-web.xml

@@ -55,4 +55,7 @@
     <dubbo:reference interface="com.gic.enterprise.service.BillingOrderApiService" id="billingOrderApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.enterprise.service.BillingRechargeRecordApiService" id="billingRechargeRecordApiService" timeout="60000" />
 
+    <!--开放给平台订单详情-->
+    <dubbo:reference interface="com.gic.open.api.service.OrderApiService" id="orderApiService" timeout="60000" />
+
 </beans>
\ No newline at end of file