From 20d32f1428188f7f0bf6477074d31f8fde96b547 Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Thu, 13 Aug 2020 20:33:31 +0800
Subject: [PATCH 1/3] up

---
 .../service/impl/LoveLetterServiceImpl.java   | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java
index 514e109..083b349 100644
--- a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java
@@ -81,6 +81,7 @@ public class LoveLetterServiceImpl extends BaseServiceImpl<LoveLetterMapper, Lov
                 loveLetter.setLetterId(letterId);
                 loveLetter.setContent(content);
                 loveLetter.setSenderName(sender_name);
+                loveLetter.setOpenId(openId);
                 if (love_type!=null){
                     loveLetter.setLoveType(love_type);
                 }
@@ -130,35 +131,9 @@ public class LoveLetterServiceImpl extends BaseServiceImpl<LoveLetterMapper, Lov
             String openId = data.getString("openId");
 //            String code = data.getString("code");
             String letterId = data.getString("letterId");
-            String qrCode = data.getString("qrCode");
-            String postCode = data.getString("postCode");
-            String sourceName;
-            if (StringUtils.isNotEmpty(qrCode)){
-                //二维码编码
-                Source source = sourceMapper.selectOne(Wrappers.<Source>lambdaQuery().eq(Source::getQrCode,qrCode)
-                        .and(queryWrapper1 -> queryWrapper1.eq(Source::getState,1)));
-                if (source == null){
-                    ajaxResult.setRetmsg("未找到二维码code的来源");
-                    ajaxResult.setRetcode(AjaxResult.FAILED);
-                    return ajaxResult;
-                }else {
-                    sourceName = source.getSourceName();
-                }
-            }else if (StringUtils.isNotEmpty(postCode)){
-                //海报编码
-                Source source = sourceMapper.selectOne(Wrappers.<Source>lambdaQuery().eq(Source::getPostCode,postCode)
-                        .and(queryWrapper1 -> queryWrapper1.eq(Source::getState,1)));
-                if (source == null){
-                    ajaxResult.setRetmsg("未找到海报code的来源");
-                    ajaxResult.setRetcode(AjaxResult.FAILED);
-                    return ajaxResult;
-                }else {
-                    sourceName = source.getSourceName();
-                }
-            }else {
-                sourceName = "";
-            }
-
+//            String qrCode = data.getString("qrCode");
+//            String postCode = data.getString("postCode");
+            String sourceName = "";
             if (StringUtils.isBlank(letterId)){
                 ajaxResult.setRetmsg("LETTERID MISSING");
                 ajaxResult.setRetcode(AjaxResult.FAILED);
@@ -171,6 +146,10 @@ public class LoveLetterServiceImpl extends BaseServiceImpl<LoveLetterMapper, Lov
                     ajaxResult.setRetcode(AjaxResult.FAILED);
                     return ajaxResult;
                 }else {
+                    String createOpenId = loveLetter.getOpenId();
+                    Record createrRecord = recordMapper.selectOne(Wrappers.<Record>lambdaQuery().eq(Record::getOpenId,createOpenId)
+                            .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1)));
+                    sourceName = createrRecord.getSource();
                     int readTimes = loveLetter.getReadTimes();
                     loveLetter.setReadTimes(readTimes + 1);
                     loveLetter.setUpdateDateTime(new Date());

From 8137ed23c1d44b28c2fdd03995ef093dc45aeffe Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Thu, 13 Aug 2020 21:20:41 +0800
Subject: [PATCH 2/3] up

---
 .../java/com/bsd/say/service/impl/LoveLetterServiceImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java
index 083b349..afc829f 100644
--- a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java
@@ -149,7 +149,10 @@ public class LoveLetterServiceImpl extends BaseServiceImpl<LoveLetterMapper, Lov
                     String createOpenId = loveLetter.getOpenId();
                     Record createrRecord = recordMapper.selectOne(Wrappers.<Record>lambdaQuery().eq(Record::getOpenId,createOpenId)
                             .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1)));
-                    sourceName = createrRecord.getSource();
+                    if (createrRecord != null){
+                        //说明是非微信端的
+                        sourceName = createrRecord.getSource();
+                    }
                     int readTimes = loveLetter.getReadTimes();
                     loveLetter.setReadTimes(readTimes + 1);
                     loveLetter.setUpdateDateTime(new Date());

From 576a13137d6694d785c0b16db804f38903889f7d Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Thu, 13 Aug 2020 21:23:57 +0800
Subject: [PATCH 3/3] up

---
 .../com/bsd/say/service/impl/LoveLetterServiceImpl.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java
index afc829f..0d3fb91 100644
--- a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java
@@ -147,10 +147,10 @@ public class LoveLetterServiceImpl extends BaseServiceImpl<LoveLetterMapper, Lov
                     return ajaxResult;
                 }else {
                     String createOpenId = loveLetter.getOpenId();
-                    Record createrRecord = recordMapper.selectOne(Wrappers.<Record>lambdaQuery().eq(Record::getOpenId,createOpenId)
-                            .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1)));
-                    if (createrRecord != null){
+                    if (createOpenId != null){
                         //说明是非微信端的
+                        Record createrRecord = recordMapper.selectOne(Wrappers.<Record>lambdaQuery().eq(Record::getOpenId,createOpenId)
+                                .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1)));
                         sourceName = createrRecord.getSource();
                     }
                     int readTimes = loveLetter.getReadTimes();
@@ -187,7 +187,6 @@ public class LoveLetterServiceImpl extends BaseServiceImpl<LoveLetterMapper, Lov
                     record1.setCreateDateTime(new Date());
                     record1.setUpdateDateTime(new Date());
                     record1.setReceiveLetterTimes(1);
-                    record1.setSource(sourceName);
                     recordMapper.insert(record1);
                 }else {
                     Integer receiveLetterTimes = record.getReceiveLetterTimes();