Merge branch 'feat-dw-editAddQrcode' into 'master'

edit AddQrcode robotId

See merge request rays/pcloud-book!179

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java

 package com.pcloud.book.group.biz.impl;
 
-import com.alibaba.fastjson.JSONObject;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
+import com.alibaba.fastjson.JSONObject;
 import com.pcloud.appcenter.app.dto.AppDto;
 import com.pcloud.appcenter.base.dto.AppPriceCacheDTO;
 import com.pcloud.appcenter.cache.service.AppPriceCacheService;
@@ -24,30 +24,51 @@ import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
 import com.pcloud.book.group.biz.BookGroupBiz;
 import com.pcloud.book.group.biz.BookGroupClassifyBiz;
-
-import com.pcloud.book.group.dao.*;
-import com.pcloud.book.group.dto.*;
+import com.pcloud.book.group.biz.GroupQrcodeBiz;
+import com.pcloud.book.group.dao.AppClickRecordDao;
+import com.pcloud.book.group.dao.AppTouchRecordDao;
+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.dao.JoinGroupCipherDao;
+import com.pcloud.book.group.dao.TempletRelevanceDao;
+import com.pcloud.book.group.dao.WeixinQrcodeDao;
+import com.pcloud.book.group.dto.AppStatisticsDTO;
+import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.BookGroupStatisticDTO;
+import com.pcloud.book.group.dto.BookGroupStatisticsDTO;
+import com.pcloud.book.group.dto.ClassifyDTO;
+import com.pcloud.book.group.dto.ClassifyKeywordDTO;
+import com.pcloud.book.group.dto.ClickClassifyDTO;
+import com.pcloud.book.group.dto.GroupCipherDTO;
+import com.pcloud.book.group.dto.GroupStoreMyPayDto;
+import com.pcloud.book.group.dto.GroupUseDTO;
+import com.pcloud.book.group.dto.JoinGroupCipherDTO;
+import com.pcloud.book.group.dto.LargeTempletDTO;
+import com.pcloud.book.group.dto.OwnAltQrcodeInfoDTO;
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
+import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
+import com.pcloud.book.group.dto.ResourceBrowseParamDto;
+import com.pcloud.book.group.dto.StatisticsIncomeDto;
 import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.entity.JoinGroupCipher;
 import com.pcloud.book.group.entity.TempletRelevance;
 import com.pcloud.book.group.enums.CipherTypeEnum;
 import com.pcloud.book.group.enums.LargTempletEnum;
-import com.pcloud.book.group.vo.StatisticVO;
-
-import com.pcloud.book.group.biz.GroupQrcodeBiz;
-
-import com.pcloud.book.group.dao.AppClickRecordDao;
-import com.pcloud.book.group.dao.AppTouchRecordDao;
-import com.pcloud.book.group.dao.BookGroupClassifyDao;
-import com.pcloud.book.group.dao.BookGroupDao;
-
 import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
-
-import com.pcloud.book.group.dto.*;
-import com.pcloud.book.group.entity.BookGroup;
-
-import com.pcloud.book.group.vo.*;
+import com.pcloud.book.group.vo.ClassifyQrcodeVO;
+import com.pcloud.book.group.vo.GroupIncomeStaticParamVO;
+import com.pcloud.book.group.vo.GroupScanTrendParamVO;
+import com.pcloud.book.group.vo.GroupScanTrendVO;
+import com.pcloud.book.group.vo.GroupStatisticVO;
+import com.pcloud.book.group.vo.ListBook4ChannelVO;
+import com.pcloud.book.group.vo.ListBookGroup4ChannelParamVO;
+import com.pcloud.book.group.vo.ResourceClickVO;
+import com.pcloud.book.group.vo.ResourcesStatisticVO;
+import com.pcloud.book.group.vo.StatisticVO;
+import com.pcloud.book.group.vo.TotalRescourceDataVO;
+import com.pcloud.book.group.vo.WxGroupStatisticVO;
 import com.pcloud.book.keywords.dao.BookKeywordDao;
 import com.pcloud.book.keywords.enums.ReplyTypeEnum;
 import com.pcloud.book.keywords.vo.ListKeywordVO;
@@ -67,15 +88,20 @@ import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
-import com.pcloud.common.utils.*;
+import com.pcloud.common.utils.BeanUtils;
 import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.QrcodeUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
+import com.pcloud.common.utils.UUIDUitl;
 import com.pcloud.common.utils.export.excel.ExcelExportor;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.common.utils.zip.CompressUtils;
-import com.pcloud.facade.tradecenter.dto.*;
+import com.pcloud.facade.tradecenter.dto.ClassifyPayDetailDto;
+import com.pcloud.facade.tradecenter.dto.GroupIncomeSearchDto;
+import com.pcloud.facade.tradecenter.dto.GroupMoneyDto;
+import com.pcloud.facade.tradecenter.dto.SpeWechatGroupDto;
+import com.pcloud.facade.tradecenter.dto.WechatGroupDto;
 import com.pcloud.labelcenter.label.service.LabelService;
 import com.pcloud.liveapp.live.dto.ProductIdSearchDto;
 import com.pcloud.liveapp.live.service.TimeTableService;
@@ -87,7 +113,6 @@ import com.pcloud.resourcecenter.product.dto.UpdateAppProductParamDTO;
 import com.pcloud.resourcecenter.product.entity.Product;
 import com.pcloud.resourcecenter.product.service.ProductService;
 import com.pcloud.resourcecenter.store.constants.StoreCons;
-
 import com.pcloud.settlementcenter.record.dto.GetGroupClassifyIncomeDTO;
 import com.pcloud.settlementcenter.record.dto.GetGroupQrcodeIncomeDTO;
 import com.pcloud.settlementcenter.record.dto.GroupRescourceIncomeParamDTO;
@@ -96,8 +121,8 @@ import com.pcloud.settlementcenter.record.service.SettlementService;
 import com.pcloud.videolesson.schedule.service.ScheduleService;
 import com.pcloud.wechatgroup.group.dto.GroupMemberStatisDTO;
 import com.pcloud.wechatgroup.group.service.GroupMemberService;
-
 import com.pcloud.wechatgroup.selfrobot.dto.SelfRobotDTO;
+
 import org.apache.commons.collections.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -117,8 +142,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.sun.tools.doclets.formats.html.markup.HtmlStyle.title;
-
 /**
  * Description 社群书群二维码业务逻辑层接口实现类
  * Created by PENG on 2019/4/17.

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/WeixinQrcodeBizImpl.java

@@ -47,6 +47,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -272,9 +273,14 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
                 return;
             }
             newUrl = QrcodeUtils.create(weixinQrcodeVO.getQrcodeUrl());
-            GroupRobotDTO groupRobotDTO = wechatGroupConsr.getRobotInfoByWxUserId(weixinQrcodeVO.getRobotWxId());
-            if(groupRobotDTO != null){
-                weixinQrcode.setRobotId(Long.valueOf(groupRobotDTO.getId()));
+            if(Objects.isNull(weixinQrcodeVO.getRobotId())) {
+                LOGGER.info("[新增二维码] robotId is null");
+                GroupRobotDTO groupRobotDTO = wechatGroupConsr.getRobotInfoByWxUserId(weixinQrcodeVO.getRobotWxId());
+                if(groupRobotDTO != null){
+                    weixinQrcode.setRobotId(Long.valueOf(groupRobotDTO.getId()));
+                }
+            } else {
+                weixinQrcode.setRobotId(weixinQrcodeVO.getRobotId());
             }
             weixinQrcode.setUpdateState(0);
         }else {