diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java index 0e02889..5e5a5a3 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java @@ -43,6 +43,8 @@ public interface VvPromoterTradeOrderAwardDao extends BaseMapper selectAdminByCondition(IPage page, + @IF Long tradeOrderId, + @IF String status, @IF String promoterId, @IF Long promoterBuyerId, @IF String promoterBuyerName, diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterTradeOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterTradeOrderController.java index 810306f..ee9e409 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterTradeOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterTradeOrderController.java @@ -34,6 +34,7 @@ public class AdminPromoterTradeOrderController { @Autowired private VvPromoterTradeOrderLineAwardDao vvPromoterTradeOrderLineAwardDao; + /*** * 列表 * http://localhost:8888/mm/promoter/trade/order/list @@ -46,6 +47,8 @@ public class AdminPromoterTradeOrderController { @Override public List doSelect(IPage page) { return vvPromoterTradeOrderAwardDao.selectAdminByCondition(page, + request.getTradeOrderId(), + request.getStatus(), request.getPromoterId(), request.getPromoterBuyerId(), request.getPromoterBuyerName(), @@ -64,7 +67,6 @@ public class AdminPromoterTradeOrderController { List vvPromoterTradeOrderAwardEntities = pageUtils.getRows(); List promoterIdList = SanUtils.list2FieldList(vvPromoterTradeOrderAwardEntities, VvPromoterTradeOrderAwardEntity::getPromoterId); - List promoterTradeOrderLineAwardList = vvPromoterTradeOrderLineAwardDao.selectVvPromoterTradeOrderLineAwardByIdList(promoterIdList);