Merge branch 'feat-zdw-1001865' into 'master'

feat-1001865: 修改分享的二维码和名称

See merge request rays/pcloud-book!218

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/biz/impl/WeixinClockShareBizImpl.java

 package com.pcloud.book.weixinclock.biz.impl;
 
 import com.pcloud.book.base.exception.BookBizException;
+import com.pcloud.book.group.dao.BookGroupClassifyDao;
+import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
+import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.ClassifyDTO;
 import com.pcloud.book.group.entity.GroupQrcode;
+import com.pcloud.book.group.vo.ClassifyVO;
 import com.pcloud.book.util.common.LunarCalendarUtils;
 import com.pcloud.book.weixinclock.biz.WeixinClockShareBiz;
 import com.pcloud.book.weixinclock.dao.WeixinClockMemberDao;
@@ -38,6 +43,10 @@ public class WeixinClockShareBizImpl implements WeixinClockShareBiz {
     private GroupQrcodeDao groupQrcodeDao;
     @Autowired
     private WeixinClockShareDao weixinClockShareDao;
+    @Autowired
+    private BookGroupDao bookGroupDao;
+    @Autowired
+    private BookGroupClassifyDao bookGroupClassifyDao;
 
     @Override
     public DoShareResponseVO doShare(Long wechatUserId, String wxGroupId, String wxUserId) {
@@ -64,8 +73,16 @@ public class WeixinClockShareBizImpl implements WeixinClockShareBiz {
         Date date = weixinClockTopicDao.getFirstClockDay(wxUserId, wxGroupId);
         doShareResponseVO.setStartClockDate(date);
         GroupQrcode groupQrcode = groupQrcodeDao.getByWxGroupId(wxGroupId);
-        doShareResponseVO.setTitle(groupQrcode.getGroupName());
-        doShareResponseVO.setQrcodeUrl(groupQrcode.getQrcodeUrl());
+        if (null != groupQrcode){
+            ClassifyDTO dto = bookGroupClassifyDao.getById(groupQrcode.getClassifyId());
+            if(null != dto){
+                BookGroupDTO bookGroupDTO = bookGroupDao.getDTOById(dto.getBookGroupId());
+                if (null != bookGroupDTO){
+                    doShareResponseVO.setTitle(bookGroupDTO.getGroupQrcodeName());
+                    doShareResponseVO.setQrcodeUrl(bookGroupDTO.getGroupQrcodeUrl());
+                }
+            }
+        }
         //埋点，用户分享记录
         WeixinClockShare weixinClockShare = new WeixinClockShare();
         weixinClockShare.setShareTime(new Date());

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/facade/impl/WeixinClockShareFacadeImpl.java

@@ -41,7 +41,7 @@ public class WeixinClockShareFacadeImpl {
      */
     @ApiOperation("分享我的排名")
     @ApiImplicitParams({@ApiImplicitParam(name = "wxGroupId", value = "微信群id", dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "weUserId", value = "微信群id", dataType = "string", paramType = "query")})
+            @ApiImplicitParam(name = "wxUserId", value = "微信群id", dataType = "string", paramType = "query")})
     @RequestMapping(value = "doShare", method = RequestMethod.GET)
     public ResponseDto<?> doShare(@CookieValue("userInfo") String userInfo,
                                   @RequestParam("wxGroupId") String wxGroupId,