Merge branch 'feat-rsy' into 'master'

修改销售额bug

See merge request rays/pcloud-book!249

pcloud-service-book/src/main/java/com/pcloud/book/consumer/trade/TradeConsr.java

@@ -5,6 +5,7 @@ import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
+import com.pcloud.facade.tradecenter.dto.BookGroupSaleSearchDto;
 import com.pcloud.facade.tradecenter.dto.ClassifyPayDetailDto;
 import com.pcloud.facade.tradecenter.dto.GroupIncomeSearchDto;
 import com.pcloud.facade.tradecenter.dto.GroupMoneyDto;
@@ -207,4 +208,17 @@ public class TradeConsr {
         return map;
     }
 
+    @ParamLog("通过群id和群分类id拿到群购买情况")
+    public Map<Long, QrGroupBuyDetailDto> getQrGroupSaleInfo(List<BookGroupSaleSearchDto> list) throws BizException {
+        if (ListUtils.isEmpty(list)) {
+            return null;
+        }
+        try {
+            return ResponseHandleUtil.parseMapResponse(orderFormService.getQrGroupSaleInfo(list)
+                    , Long.class, QrGroupBuyDetailDto.class);
+        } catch (Exception e) {
+            LOGGER.error("通过群id和群分类id拿到群购买情况c出错.[getQrGroupSaleInfo]:" + e.getMessage(), e);
+        }
+        return null;
+    }
 }

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

@@ -81,6 +81,7 @@ import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.string.StringUtil;
+import com.pcloud.facade.tradecenter.dto.BookGroupSaleSearchDto;
 import com.pcloud.facade.tradecenter.dto.QrGroupBuyDetailDto;
 import com.pcloud.labelcenter.label.service.LabelService;
 import com.pcloud.readercenter.wechat.dto.WechatUserRobotDto;
@@ -801,13 +802,16 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         if (ListUtils.isEmpty(groupQrcodeStatistics)) {
             return;
         }
-        List<Long> groupQrcodeIds = new ArrayList<>();
+        List<BookGroupSaleSearchDto> list = new ArrayList<>();
         for (BookGroupQrcodeStatisticVO bookGroupQrcodeStatisticVO : groupQrcodeStatistics) {
             if (bookGroupQrcodeStatisticVO.getGroupQrcodeId() != null) {
-                groupQrcodeIds.add(bookGroupQrcodeStatisticVO.getGroupQrcodeId());
+                BookGroupSaleSearchDto bookGroupSaleSearchDto = new BookGroupSaleSearchDto();
+                bookGroupSaleSearchDto.setGroupQrcodeId(bookGroupQrcodeStatisticVO.getGroupQrcodeId());
+                bookGroupSaleSearchDto.setClassifyId(bookGroupQrcodeStatisticVO.getClassifyId());
+                list.add(bookGroupSaleSearchDto);
             }
         }
-        Map<Long, QrGroupBuyDetailDto> buyMap = tradeConsr.getQrGroupSaleDetail(groupQrcodeIds);
+        Map<Long, QrGroupBuyDetailDto> buyMap = tradeConsr.getQrGroupSaleInfo(list);
         for (BookGroupQrcodeStatisticVO bookGroupQrcodeStatisticVO : groupQrcodeStatistics) {
             if (buyMap != null) {
                 QrGroupBuyDetailDto qrGroupBuyDetailDto = buyMap.get(bookGroupQrcodeStatisticVO.getGroupQrcodeId());

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookKeywordBizImpl.java

@@ -994,22 +994,20 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
      * 关键词应用触发记录
      */
     private void addKeywordAppTouchRecord(ReplyKeywordDTO replyKeywordDTO, String weixinGroupId, Long classifyId, Long bookGroupId) {
-        if (ReplyTypeEnum.APP.value.equals(replyKeywordDTO.getReplyType())) {
-            Keyword keyword = keywordDao.getById(replyKeywordDTO.getKeywordId());
-            if (keyword != null) {
-                AppTouchRecord appTouchRecord = new AppTouchRecord();
-                appTouchRecord.setServeId(keyword.getServeId());
-                appTouchRecord.setServeType(keyword.getServeType());
-                appTouchRecord.setTouchType(TouchTypeEnum.KEYWORD.value);
-                appTouchRecord.setBookGroupId(bookGroupId);
-                appTouchRecord.setClassifyId(classifyId);
-                GroupQrcode groupQrcode = groupQrcodeDao.getGroupQrcodeByGroupId(weixinGroupId);
-                if (groupQrcode != null) {
-                    appTouchRecord.setQrcodeId(groupQrcode.getId());
-                }
-                appTouchRecord.setWeixinGroupId(weixinGroupId);
-                appTouchRecordDao.insert(appTouchRecord);
+        Keyword keyword = keywordDao.getById(replyKeywordDTO.getKeywordId());
+        if (keyword != null && ReplyTypeEnum.APP.value.equals(keyword.getReplyType())) {
+            AppTouchRecord appTouchRecord = new AppTouchRecord();
+            appTouchRecord.setServeId(keyword.getServeId());
+            appTouchRecord.setServeType(keyword.getServeType());
+            appTouchRecord.setTouchType(TouchTypeEnum.KEYWORD.value);
+            appTouchRecord.setBookGroupId(bookGroupId);
+            appTouchRecord.setClassifyId(classifyId);
+            GroupQrcode groupQrcode = groupQrcodeDao.getGroupQrcodeByGroupId(weixinGroupId);
+            if (groupQrcode != null) {
+                appTouchRecord.setQrcodeId(groupQrcode.getId());
             }
+            appTouchRecord.setWeixinGroupId(weixinGroupId);
+            appTouchRecordDao.insert(appTouchRecord);
         }
     }