财务管理订购详情修改

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

@@ -90,7 +90,19 @@ public class ServiceInfoVO implements Serializable{
         }
         JSONObject jsonObject = JSONObject.parseObject(skuInfo);
         JSONObject period = jsonObject.getJSONObject("period");
-        return period.get("effect_time") + (String) period.get("name");
+        Integer unitNum = (Integer) period.get("effect_time_unit");
+        String unit = "";
+        if (unitNum != null) {
+            unit = unitNum.toString();
+        }
+        if ("3".equals(unit)) {
+            unit = "年";
+        } else if("2".equals(unit)) {
+            unit = "月";
+        } else {
+            unit =  "天";
+        }
+        return period.get("effect_time") + unit;
     }
 
     public String getServeInfo() {

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

@@ -332,16 +332,16 @@ public class TransferApprovalServiceVO implements Serializable{
 
     public String getRelationOrderTypeStr() {
         //1购买 2续费 3升级 4扩容
-        if (orderType == null) {
+        if (relationOrderType == null) {
             return "--";
         }
-        if (orderType.intValue() == 1) {
+        if (relationOrderType.intValue() == 1) {
             return "服务开通";
-        } else if (orderType.intValue() == 2) {
+        } else if (relationOrderType.intValue() == 2) {
             return "服务续费";
-        } else if (orderType.intValue() == 3) {
+        } else if (relationOrderType.intValue() == 3) {
             return "版本升级";
-        } else if (orderType.intValue() == 4) {
+        } else if (relationOrderType.intValue() == 4) {
             return "license扩容";
         }
         return "未知";