Merge remote-tracking branch 'origin/master'

ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java

@@ -355,6 +355,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         String whereConditions = searchDsOrderListCondition.getString("whereConditions");
         String distinctStr = searchDsOrderListCondition.getString("distinctStr");
         String joinTables = searchDsOrderListCondition.getString("joinTables");
+log.info("searchDsOrderIds masterTbl: " + masterTbl);
+log.info("searchDsOrderIds masterTblAlias: " + masterTblAlias);
+log.info("searchDsOrderIds whereConditions: " + whereConditions);
+log.info("searchDsOrderIds distinctStr: " + distinctStr);
+log.info("searchDsOrderIds joinTables: " + joinTables);
+log.info("searchDsOrderIds shopIds: " + JSONObject.toJSONString(shopIds));
         Integer total = purchaseOrderMapper.selectOrderIdsCount(distinctStr, masterTblAlias, masterTbl, joinTables, shopIds, whereConditions);
         List<Map<String, String>> orderList = purchaseOrderMapper.selectOrderIds(distinctStr, masterTblAlias, masterTbl, joinTables, shopIds, whereConditions, (page - 1) * pageSize, pageSize);
         List<String> orderIdList =  orderList.stream().map(x -> x.get("order_id")).collect(Collectors.toList());
@@ -709,6 +715,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                 where.append(String.format(" and  purchase_order_start_time <= '%s'", DateUtil.formatDateTime(filter.getPurchaseEndTime())));
             }
         }
+log.info("getOrderIdAndPurchaseOrdersMap shopIds: " + JSONObject.toJSONString(shopIds));
+log.info("getOrderIdAndPurchaseOrdersMap orderIds: " + JSONObject.toJSONString(orderIds));
+log.info("getOrderIdAndPurchaseOrdersMap where: " + where.toString());
         List<PurchaseOrderBO> purchaseOrders = purchaseOrderMapper.selectPurchaseOrders(shopIds, orderIds, StatusConst.normal, where.toString());
         if (ObjectUtil.isEmpty(purchaseOrders)) {
             return new HashMap<>();