修改

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

@@ -159,11 +159,14 @@ public class AppUserInfoController {
                     gzhAppSecret = m.get("gzhAppSecret");
                     accessToken  = this.getTokenByRedisCache(gzhAppId, gzhAppSecret);
                     net.sf.json.JSONObject unionIdInfo = WeiXinUserUtil.getUnionIdInfo(accessToken, openId);
-                    if(unionIdInfo.containsKey("subscribe") && unionIdInfo.get("subscribe").equals("1")){
+                    logger.info("用户公众号信息：" + unionIdInfo);
+                    if(unionIdInfo.containsKey("subscribe") && unionIdInfo.get("subscribe").equals(1)){
                         resultData = ResultData.success(CodeMsg.SUCCESS);
                     }else {
                         resultData = ResultData.error(CodeMsg.NO_FollowGzh);
                     }
+                }else {
+                    resultData = ResultData.error(CodeMsg.SEARCH_APPID_FAIL);
                 }
             }else {
                 resultData = ResultData.error(CodeMsg.USERGZHINFO_EXSIST);
@@ -252,17 +255,15 @@ public class AppUserInfoController {
      */
     public String getTokenByRedisCache(String appId, String appSecret){
         logger.info("appId参数: "+ appId+" ;appSecret参数: " +appSecret);
-        String tokenCache ="";
-        if(!redisCacheUtil.hasKey(appId)){
+        if(!redisCacheUtil.hasKey(appId) || redisCacheUtil.getCacheObject(appId) ==null || redisCacheUtil.getCacheObject(appId).equals("")){
             String token = WeiXinUserUtil.getToken(appId, appSecret).getAccessToken();
             redisCacheUtil.setCacheObject(appId, token);
             redisCacheUtil.expire(appId, 7200, TimeUnit.SECONDS);
-            tokenCache = token;
-            logger.info("Redis缓存中token信息: " + tokenCache);
+            logger.info("Redis缓存中token信息: " + token);
+            return token;
         }else {
-            tokenCache = redisCacheUtil.getCacheObject(appId);
+            return redisCacheUtil.getCacheObject(appId);
         }
-        return tokenCache;
     }
 
     /*

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

@@ -113,7 +113,7 @@ public class CustomerGradeController {
                     }else{
                         //直降表查询 升序取第一个
                         List<Map> customerGradeList = customerGradeServices.getCustomerGradeList(params);
-                        resultData = ResultData.success(customerGradeList.get(0));
+                        resultData = ResultData.success(customerGradeList);
                     }
                 }else {
                     //此处重新赋值123的原因：station_pay表取值 1 2 3 4 分别代表 等级直降 满减 立减 直降； 而 在markert_plan 1 2 3代表 满减 立减 直降

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

@@ -791,7 +791,7 @@ public class PayController {
                             params.put("stationId", infoMap.get("stationId").toString());
                             params.put("oilGunNo", infoMap.get("oilGun").toString());
                             Map m = stationOilGunService.getPrinterSnByStationIdAndOilGunNo(params);
-                            if(m.containsKey("printerSn") && m.get("printerSn").toString()!= null && m.get("printerSn").toString()!=""){
+                            if(m !=null && m.containsKey("printerSn") && m.get("printerSn").toString()!= null && m.get("printerSn").toString()!=""){
                                 sn = m.get("printerSn").toString();
 //                                //查询打印机的状态
 //                                JSONObject jsonPrintStatus = JSONObject.parseObject(FeiEPrinterUtil.queryPrinterStatus(sn));
@@ -866,7 +866,7 @@ public class PayController {
             String[] datePickerTimeArray ={};
             String integralActivity = integralRuleList.get(0).getIntegralActivity();
             String integralProportion =null;
-            if(integralActivity.equals("1")){
+            if(integralActivity !=null && integralActivity.equals("1")){
                 datePickerTime = integralRuleList.get(0).getDatePickerTime();
                 integralProportion = integralRuleList.get(0).getIntegralProportion();
                 if(datePickerTime.contains(",")){
@@ -893,7 +893,7 @@ public class PayController {
                                     divide = calculateIntegral.getAmt().divide(integralRuleDetail.getSaleAmt(), 0, BigDecimal.ROUND_HALF_DOWN);
                                     multiply = divide.multiply(integralRuleDetail.getIntegral());
                                 }
-                                if(integralActivity.equals("1") &&  datePickerTimeArray !=null && integralProportion !=null){
+                                if(integralActivity !=null && integralActivity.equals("1") &&  datePickerTimeArray !=null && integralProportion !=null){
                                     String datePicker = integralRuleList.get(0).getDatePicker();
                                     switch (datePicker){
                                         case "1":   //  1.按周来
@@ -933,7 +933,7 @@ public class PayController {
                                     divide = calculateIntegral.getReceivableAmt().divide(integralRuleDetail.getSaleAmt(), 0, BigDecimal.ROUND_HALF_DOWN);
                                     multiply = divide.multiply(integralRuleDetail.getIntegral());
                                 }
-                                if(integralActivity.equals("1") && datePickerTimeArray !=null && integralProportion !=null){
+                                if(integralActivity !=null && integralActivity.equals("1") && datePickerTimeArray !=null && integralProportion !=null){
                                     String datePicker = integralRuleList.get(0).getDatePicker();
                                     switch (datePicker){
                                         case "1":   //  1.按周来
@@ -973,7 +973,7 @@ public class PayController {
                                     divide = calculateIntegral.getOilLiters().divide(integralRuleDetail.getSaleAmt(), 0, BigDecimal.ROUND_HALF_DOWN);
                                     multiply = divide.multiply(integralRuleDetail.getIntegral());
                                 }
-                                if(integralActivity.equals("1") && datePickerTimeArray !=null && integralProportion !=null){
+                                if(integralActivity !=null && integralActivity.equals("1") && datePickerTimeArray !=null && integralProportion !=null){
                                     String datePicker = integralRuleList.get(0).getDatePicker();
                                     switch (datePicker){
                                         case "1":   //  1.按周来
@@ -1014,7 +1014,7 @@ public class PayController {
                                 divide = calculateIntegral.getReceivableAmt().divide(integralRuleDetail.getSaleAmt(), 0, BigDecimal.ROUND_HALF_DOWN);
                                 multiply = divide.multiply(integralRuleDetail.getIntegral());
                             }
-                            if(integralActivity.equals("1") && datePickerTimeArray !=null && integralProportion !=null){
+                            if(integralActivity !=null && integralActivity.equals("1") && datePickerTimeArray !=null && integralProportion !=null){
                                 String datePicker = integralRuleList.get(0).getDatePicker();    //获取日期类型
                                 switch (datePicker){
                                     case "1":   //  1.按周来

YijiaRestful/src/main/java/com/platform/yijia/utils/CodeMsg.java

@@ -18,7 +18,7 @@ public class CodeMsg {
     public static CodeMsg CHECK_DATA_ERROR = new CodeMsg(-6,"数据不一致");
     public static CodeMsg SEARCH_FAIL = new CodeMsg(001,"查询失败");
     public static CodeMsg INSERT_FAIL = new CodeMsg(001,"添加失败");
-
+    public static CodeMsg SEARCH_APPID_FAIL = new CodeMsg(-1,"油站公众号配置不完善");
     public static CodeMsg DELETE_FAIL = new CodeMsg(003,"删除失败");
     public static CodeMsg UPDATE_FAIL = new CodeMsg(004,"修改失败");
     public static CodeMsg REQUEST_FAIL = new CodeMsg(005,"传参失败");

YijiaRestful/src/main/resources/mapper/CustomerPointsMapper.xml

@@ -198,15 +198,18 @@
   <!--判断是否存在-->
   <select id="isExistCustomerPointsInfo" resultType="int" parameterType="com.platform.yijia.pojo.CustomerPoints">
     SELECT
-        COUNT(union_id)
+        COUNT(id)
     FROM
         customer_points
     <where>
-      <if test="unionId !=null and unionId !=''">
-        union_id = #{unionId}
-      </if>
       <if test="stationId !='' and stationId != null" >
-        AND station_id = #{stationId}
+        station_id = #{stationId}
+      </if>
+      <if test="blogOpenId !=null and blogOpenId !=''">
+        AND blog_openid = #{blogOpenId}
+      </if>
+      <if test="minaOpenId !=null and minaOpenId !=''">
+        AND mina_openid = #{minaOpenId}
       </if>
     </where>
   </select>

YijiaRestful/src/main/resources/mapper/ElectronicMembershipCardMapper.xml

@@ -399,6 +399,12 @@
             <if test="unionId !=null and unionId !=''">
                 union_id = #{unionId}
             </if>
+            <if test="blogOpenId !=null and blogOpenId !=''">
+                AND blog_openid = #{blogOpenId}
+            </if>
+            <if test="minaOpenId !=null and minaOpenId !=''">
+                AND mina_openid = #{minaOpenId}
+            </if>
             <if test="cardOilsType !=null and cardOilsType !=''">
                 AND card_oils_type = #{cardOilsType}
             </if>