Commit 15075285 by guojuxing

转账审批详情添加字段:描述信息

parent 662a5413
...@@ -126,6 +126,7 @@ public class TransferAccountsApprovalController { ...@@ -126,6 +126,7 @@ public class TransferAccountsApprovalController {
serviceInfoVO.setServeName(itemDTO.getServeName()); serviceInfoVO.setServeName(itemDTO.getServeName());
serviceInfoVO.setSkuInfo(itemDTO.getSkuInfo()); serviceInfoVO.setSkuInfo(itemDTO.getSkuInfo());
serviceInfoVO.setTotalAmount(itemDTO.getTotalAmount()); serviceInfoVO.setTotalAmount(itemDTO.getTotalAmount());
serviceInfoVO.setServeInfo(itemDTO.getServeInfo());
serviceInfoVOList.add(serviceInfoVO); serviceInfoVOList.add(serviceInfoVO);
} else if (itemDTO.getServeType() == 2) { } else if (itemDTO.getServeType() == 2) {
//license //license
...@@ -134,6 +135,7 @@ public class TransferAccountsApprovalController { ...@@ -134,6 +135,7 @@ public class TransferAccountsApprovalController {
licenseVO.setServeName(itemDTO.getServeName()); licenseVO.setServeName(itemDTO.getServeName());
licenseVO.setTotalAmount(itemDTO.getTotalAmount()); licenseVO.setTotalAmount(itemDTO.getTotalAmount());
licenseVO.setServeQuantity(itemDTO.getServeQuantity()); licenseVO.setServeQuantity(itemDTO.getServeQuantity());
licenseVO.setServeInfo(itemDTO.getServeInfo());
licenseVOList.add(licenseVO); licenseVOList.add(licenseVO);
} else if (itemDTO.getServeType() == 3) { } else if (itemDTO.getServeType() == 3) {
//拓展包 //拓展包
...@@ -142,6 +144,7 @@ public class TransferAccountsApprovalController { ...@@ -142,6 +144,7 @@ public class TransferAccountsApprovalController {
expandPackageVO.setServeName(itemDTO.getServeName()); expandPackageVO.setServeName(itemDTO.getServeName());
expandPackageVO.setServeQuantity(itemDTO.getServeQuantity()); expandPackageVO.setServeQuantity(itemDTO.getServeQuantity());
expandPackageVO.setTotalAmount(itemDTO.getTotalAmount()); expandPackageVO.setTotalAmount(itemDTO.getTotalAmount());
expandPackageVO.setServeInfo(itemDTO.getServeInfo());
expandPackageVOList.add(expandPackageVO); expandPackageVOList.add(expandPackageVO);
} }
} }
......
...@@ -32,6 +32,11 @@ public class ExpandPackageVO implements Serializable{ ...@@ -32,6 +32,11 @@ public class ExpandPackageVO implements Serializable{
*/ */
private String imageUrl; private String imageUrl;
/**
*
*/
private String serveInfo;
public String getServeName() { public String getServeName() {
return serveName; return serveName;
...@@ -64,4 +69,12 @@ public class ExpandPackageVO implements Serializable{ ...@@ -64,4 +69,12 @@ public class ExpandPackageVO implements Serializable{
public void setImageUrl(String imageUrl) { public void setImageUrl(String imageUrl) {
this.imageUrl = imageUrl; this.imageUrl = imageUrl;
} }
public String getServeInfo() {
return serveInfo;
}
public void setServeInfo(String serveInfo) {
this.serveInfo = serveInfo;
}
} }
...@@ -19,6 +19,11 @@ public class LicenseVO implements Serializable{ ...@@ -19,6 +19,11 @@ public class LicenseVO implements Serializable{
private String serveName; private String serveName;
/** /**
*
*/
private String serveInfo;
/**
* 订单原价 * 订单原价
*/ */
private BigDecimal totalAmount; private BigDecimal totalAmount;
...@@ -29,6 +34,14 @@ public class LicenseVO implements Serializable{ ...@@ -29,6 +34,14 @@ public class LicenseVO implements Serializable{
private String licenseUnit; private String licenseUnit;
public String getServeInfo() {
return serveInfo;
}
public void setServeInfo(String serveInfo) {
this.serveInfo = serveInfo;
}
public String getServeName() { public String getServeName() {
return serveName; return serveName;
} }
......
...@@ -22,6 +22,10 @@ public class ServiceInfoVO implements Serializable{ ...@@ -22,6 +22,10 @@ public class ServiceInfoVO implements Serializable{
private String serveName; private String serveName;
private String skuInfo; private String skuInfo;
/**
*
*/
private String serveInfo;
/** /**
* 服务描述 * 服务描述
...@@ -70,4 +74,12 @@ public class ServiceInfoVO implements Serializable{ ...@@ -70,4 +74,12 @@ public class ServiceInfoVO implements Serializable{
JSONObject period = jsonObject.getJSONObject("period"); JSONObject period = jsonObject.getJSONObject("period");
return period.get("effect_time") + (String) period.get("name"); return period.get("effect_time") + (String) period.get("name");
} }
public String getServeInfo() {
return serveInfo;
}
public void setServeInfo(String serveInfo) {
this.serveInfo = serveInfo;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment