up

.idea/misc.xml

@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8.0_211" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java

@@ -91,6 +91,7 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
                 Source source = sourceMapper.selectOne(Wrappers.<Source>lambdaQuery().eq(Source::getQrCode,qrCode)
                         .and(queryWrapper1 -> queryWrapper1.eq(Source::getState,1)));
                 if (source == null){
+                    logger.info("错误的qrCode来源:"+qrCode);
                     ajaxResult.setRetmsg("未找到二维码code的来源");
                     ajaxResult.setRetcode(AjaxResult.FAILED);
                     return ajaxResult;
@@ -102,6 +103,7 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
                 Source source = sourceMapper.selectOne(Wrappers.<Source>lambdaQuery().eq(Source::getPostCode,postCode)
                         .and(queryWrapper1 -> queryWrapper1.eq(Source::getState,1)));
                 if (source == null){
+                    logger.info("错误的postCode来源:"+postCode);
                     ajaxResult.setRetmsg("未找到海报code的来源");
                     ajaxResult.setRetcode(AjaxResult.FAILED);
                     return ajaxResult;

src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java

@@ -81,7 +81,6 @@ 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);
                 }
@@ -95,6 +94,7 @@ public class LoveLetterServiceImpl extends BaseServiceImpl<LoveLetterMapper, Lov
             }
             if (StringUtils.isNotEmpty(openId)){
                 //来源于微信
+
                 JSONObject userInfo = weixinService.getUserInfoByOpenId(openId);
                 String unionId = userInfo.getString("unionid");
 //                String unionId = weixinService.getUnionId(code);
@@ -131,9 +131,37 @@ 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 = "";
+            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){
+                    logger.info("错误的qrCode来源:"+qrCode);
+                    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){
+                    logger.info("错误的postCode来源:"+postCode);
+                    ajaxResult.setRetmsg("未找到海报code的来源");
+                    ajaxResult.setRetcode(AjaxResult.FAILED);
+                    return ajaxResult;
+                }else {
+                    sourceName = source.getSourceName();
+                }
+            }else {
+                sourceName = "";
+            }
+
             if (StringUtils.isBlank(letterId)){
                 ajaxResult.setRetmsg("LETTERID MISSING");
                 ajaxResult.setRetcode(AjaxResult.FAILED);
@@ -146,13 +174,6 @@ public class LoveLetterServiceImpl extends BaseServiceImpl<LoveLetterMapper, Lov
                     ajaxResult.setRetcode(AjaxResult.FAILED);
                     return ajaxResult;
                 }else {
-                    String createOpenId = loveLetter.getOpenId();
-                    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();
                     loveLetter.setReadTimes(readTimes + 1);
                     loveLetter.setUpdateDateTime(new Date());
@@ -187,6 +208,7 @@ 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();

src/main/java/com/bsd/say/service/impl/RecordServiceImpl.java

@@ -68,6 +68,7 @@ public class RecordServiceImpl extends BaseServiceImpl<RecordMapper,Record> impl
                 Source source = sourceMapper.selectOne(Wrappers.<Source>lambdaQuery().eq(Source::getQrCode,qrCode)
                         .and(queryWrapper1 -> queryWrapper1.eq(Source::getState,1)));
                 if (source == null){
+                    logger.info("错误的qrCode来源:"+qrCode);
                     ajaxResult.setRetmsg("未找到二维码code的来源");
                     ajaxResult.setRetcode(AjaxResult.FAILED);
                     return ajaxResult;
@@ -79,6 +80,7 @@ public class RecordServiceImpl extends BaseServiceImpl<RecordMapper,Record> impl
                 Source source = sourceMapper.selectOne(Wrappers.<Source>lambdaQuery().eq(Source::getPostCode,postCode)
                         .and(queryWrapper1 -> queryWrapper1.eq(Source::getState,1)));
                 if (source == null){
+                    logger.info("错误的postCode来源:"+postCode);
                     ajaxResult.setRetmsg("未找到海报code的来源");
                     ajaxResult.setRetcode(AjaxResult.FAILED);
                     return ajaxResult;