Merge remote-tracking branch 'origin/master'

order-application-service/src/main/java/cn/freemud/entities/vo/McCafeQueryOrderVo.java

@@ -57,4 +57,6 @@ public class McCafeQueryOrderVo {
      */
     private String channelType;
 
+    private String userId;
+
 }

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

@@ -2561,6 +2561,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 orderConditionsReq.setPageNum(i);
                 orderConditionsReq.setPageSize(500);
                 orderConditionsReq.setSortRule(1);
+                if(StringUtils.isNotBlank(queryOrderVo.getUserId())) {
+                    orderConditionsReq.setUserId(queryOrderVo.getUserId());
+                }
                 BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq, LogThreadLocal.getTrackingNo());
                 AppLogUtil.infoLog("queryOrderByConditions："+ JSON.toJSONString(response),null,null);
                 if(CollectionUtils.isEmpty(response.getResult())) {