zjh 2023/09/13---3

zjh

2023-09-13 4cce4fe37fbb35d554b8755e7842b0c7191471ac

zjh 2023/09/13---3

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

@@ -1325,8 +1325,11 @@
                        tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
                    }
                }
                map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
                map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));

                map.put("ordPrice", money1);
                map.put("nowPrice", money2);
            }
            list.add(map);
        }

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

@@ -233,9 +233,10 @@
        List<TjFlowingWater> list = tjFlowingWaterService.list(wq);
        for (TjFlowingWater tjFlowingWater : list1) {
            TjOrder tjOrder = tjOrderService.selectTjOrderByOrderId(tjFlowingWater.getOrderId());
            if(null !=tjOrder){
                TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
                tjFlowingWater.setCusName(MatchUtils.hideCusName(customer.getCusName()));

                if(null !=customer) tjFlowingWater.setCusName(MatchUtils.hideCusName(customer.getCusName()));
            }
        }
        map.put("list", list1);
        map.put("total",waterPage.getTotal());

 ltkj-admin/src/main/resources/application.yml

@@ -72,13 +72,14 @@
  # redis 配置
  redis:
    # 地址
    host: 101.42.27.146
#    host: 101.42.27.146
    host: 192.168.0.101
    # 端口，默认为6379
    port: 6379
    # 数据库索引
    database: 0
    # 密码
    password: 654321
#    password: 654321
    # 连接超时时间
    timeout: 60s
    lettuce: