Commit eed64855 by guojuxing

转账审批详情修改:原价改成销售价

parent cc5f9c9d
...@@ -129,7 +129,8 @@ public class TransferAccountsApprovalController { ...@@ -129,7 +129,8 @@ public class TransferAccountsApprovalController {
ServiceInfoVO serviceInfoVO = new ServiceInfoVO(); ServiceInfoVO serviceInfoVO = new ServiceInfoVO();
serviceInfoVO.setServeName(itemDTO.getServeName()); serviceInfoVO.setServeName(itemDTO.getServeName());
serviceInfoVO.setSkuInfo(itemDTO.getSkuInfo()); serviceInfoVO.setSkuInfo(itemDTO.getSkuInfo());
serviceInfoVO.setTotalAmount(itemDTO.getTotalAmount()); //销售价
serviceInfoVO.setTotalAmount(itemDTO.getSaleAmount());
serviceInfoVO.setServeInfo(itemDTO.getServeInfo()); serviceInfoVO.setServeInfo(itemDTO.getServeInfo());
serviceInfoVO.setApplicationId(itemDTO.getApplicationId()); serviceInfoVO.setApplicationId(itemDTO.getApplicationId());
serviceInfoVOList.add(serviceInfoVO); serviceInfoVOList.add(serviceInfoVO);
...@@ -138,7 +139,8 @@ public class TransferAccountsApprovalController { ...@@ -138,7 +139,8 @@ public class TransferAccountsApprovalController {
LicenseVO licenseVO = new LicenseVO(); LicenseVO licenseVO = new LicenseVO();
licenseVO.setLicenseUnit(itemDTO.getLicenseUnit()); licenseVO.setLicenseUnit(itemDTO.getLicenseUnit());
licenseVO.setServeName(itemDTO.getServeName()); licenseVO.setServeName(itemDTO.getServeName());
licenseVO.setTotalAmount(itemDTO.getTotalAmount()); //销售价
licenseVO.setTotalAmount(itemDTO.getSaleAmount());
licenseVO.setServeQuantity(itemDTO.getServeQuantity()); licenseVO.setServeQuantity(itemDTO.getServeQuantity());
licenseVO.setServeInfo(itemDTO.getServeInfo()); licenseVO.setServeInfo(itemDTO.getServeInfo());
licenseVO.setApplicationId(itemDTO.getApplicationId()); licenseVO.setApplicationId(itemDTO.getApplicationId());
...@@ -149,7 +151,8 @@ public class TransferAccountsApprovalController { ...@@ -149,7 +151,8 @@ public class TransferAccountsApprovalController {
expandPackageVO.setImageUrl(itemDTO.getImageUrl()); expandPackageVO.setImageUrl(itemDTO.getImageUrl());
expandPackageVO.setServeName(itemDTO.getServeName()); expandPackageVO.setServeName(itemDTO.getServeName());
expandPackageVO.setServeQuantity(itemDTO.getServeQuantity()); expandPackageVO.setServeQuantity(itemDTO.getServeQuantity());
expandPackageVO.setTotalAmount(itemDTO.getTotalAmount()); //销售价
expandPackageVO.setTotalAmount(itemDTO.getSaleAmount());
expandPackageVO.setServeInfo(itemDTO.getServeInfo()); expandPackageVO.setServeInfo(itemDTO.getServeInfo());
expandPackageVOList.add(expandPackageVO); expandPackageVOList.add(expandPackageVO);
} }
......
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