|
@@ -1024,7 +1024,6 @@ public class TKSimpleService {
|
|
|
tkCiKindVo.setBjSelect("0");
|
|
tkCiKindVo.setBjSelect("0");
|
|
|
tkCiKindVo.setDeductibleAmount(BigDecimal.ZERO);
|
|
tkCiKindVo.setDeductibleAmount(BigDecimal.ZERO);
|
|
|
tkCiKindVo.setIsSelect("0");
|
|
tkCiKindVo.setIsSelect("0");
|
|
|
- tkCiKindVo.setQuantity(0);
|
|
|
|
|
tkCiKindVo.setQuoteAmountCN("不投保");
|
|
tkCiKindVo.setQuoteAmountCN("不投保");
|
|
|
})
|
|
})
|
|
|
.collect(Collectors.toMap(TKCiKindsVo::getKindCode, Function.identity()));
|
|
.collect(Collectors.toMap(TKCiKindsVo::getKindCode, Function.identity()));
|
|
@@ -1040,13 +1039,13 @@ public class TKSimpleService {
|
|
|
tkCiKindVo.setQuoteAmount(commonBiKindInfoVo.getAmount());
|
|
tkCiKindVo.setQuoteAmount(commonBiKindInfoVo.getAmount());
|
|
|
tkCiKindVo.setQuoteAmountCN(commonBiKindInfoVo.getAmount());
|
|
tkCiKindVo.setQuoteAmountCN(commonBiKindInfoVo.getAmount());
|
|
|
|
|
|
|
|
- // 设置数量:优先使用 quantity,其次使用 serviceTimes
|
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(commonBiKindInfoVo.getUnitAmount())) {
|
|
|
|
|
+ tkCiKindVo.setUnitAmount(new BigDecimal(commonBiKindInfoVo.getUnitAmount()));
|
|
|
|
|
+ tkCiKindVo.setUnitAmountCN(commonBiKindInfoVo.getUnitAmount());
|
|
|
|
|
+ }
|
|
|
String quantity = commonBiKindInfoVo.getQuantity();
|
|
String quantity = commonBiKindInfoVo.getQuantity();
|
|
|
- String serviceTimes = commonBiKindInfoVo.getServiceTimes();
|
|
|
|
|
if (StringUtils.isNotBlank(quantity)) {
|
|
if (StringUtils.isNotBlank(quantity)) {
|
|
|
tkCiKindVo.setQuantity(Integer.parseInt(quantity));
|
|
tkCiKindVo.setQuantity(Integer.parseInt(quantity));
|
|
|
- } else if (StringUtils.isNotBlank(serviceTimes)) {
|
|
|
|
|
- tkCiKindVo.setQuantity(Integer.parseInt(serviceTimes));
|
|
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|