zjh
2023-09-13 d288985f9efd973f5455a42607b043e32da5fe91
zjh 2023/09/13---1
2个文件已修改
36 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -959,15 +959,17 @@
                                    TbTransition tbTransition = new TbTransition();
                                    tbTransition.setCusId(cusId);
                                    tbTransition.setPacId(pacId);
                                    if (null != tjProject.getProPrice()) {
                                        tbTransition.setOrdPrice(tjProject.getProPrice());
                                    } else {
                                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
                                    }
//                                    if (null != tjProject.getProPrice()) {
//                                        tbTransition.setOrdPrice(tjProject.getProPrice());
//                                    } else {
//                                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
//                                    }
                                    if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
                                        tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_UP));
                                        tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
                                        tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
                                    } else {
                                        tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
                                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
                                    }
                                    tbTransition.setParentProId(project.getProId());
                                    tbTransition.setParentProName(project.getProName());
@@ -1531,4 +1533,12 @@
        }
        return AjaxResult.success(aaa);
    }
    @PostMapping("/deletedTbTransitionByCusId")
    @ApiOperation(value = "根据身份证号删除临时表数据")
    public AjaxResult deletedTbTransitionByCusId(@RequestBody String cusId) {
        transitionService.deletedTbTransitionByCusId(cusId);
        return AjaxResult.success();
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java
@@ -820,15 +820,17 @@
                        TbTransition tbTransition = new TbTransition();
                        tbTransition.setCusId(cusId);
                        tbTransition.setPacId(pacId);
                        if (null != tjProject.getProPrice()) {
                            tbTransition.setOrdPrice(tjProject.getProPrice());
                        } else {
                            tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
                        }
//                        if (null != tjProject.getProPrice()) {
//                            tbTransition.setOrdPrice(tjProject.getProPrice());
//                        } else {
//                            tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
//                        }
                        if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
                            tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2,RoundingMode.HALF_UP));
                            tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2,RoundingMode.HALF_DOWN));
                            tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2,RoundingMode.HALF_DOWN));
                        } else {
                            tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
                            tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
                        }
                        tbTransition.setParentProId(project.getProId());
                        tbTransition.setParentProName(project.getProName());