CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-06-10 14:35:25 +08:00
parent 8d3f1337e9
commit 0022a197cc
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java
View File

@@ -59,13 +59,9 @@ public class PublicPromoterOrderController {
return result; return result;
} }
String promoterTag = t != null ? t.trim() : "";
List<PromoterOrderInfoVO> orderInfoList = new ArrayList<>(); List<PromoterOrderInfoVO> orderInfoList = new ArrayList<>();
ValidCodeConverter validCodeConverter = new ValidCodeConverter(); ValidCodeConverter validCodeConverter = new ValidCodeConverter();
for (OrderRows row : rows) { for (OrderRows row : rows) {
if (!promoterTag.isEmpty() && !matchesPromoterTag(row, promoterTag)) {
continue;
}
orderInfoList.add(toPromoterOrderInfo(row, validCodeConverter)); orderInfoList.add(toPromoterOrderInfo(row, validCodeConverter));
} }
@@ -82,16 +78,6 @@ public class PublicPromoterOrderController {
return result; 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) { private PromoterOrderInfoVO toPromoterOrderInfo(OrderRows row, ValidCodeConverter validCodeConverter) {
PromoterOrderInfoVO vo = new PromoterOrderInfoVO(); PromoterOrderInfoVO vo = new PromoterOrderInfoVO();
vo.setShopName(row.getUnionAlias() != null && !row.getUnionAlias().isEmpty() vo.setShopName(row.getUnionAlias() != null && !row.getUnionAlias().isEmpty()

2
ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.java
View File

@@ -89,7 +89,7 @@ public interface OrderRowsMapper
public List<OrderRows> selectOrderRowsByGiftCouponKey(@Param("giftCouponKey") String giftCouponKey); public List<OrderRows> selectOrderRowsByGiftCouponKey(@Param("giftCouponKey") String giftCouponKey);
/** /**
* 根据订单号查询（匹配子单号或父单号） * 根据订单号查询（匹配子单号 order_id 或父单号 parent_id）
*/ */
public List<OrderRows> selectOrderRowsByOrderNo(@Param("orderNo") String orderNo); public List<OrderRows> selectOrderRowsByOrderNo(@Param("orderNo") String orderNo);
} }

2
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IOrderRowsService.java
View File

@@ -74,7 +74,7 @@ public interface IOrderRowsService
public OrderRows selectOrderRowsByOrderId(String orderId); public OrderRows selectOrderRowsByOrderId(String orderId);
/** /**
* 根据订单号查询（匹配子单号或父单号） * 根据订单号查询（匹配子单号 order_id 或父单号 parent_id）
*/ */
public List<OrderRows> selectOrderRowsByOrderNo(String orderNo); public List<OrderRows> selectOrderRowsByOrderNo(String orderNo);
} }