|
@@ -349,7 +349,7 @@ public class UnifyOrderManager {
|
|
|
if(hasRights || hasPackages){
|
|
if(hasRights || hasPackages){
|
|
|
InsFeeOrders feeOrders = insFeeOrdersService.getById(underwritingVo.getOrder().getOrdersNo());
|
|
InsFeeOrders feeOrders = insFeeOrdersService.getById(underwritingVo.getOrder().getOrdersNo());
|
|
|
AssertionUtils.isFail(Objects.isNull(feeOrders),"费用信息不匹配");
|
|
AssertionUtils.isFail(Objects.isNull(feeOrders),"费用信息不匹配");
|
|
|
- checkAvailableAmount(feeOrders.getAvailableAmount(), underwritingVo.getInsOrderRightsInfoDto().getInsOrderRightsList(), underwritingVo.getInsOrderRightsInfoDto().getInsOrderRightsPackageList());
|
|
|
|
|
|
|
+ checkUsedAmount(feeOrders.getAvailableAmount(), underwritingVo.getInsOrderRightsInfoDto().getInsOrderRightsList(), underwritingVo.getInsOrderRightsInfoDto().getInsOrderRightsPackageList());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
UnderwritingResultsVo underwritingResultsVo = quoteService.underwriting(underwritingVo);
|
|
UnderwritingResultsVo underwritingResultsVo = quoteService.underwriting(underwritingVo);
|
|
@@ -628,9 +628,9 @@ public class UnifyOrderManager {
|
|
|
* @param rightsList
|
|
* @param rightsList
|
|
|
* @param rightsPackageList
|
|
* @param rightsPackageList
|
|
|
*/
|
|
*/
|
|
|
- private void checkAvailableAmount(BigDecimal availableAmount, List<InsOrderRightsDto> rightsList, List<InsOrderRightsPackageDto> rightsPackageList) {
|
|
|
|
|
|
|
+ private void checkUsedAmount(BigDecimal availableAmount, List<InsOrderRightsDto> rightsList, List<InsOrderRightsPackageDto> rightsPackageList) {
|
|
|
|
|
|
|
|
- // 权益金额大于 0,计算实际花费的权益金额并发放权益券
|
|
|
|
|
|
|
+ // 权益金额大于 0,计算实际花费的权益金额
|
|
|
if (availableAmount.compareTo(BigDecimal.ZERO) > 0) {
|
|
if (availableAmount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
// 初始化
|
|
// 初始化
|
|
|
BigDecimal rightsTotalAmount = BigDecimal.ZERO;//选中的权益券总价
|
|
BigDecimal rightsTotalAmount = BigDecimal.ZERO;//选中的权益券总价
|