费用计算;
This commit is contained in:
+3
-4
@@ -179,8 +179,8 @@ public class ContractManageApplicationService {
|
||||
return null;
|
||||
}
|
||||
|
||||
public List<Map<String, Object>> getSubjectAndPrice(SubjectAndPriceDTO contractManageDTO) {
|
||||
List<Map<String, Object>> result = new ArrayList<>();
|
||||
public List<SubjectAndPriceReturn> getSubjectAndPrice(SubjectAndPriceDTO contractManageDTO) {
|
||||
List<SubjectAndPriceReturn> result = new ArrayList<>();
|
||||
Long settlementCustomersId = contractManageDTO.getSettlementCustomersId();
|
||||
Long organizationId = contractManageDTO.getOrganizationId();
|
||||
String sunjectCode = contractManageDTO.getSubjectCode();
|
||||
@@ -225,7 +225,6 @@ public class ContractManageApplicationService {
|
||||
if (fieldsName != null && ("装卸费单价".equals(fieldsName) ||
|
||||
"纸箱贴标单价".equals(fieldsName)||"木箱贴标单价".equals(fieldsName)
|
||||
|| "进出仓操作费单价".equals(fieldsName))) {
|
||||
Map<String, Object> subjectAndPrice = new HashMap<>();
|
||||
Integer sort = (Integer) stringObjectMap.get("sort");
|
||||
String chargingId = (String) stringObjectMap.get("chargingId");
|
||||
String fields = (String) stringObjectMap.get("fields");
|
||||
@@ -236,7 +235,7 @@ public class ContractManageApplicationService {
|
||||
subjectAndPriceReturn.setChargingId(chargingId);
|
||||
subjectAndPriceReturn.setFields(fields);
|
||||
subjectAndPriceReturn.setBillingRulesId(billingRulesId);
|
||||
result.add(subjectAndPrice);
|
||||
result.add(subjectAndPriceReturn);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user