| | |
| | | project.getProId()); |
| | | String s = tjFlowingWaterService.getDiscount(OrderId); |
| | | if(null !=decimal){ |
| | | project.setProPrice(decimal.setScale(2)); |
| | | project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2)); |
| | | // project.setProPrice(decimal.setScale(2)); |
| | | project.setProPrice(decimal); |
| | | // project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2)); |
| | | project.setProOrdPrice(decimal); |
| | | }else { |
| | | BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId()); |
| | | if(null !=decimal1){ |