Merge branch 'master' of http://175.178.51.79:3000/lzx/cheer-api

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/CheerTwoServiceImpl.java

@@ -104,6 +104,7 @@ public class CheerTwoServiceImpl implements CheerTwoService {
         Page<CheerShop> page = new Page<CheerShop>(bean.getPageNo(), bean.getPageSize());
         Page<CheerShop> page1 = cheerShopService.lambdaQuery()
                 .eq(CheerShop::getIsOpen, "Y")
+                .orderByDesc(CheerShop::getCreateTime)
                 .page(page);
         return Result.OK("加油站列表数据",page1);
     }
@@ -274,15 +275,15 @@ public class CheerTwoServiceImpl implements CheerTwoService {
             trial= "develop";
         }
 
-        WxQrCodeVo o = (WxQrCodeVo)redisUtil.get("CodeImage::" + trial+ member.getId());
-        if(o!=null){
-            CheerShop cheerShop = cheerShopService.lambdaQuery()
-                    .eq(CheerShop::getUserId, member.getId())
-                    .one();
-
-            o.setName(cheerShop.getName());
-            return Result.OK(o);
-        }
+//        WxQrCodeVo o = (WxQrCodeVo)redisUtil.get("CodeImage::" + trial+ member.getId());
+//        if(o!=null){
+//            CheerShop cheerShop = cheerShopService.lambdaQuery()
+//                    .eq(CheerShop::getUserId, member.getId())
+//                    .one();
+//
+//            o.setName(cheerShop.getName());
+//            return Result.OK(o);
+//        }
 //        LambdaQueryWrapper<DbConf> config = new LambdaQueryWrapper<>();
 //        config.eq(DbConf::getIsDel,0).eq(DbConf::getKeyValue,"xcxSharePage");
 //        DbConf one = confService.getOne(config);
@@ -380,7 +381,7 @@ public class CheerTwoServiceImpl implements CheerTwoService {
 
             wxCodeVo.setName(cheerShop.getName());
 
-            redisUtil.set("CodeImage::"+trial+member.getId(),wxCodeVo);
+//            redisUtil.set("CodeImage::"+trial+member.getId(),wxCodeVo);
             return Result.OK(wxCodeVo);
 
         } catch (Exception e) {