Merge branch '20211102-支持查询会员合并后的订单-zhiwei.zha'

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1025,6 +1025,7 @@ public class OrderAdapter {
         queryOrdersDto.setPageNumber(queryOrderDto.getPageNumber() != null ? queryOrderDto.getPageNumber() : 1);
         queryOrdersDto.setStartDate(queryOrderDto.getStartDate());
         queryOrdersDto.setEndDate(queryOrderDto.getEndDate());
+        queryOrdersDto.setUserId(memberId);
 
         if (OrderChannelType.IWC.getCode().equals(channelType)) {
             queryOrdersDto.setSource(new String[]{"meals"});

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -774,6 +774,8 @@ public class OrderServiceImpl implements Orderservice {
         // 查询支持查询会员合并后的所有订单
         List<String> memberIds = memberInfoManager.getMemberAllIds(partnerId, userId);
         queryOrdersRequest2.setUserIds(memberIds);
+        // clean userId value,use userIds field
+        queryOrdersRequest2.setUserId(null);
         if (Objects.equals(QueryOrderStatus.REFUND_BILL.getCode(), queryOrderVo.getQueryOrderStatus())) {
             queryOrdersRequest2.setPayStatus(new Integer[]{3});//发票其他订单查询已退款
         }