zjh20250108

zjh

2025-01-08 9f087e0cdec5679b2a2c3b16ad0115196f32d15b

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java

@@ -242,6 +242,11 @@
        if (null != tjFlowingWater.getTjProIds() && tjFlowingWater.getTjProIds().length > 0) {
            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() +SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
            tjFlowingWater.setIsAddition("Y");
            if(tjFlowingWater.getPayStasus().toString().equals("0")){
                tjFlowingWater.setPayStasus(0L);
            }else {
                tjFlowingWater.setPayStasus(1L);
            }
            if (tjFlowingWaterService.save(tjFlowingWater)) {

                Date dates = new Date();
@@ -253,8 +258,11 @@
                    return AjaxResult.error();
                }

                if(tjFlowingWater.getPayStasus().equals(1L)){
                    detailService.updateTjOrderDetailsFlowingWaterIdByJxbz(order.getOrderId().toString(), jxbz, tjFlowingWater.getTjSerialNumber().toString());
                    remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(), jxbz, tjFlowingWater.getTjSerialNumber().toString());
                }else {
                String s = configService.selectConfigByKey("is_request_common_his_api");
//                if (null != s && s.equals("Y") && order.getTjType().equals("2")) {
                if (null != s && s.equals("Y")) {
                    String apiUrl = configService.selectConfigByKey("common_api_url");
                    String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
@@ -320,10 +328,7 @@
                        return AjaxResult.error();
                    }
                }
//                if(!b){
//                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                }
                //extracted(tjFlowingWater, order, customer);
                }
                Map<String, Object> map = new HashMap<>();
                map.put("waterId", tjFlowingWater.getWaterId());
                map.put("mobanId", reportService.getMoBanIds());