Merge branch 'fix-1021853' into 'master'

修改bug1021853

See merge request rays/pcloud-book!558

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/impl/PcloudRobotBizImpl.java

@@ -363,11 +363,13 @@ public class PcloudRobotBizImpl implements PcloudRobotBiz {
                             sendMomentsDTO.setContent(userWxId);
                             sendMomentsDTO.setLink(robotWelcome.getResourceUrl());
                             sendMomentsDTO.setIp(ip);
+                            sendMomentsDTO.setAltId(robotWxId);
+                            sendMomentsDTO.setWxId(userWxId);
                             sendMomentsDTO.setMessageGroupId(messageGroup);
                             sendMomentsDTO.setCounts(count);
                             sendMomentsDTO.setIndex(index);
                             sendMomentsDTO.setRobotProcessType(RobotProcessTypeEnum.WELCOME);
-                            WxGroupSDK.sendMessageToPhone(sendMomentsDTO);
+                            wechatGroupConsr.sendMessage(JSON.toJSONString(sendMomentsDTO));
                         }
                         index ++;
                     }

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/impl/PersonalStageBizImpl.java

@@ -990,6 +990,8 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
                     sendMomentsDTO.setContent(userWxId);
                     sendMomentsDTO.setLink(resourceDTO.getFileUrl());
                     sendMomentsDTO.setIp(ip);
+                    sendMomentsDTO.setAltId(robotId);
+                    sendMomentsDTO.setWxId(userWxId);
                     sendMomentsDTO.setMessageGroupId(uuid);
                     sendMomentsDTO.setRobotProcessType(robotProcessType);
                     sendMomentsDTO.setIndex(replyItems.indexOf(item));

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/impl/PersonalStageJumpBizImpl.java

@@ -553,6 +553,8 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
                 sendMomentsDTO.setContent(dto.getKey());
                 sendMomentsDTO.setLink(resourceDTO.getFileUrl());
                 sendMomentsDTO.setIp(linkupDelayDTO.getIp());
+                sendMomentsDTO.setAltId(linkupDelayDTO.getRobotId());
+                sendMomentsDTO.setWxId(dto.getKey());
                 fillMessageBaseInfo(sendMomentsDTO, linkupDelayDTO);
                 wechatGroupConsr.sendMessage(JSON.toJSONString(sendMomentsDTO));
             }
@@ -919,6 +921,8 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
                         sendMomentsDTO.setContent(userWxId);
                         sendMomentsDTO.setLink(resourceDTO.getFileUrl());
                         sendMomentsDTO.setIp(ip);
+                        sendMomentsDTO.setAltId(robotWxId);
+                        sendMomentsDTO.setWxId(userWxId);
                         sendMomentsDTO.setRobotProcessType(RobotProcessTypeEnum.PERSONAL_STAGE_JUMP);
                         sendMomentsDTO.setMessageGroupId(messageGroupId);
                         sendMomentsDTO.setIndex(i);