xiugai

YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -138,28 +138,13 @@ public class AppUserInfoController {
             if(m !=null && m.containsKey("gzhAppId") && m.containsKey("gzhAppSecret")){
                 gzhAppId = m.get("gzhAppId");
                 gzhAppSecret = m.get("gzhAppSecret");
-                //accessToken  = this.getTokenByRedisCache(gzhAppId, gzhAppSecret);
                 net.sf.json.JSONObject gzhAuthorizeInfo = WeiXinUserUtil.getGzhAuthorizeInfo(gzhAppId, gzhAppSecret, code);
-                if(!redisCacheUtil.hasKey(gzhAppId)){
-                    if(gzhAuthorizeInfo.containsKey("access_token")){
-                        redisCacheUtil.setCacheObject(gzhAppId, gzhAuthorizeInfo.get("access_token"));
-                        redisCacheUtil.expire(gzhAppId, 7200, TimeUnit.SECONDS);
-                        logger.info("第一次获取Redis缓存中access_token信息: " + redisCacheUtil.getCacheObject(gzhAppId));
-                    }
-                }
-                logger.info("token已在Redis缓存中的access_token信息: " + redisCacheUtil.getCacheObject(gzhAppId));
-
-                Map<String, Object> result = new HashMap<>();
-                if(gzhAuthorizeInfo.containsKey("openid")){
-                    result.put("openId", gzhAuthorizeInfo.get("openid"));
-                }
-                if(gzhAuthorizeInfo.containsKey("unionid")){
-                    result.put("unionId", gzhAuthorizeInfo.get("unionid"));
-                }
-                resultData = ResultData.success(result);
+                resultData = ResultData.success(gzhAuthorizeInfo);
+            }else {
+                resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
             }
         }else {
-            resultData = ResultData.success(CodeMsg.REQUEST_FAIL);
+            resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
         }
         return gson.toJson(resultData);
     }
@@ -172,7 +157,6 @@ public class AppUserInfoController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        //Map<String, String> map= new HashMap<>();
         if(openId !=null && stationId !=null){
             String gzhAppId ="";
             String gzhAppSecret ="";
@@ -181,16 +165,12 @@ public class AppUserInfoController {
             if(m !=null && m.containsKey("gzhAppId") && m.containsKey("gzhAppSecret")){
                 gzhAppId = m.get("gzhAppId");
                 gzhAppSecret = m.get("gzhAppSecret");
-                //accessToken  = this.getTokenByRedisCache(gzhAppId, gzhAppSecret);
-                if(redisCacheUtil.hasKey(gzhAppId)){
-                    accessToken =redisCacheUtil.getCacheObject(gzhAppId);
-                }
+                accessToken  = this.getTokenByRedisCache(gzhAppId, gzhAppSecret);
                 net.sf.json.JSONObject unionIdInfo = WeiXinUserUtil.getUnionIdInfo(accessToken, openId);
                 resultData=ResultData.success(unionIdInfo);
             }
-
         }else {
-            resultData=ResultData.success(CodeMsg.REQUEST_FAIL);
+            resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
         }
         return gson.toJson(resultData);
     }

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -1,7 +1,6 @@
 package com.platform.yijia.controller;
 
 import com.google.gson.Gson;
-import com.platform.yijia.param.request.PayInfoRequest;
 import com.platform.yijia.param.request.RechargeBalance;
 import com.platform.yijia.pojo.CustomerCardUseRecord;
 import com.platform.yijia.pojo.CustomerElectronicCard;