From a7509e1125bdecea6e66e6e99d3b35f4943b71cb Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 8 Dec 2021 10:03:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=9C=8D=E5=8A=A1=E4=B8=8E?=
 =?UTF-8?q?=E7=AB=AF=E9=93=BE=E6=8E=A5=E4=BC=A0=E9=80=92=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=BAquerywrapper=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/message/service/ShortLinkService.java     | 10 ++++++++++
 .../message/serviceimpl/ShortLinkServiceImpl.java     |  8 ++++++++
 .../cn/lili/modules/wechat/util/WechatMpCodeUtil.java | 11 ++++-------
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/message/service/ShortLinkService.java b/framework/src/main/java/cn/lili/modules/message/service/ShortLinkService.java
index 3789ff56..30b9d7ee 100644
--- a/framework/src/main/java/cn/lili/modules/message/service/ShortLinkService.java
+++ b/framework/src/main/java/cn/lili/modules/message/service/ShortLinkService.java
@@ -3,10 +3,20 @@ package cn.lili.modules.message.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.lili.modules.message.entity.dos.ShortLink;
 
+import java.util.List;
+
 /**
  * 短链接 业务层
+ *
  * @author Chopper
  */
 public interface ShortLinkService extends IService<ShortLink> {
 
+    /**
+     * 根据模型，查询返回的集合
+     *
+     * @param shortLink 短链接模型
+     * @return 端链接集合
+     */
+    List<ShortLink> queryShortLinks(ShortLink shortLink);
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java
index be3ed903..5d734def 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java
@@ -3,16 +3,24 @@ package cn.lili.modules.message.serviceimpl;
 import cn.lili.modules.message.entity.dos.ShortLink;
 import cn.lili.modules.message.mapper.ShortLinkMapper;
 import cn.lili.modules.message.service.ShortLinkService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * 短链接 业务实现
+ *
  * @author Chopper
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class ShortLinkServiceImpl extends ServiceImpl<ShortLinkMapper, ShortLink> implements ShortLinkService {
 
+    @Override
+    public List<ShortLink> queryShortLinks(ShortLink shortLink) {
+        return this.list(PageUtil.initWrapper(shortLink));
+    }
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/wechat/util/WechatMpCodeUtil.java b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMpCodeUtil.java
index 519a6e8e..9ff0890a 100644
--- a/framework/src/main/java/cn/lili/modules/wechat/util/WechatMpCodeUtil.java
+++ b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMpCodeUtil.java
@@ -1,12 +1,11 @@
 package cn.lili.modules.wechat.util;
 
+import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.message.entity.dos.ShortLink;
 import cn.lili.modules.message.service.ShortLinkService;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
@@ -100,16 +99,14 @@ public class WechatMpCodeUtil {
 
             //短链接存储
             ShortLink shortLink = new ShortLink();
-            //已经保存过则不再保存
-            LambdaQueryWrapper<ShortLink> queryWrapper = new LambdaQueryWrapper();
-            queryWrapper.eq(ShortLink::getOriginalParams, scene);
-            List<ShortLink> shortLinks = shortLinkService.list(queryWrapper);
+            shortLink.setOriginalParams(scene);
+            List<ShortLink> shortLinks = shortLinkService.queryShortLinks(shortLink);
             if (shortLinks.size() > 0) {
                 shortLink = shortLinks.get(0);
             } else {
                 shortLink.setOriginalParams(scene);
                 shortLinkService.save(shortLink);
-                shortLink = shortLinkService.getOne(queryWrapper);
+                shortLink = shortLinkService.queryShortLinks(shortLink).get(0);
             }
             String accessToken = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
             Map<String, String> params = new HashMap<>(4);