From 44e3361d27c7ea8d1fdb77b47e9948deeb6492b1 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Thu, 23 Feb 2023 09:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hai/config/CommonSysConfig.java     | 1 +
 .../java/com/hai/service/impl/HighGasServiceImpl.java     | 8 ++++----
 .../src/main/resources/prod/commonConfig.properties       | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hai-service/src/main/java/com/hai/config/CommonSysConfig.java b/hai-service/src/main/java/com/hai/config/CommonSysConfig.java
index d772ca1f..42c04a32 100644
--- a/hai-service/src/main/java/com/hai/config/CommonSysConfig.java
+++ b/hai-service/src/main/java/com/hai/config/CommonSysConfig.java
@@ -16,6 +16,7 @@ public class CommonSysConfig {
 
     // 加油站默认图片
     private String gasDefaultOilStationImg;
+    private String gasDefaultOilStationImg2;
 
     // 重庆中石油
     private String ChongQingCnpcUrl;             // 请求地址
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasServiceImpl.java
index a01857fd..a1f5be1b 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighGasServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighGasServiceImpl.java
@@ -80,7 +80,7 @@ public class HighGasServiceImpl implements HighGasService {
                     store.setCompanyId(merchant.getCompanyId());
                     store.setStoreKey(station.getString("stationCode"));
                     store.setStoreName(station.getString("stationName"));
-                    store.setStoreLogo(CommonSysConst.getSysConfig().getGasDefaultOilStationImg());
+                    store.setStoreLogo(CommonSysConst.getSysConfig().getGasDefaultOilStationImg2());
                     store.setRegionId(station.getLong("provinceId"));
                     store.setRegionName(station.getString("provinceName"));
                     store.setAddress(station.getString("stationAddress"));
@@ -186,7 +186,7 @@ public class HighGasServiceImpl implements HighGasService {
                     store.setCompanyId(merchant.getCompanyId());
                     store.setStoreKey(station.getString("stationCode"));
                     store.setStoreName(station.getString("stationName"));
-                    store.setStoreLogo(CommonSysConst.getSysConfig().getGasDefaultOilStationImg());
+                    store.setStoreLogo(CommonSysConst.getSysConfig().getGasDefaultOilStationImg2());
                     store.setRegionId(station.getLong("provinceId"));
                     store.setRegionName(station.getString("provinceName"));
                     store.setAddress(station.getString("stationAddress"));
@@ -279,7 +279,7 @@ public class HighGasServiceImpl implements HighGasService {
                     store.setCompanyId(merchant.getCompanyId());
                     store.setStoreKey(station.getString("stationCode"));
                     store.setStoreName(station.getString("stationName"));
-                    store.setStoreLogo(CommonSysConst.getSysConfig().getGasDefaultOilStationImg());
+                    store.setStoreLogo(CommonSysConst.getSysConfig().getGasDefaultOilStationImg2());
                     store.setRegionId(station.getLong("provinceId"));
                     store.setRegionName(station.getString("provinceName"));
                     store.setAddress(station.getString("stationAddress"));
@@ -389,7 +389,7 @@ public class HighGasServiceImpl implements HighGasService {
                     store.setCompanyId(merchant.getCompanyId());
                     store.setStoreKey(station.getString("stationCode"));
                     store.setStoreName(station.getString("stationName"));
-                    store.setStoreLogo(CommonSysConst.getSysConfig().getGasDefaultOilStationImg());
+                    store.setStoreLogo(CommonSysConst.getSysConfig().getGasDefaultOilStationImg2());
                     store.setRegionId(station.getLong("provinceId"));
                     store.setRegionName(station.getString("provinceName"));
                     store.setAddress(station.getString("stationAddress"));
diff --git a/hai-service/src/main/resources/prod/commonConfig.properties b/hai-service/src/main/resources/prod/commonConfig.properties
index e7ef7de5..fb1ef8e8 100644
--- a/hai-service/src/main/resources/prod/commonConfig.properties
+++ b/hai-service/src/main/resources/prod/commonConfig.properties
@@ -1,5 +1,6 @@
 hsgDomainName=https://hsg.dctpay.com
 gasDefaultOilStationImg=https://hsg.dctpay.com/filesystem/default/default_oil_station.jpg
+gasDefaultOilStationImg2=https://hsg.dctpay.com/filesystem/default/default_oil_station2.jpg
 
 # ChongQingCNPC configuration parameters
 ChongQingCnpcUrl=http://cqpingan.wisdomyt.cn/d/cross/api