Merge branch 'fixbug/fixBookScreeningGroup' into 'master'

bug: [none] 修改book服务群筛选方案的取值逻辑

See merge request rays/pcloud-book!833

pcloud-service-book/src/main/java/com/pcloud/book/es/biz/impl/ESBookGroupQrcodeBizImpl.java

@@ -127,7 +127,7 @@ public class ESBookGroupQrcodeBizImpl implements ESBookGroupQrcodeBiz {
         Map<String, ESGroupBookQrcodeDTO> qrcodeDTOMap = wechatConsr.aggGroupMemberUser(groupIds);
 
         // 交易中心查询群内订单数据
-        List<Long> collect = qrcodes.stream().map(ESBookGroupQrcode::getWeixinQrcodeId).distinct().filter(Objects::nonNull).collect(Collectors.toList());
+        List<Long> collect = qrcodes.stream().map(ESBookGroupQrcode::getId).distinct().filter(Objects::nonNull).collect(Collectors.toList());
         Map<Long, OrderGroupFormDto> orderGroupForm4ES = tradeConsr.getOrderGroupForm4ES(collect);
 
         // 查询编辑姓名列表
@@ -211,8 +211,8 @@ public class ESBookGroupQrcodeBizImpl implements ESBookGroupQrcodeBiz {
             }
 
             // 补充交易信息
-            if (!CollUtil.isEmpty(orderGroupForm4ES) && qrcode.getWeixinQrcodeId() != null) {
-                OrderGroupFormDto dto = orderGroupForm4ES.get(qrcode.getWeixinQrcodeId());
+            if (!CollUtil.isEmpty(orderGroupForm4ES) && qrcode.getId() != null) {
+                OrderGroupFormDto dto = orderGroupForm4ES.get(qrcode.getId());
                 if (dto != null) {
                     qrcode.setAmountActuallyPaid(dto.getAmountActuallyPaid());
                     qrcode.setPurchaseVolume(dto.getPurchaseVolume());