lige
2024-01-24 a2d12d52275c9fc34277d3e41c662a5ea9fb597f
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -560,8 +560,10 @@
                                    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){