diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java index 0772406..51eb5c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java @@ -59,13 +59,9 @@ public class PublicPromoterOrderController { return result; } - String promoterTag = t != null ? t.trim() : ""; List orderInfoList = new ArrayList<>(); ValidCodeConverter validCodeConverter = new ValidCodeConverter(); for (OrderRows row : rows) { - if (!promoterTag.isEmpty() && !matchesPromoterTag(row, promoterTag)) { - continue; - } orderInfoList.add(toPromoterOrderInfo(row, validCodeConverter)); } @@ -82,16 +78,6 @@ public class PublicPromoterOrderController { return result; } - private boolean matchesPromoterTag(OrderRows row, String promoterTag) { - if (promoterTag.equals(row.getUnionTag()) || promoterTag.equals(row.getSubUnionId())) { - return true; - } - if (row.getUnionId() != null && promoterTag.equals(String.valueOf(row.getUnionId()))) { - return true; - } - return row.getPid() != null && row.getPid().contains(promoterTag); - } - private PromoterOrderInfoVO toPromoterOrderInfo(OrderRows row, ValidCodeConverter validCodeConverter) { PromoterOrderInfoVO vo = new PromoterOrderInfoVO(); vo.setShopName(row.getUnionAlias() != null && !row.getUnionAlias().isEmpty() diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.java index abd2cf0..a5661ef 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.java @@ -89,7 +89,7 @@ public interface OrderRowsMapper public List selectOrderRowsByGiftCouponKey(@Param("giftCouponKey") String giftCouponKey); /** - * 根据订单号查询(匹配子单号或父单号) + * 根据订单号查询(匹配子单号 order_id 或父单号 parent_id) */ public List selectOrderRowsByOrderNo(@Param("orderNo") String orderNo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IOrderRowsService.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IOrderRowsService.java index 52865ff..adba720 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IOrderRowsService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IOrderRowsService.java @@ -74,7 +74,7 @@ public interface IOrderRowsService public OrderRows selectOrderRowsByOrderId(String orderId); /** - * 根据订单号查询(匹配子单号或父单号) + * 根据订单号查询(匹配子单号 order_id 或父单号 parent_id) */ public List selectOrderRowsByOrderNo(String orderNo); }