From 1b565faba01a98f90126ecedc69fa71d09ef2501 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 18 Jan 2023 11:34:24 +0800
Subject: [PATCH] Merge branch 'master' into 2.0-dev
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* master:
  修改配置星巴克 肯德基 会员充值 话费 微信商户号
  修改配置星巴克 肯德基 会员充值 话费 微信商户号

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
#	hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
---
 .../com/hai/service/impl/OutRechargeOrderServiceImpl.java   | 2 +-
 v1/src/main/java/com/v1/controller/GzSinopecController.java | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
index 44b84ac4..de5cae8e 100644
--- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
@@ -194,7 +194,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
     }
 
     @Override
-    @Cached(cacheType = CacheType.REMOTE,name="order:", key = "#orderNo",expire = 3600*24*30)
+    @Cached(cacheType = CacheType.REMOTE,name="mobile:", key = "#orderNo",expire = 3600*24*30)
     public OutRechargeOrder findByOrderNo(String orderNo) {
 
         OutRechargeOrderExample example = new OutRechargeOrderExample();
diff --git a/v1/src/main/java/com/v1/controller/GzSinopecController.java b/v1/src/main/java/com/v1/controller/GzSinopecController.java
index ef035b1a..b5a019a7 100644
--- a/v1/src/main/java/com/v1/controller/GzSinopecController.java
+++ b/v1/src/main/java/com/v1/controller/GzSinopecController.java
@@ -40,12 +40,6 @@ public class  GzSinopecController {
 
     private static Logger log = LoggerFactory.getLogger(GzSinopecController.class);
 
-    @Resource
-    private HighOpenApiService highOpenApiService;
-
-    @Resource
-    private HighUserService highUserService;
-
     @Resource
     private ApiMerchantsService apiMerchantsService;