|
|
@@ -219,18 +219,18 @@ public class PromotionManagerImpl extends AbstractManagewManager implements Prom |
|
|
|
CommonFee passFee = copyProperties(m, new CommonFee()); |
|
|
|
responseDTO.setPassFee(passFee); |
|
|
|
}); |
|
|
|
//===================================注销违约金========================================== |
|
|
|
//===================================通行费违约金========================================== |
|
|
|
//注销违约金只有一种,不分收费类型,所以key建是null |
|
|
|
Optional.ofNullable(allPay.get(FeeCategory.PASS_DEFAULT)).map(m -> m.get(null)).ifPresent(m -> { |
|
|
|
CommonFee cancelDefault = copyProperties(m, new CommonFee()); |
|
|
|
responseDTO.setCancelDefault(cancelDefault); |
|
|
|
responseDTO.setPassDefault(cancelDefault); |
|
|
|
}); |
|
|
|
|
|
|
|
//===================================通行费违约金========================================= |
|
|
|
//===================================注销违约金========================================= |
|
|
|
//通行费违约金只有一种,不分收费类型,所以key建是null |
|
|
|
Optional.ofNullable(allPay.get(FeeCategory.ZX_DEFAULT)).map(m -> m.get(null)).ifPresent(m -> { |
|
|
|
CommonFee passDefault = copyProperties(m, new CommonFee()); |
|
|
|
responseDTO.setPassDefault(passDefault); |
|
|
|
responseDTO.setCancelDefault(passDefault); |
|
|
|
}); |
|
|
|
//将推广产品的信息复制 |
|
|
|
copyProperties(promotion, responseDTO); |