修改bug

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/MaoDengImageHandler.java

@@ -39,6 +39,7 @@ public class MaoDengImageHandler implements WxMpMessageHandler {
     public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> map, WxMpService wxMpService, WxSessionManager wxSessionManager) throws WxErrorException {
         String fromUser = wxMessage.getFromUser();//用户id
         String picUrl = wxMessage.getPicUrl();//图片url
+        String maoId = IDGenerator.nextSnowId();
 
         //图片非法判断
         //此处判断不需要用户登录，所以使用时间代替
@@ -57,20 +58,24 @@ public class MaoDengImageHandler implements WxMpMessageHandler {
         if (StringUtil.isNotEmpty(i)){
             //活动已开启  持久化  redis
             SweetMaoDengVo sweetMaoDeng = redisUtils.getSweetMaoDeng(fromUser);
-            //是否上传了文字
+            String maoIdText =null;
             if (sweetMaoDeng != null){
+                maoIdText= sweetMaoDeng.getMaoId();
+            }
+
+            if (StringUtil.isNotEmpty(maoIdText)){
                 String textMsg = sweetMaoDeng.getTextMsg();
                 sweetMaoDengVo.setTextMsg(textMsg);
-
+                maoId = sweetMaoDeng.getMaoId();
                 //更新mysql
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
                 sqls.add(SqlMapping.get("sweet_wechat_maodeng.img.update"));
-                sqlsDataA.add(new Object[]{picUrl,fromUser});
+                sqlsDataA.add(new Object[]{picUrl,fromUser,maoId});
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_MAODENG_TEXT_INSERT.getKey(), SqlMapping.gets(sqls, sqlsDataA));
             }else {
                 //redis队列入库
-                String maoId = IDGenerator.nextSnowId();
+                sweetMaoDengVo.setMaoId(maoId);
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
                 sqls.add(SqlMapping.get("sweet_wechat_maodeng.insert"));

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/TextMsgHandler.java

@@ -55,6 +55,7 @@ public class TextMsgHandler implements WxMpMessageHandler {
         SweetMaoDengVo sweetMaoDengVo = SweetMaoDengVo.getNew();
         sweetMaoDengVo.setUserId(fromUser);
         sweetMaoDengVo.setTextMsg(maoContent);
+        String maoId = IDGenerator.nextSnowId();
         //敏感词判断
         //此处判断不需要用户登录，所以使用时间代替
         String currentUid = DateUtil.now().getTime() + "";
@@ -77,21 +78,24 @@ public class TextMsgHandler implements WxMpMessageHandler {
         if (StringUtil.isNotEmpty(i)) {
 
             SweetMaoDengVo sweetMaoDeng = redisUtils.getSweetMaoDeng(fromUser);
-            //是否上传了图
-            if (sweetMaoDeng != null) {
+            String maoIdText =null;
+            if (sweetMaoDeng != null){
+                maoIdText= sweetMaoDeng.getMaoId();
+            }
+
+            if (StringUtil.isNotEmpty(maoIdText)) {
 
                 String picUrl = sweetMaoDeng.getPicUrl();
                 sweetMaoDengVo.setPicUrl(picUrl);
+                maoId=sweetMaoDeng.getMaoId();
 
                 //更新mysql
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
                 sqls.add(SqlMapping.get("sweet_wechat_maodeng.text.update"));
-                sqlsDataA.add(new Object[]{fromUser, maoContent});
+                sqlsDataA.add(new Object[]{fromUser, maoContent,maoId});
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_MAODENG_TEXT_INSERT.getKey(), SqlMapping.gets(sqls, sqlsDataA));
-            } else {
-                //redis队列入库
-                String maoId = IDGenerator.nextSnowId();
+            }else {
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
                 sqls.add(SqlMapping.get("sweet_wechat_maodeng.insert"));

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -60,8 +60,8 @@ sweet_strawberry_poster_Musician=INSERT INTO sweet_strawberry_poster_lineup(line
 #---------------------------猫登天空--------------------------------
 sweet_wechat_maodeng.insert=INSERT INTO sweet_wechat_maodeng(mao_id,user_id,text_msg,pic_url) VALUES (?,?,?,?)
 sweet_wechat_maodeng.insert_img=INSERT INTO sweet_wechat_maodeng_img(mao_id,user_id,img_url) VALUES (?,?,?)
-sweet_wechat_maodeng.text.update=UPDATE sweet_wechat_maodeng SET text_msg=? WHERE user_id=?
-sweet_wechat_maodeng.img.update=UPDATE sweet_wechat_maodeng SET pic_url=? WHERE user_id=?
+sweet_wechat_maodeng.text.update=UPDATE sweet_wechat_maodeng SET text_msg=? WHERE user_id=? AND mao_id=?
+sweet_wechat_maodeng.img.update=UPDATE sweet_wechat_maodeng SET pic_url=? WHERE user_id=? AND mao_id=?