From 13a8ea3dea9a366baba8f620b44a89c018debf83 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 21 Nov 2025 09:40:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...a => VvPromoterTradeOrderLineRequest.java} | 2 +- .../mm/AdminPromoterAwardLineController.java | 52 ------------------- .../mm/AdminPromoterController.java | 3 +- .../vv/AppPromoterAwardLineController.java | 4 +- 4 files changed, 4 insertions(+), 57 deletions(-) rename api-third/src/main/java/com/heyu/api/alibaba/request/mm/{VvPromoterLineRequest.java => VvPromoterTradeOrderLineRequest.java} (89%) delete mode 100644 api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterAwardLineController.java diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterLineRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterTradeOrderLineRequest.java similarity index 89% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterLineRequest.java rename to api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterTradeOrderLineRequest.java index 07b7775..3ee5398 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterLineRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterTradeOrderLineRequest.java @@ -4,7 +4,7 @@ package com.heyu.api.alibaba.request.mm; import lombok.Data; @Data -public class VvPromoterLineRequest extends VVAdminBaseRequest { +public class VvPromoterTradeOrderLineRequest extends VVAdminBaseRequest { //推广者id，唯一值 private String promoterId; diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterAwardLineController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterAwardLineController.java deleted file mode 100644 index 455876e..0000000 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterAwardLineController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.heyu.api.controller.mm; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.heyu.api.alibaba.request.mm.VvPromoterLineRequest; -import com.heyu.api.common.annotation.Describe; -import com.heyu.api.data.utils.R; -import com.heyu.api.utils.ISelect; -import com.heyu.api.utils.PPageUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@Slf4j -@RestController -@RequestMapping("/mm/promoter/award") -public class AdminPromoterAwardLineController { - - - - /*** - * 奖励 列表 - * http://localhost:8888/mm/promoter/award/list - */ - @Describe("推广奖励列表") - @RequestMapping("/list") - public R list(@RequestBody VvPromoterLineRequest vvPromoterRequest) { - PPageUtils pageUtils = PPageUtils.startPage(vvPromoterRequest.getPageNum(), vvPromoterRequest.getPageSize()) - .doSelect(new ISelect() { - @Override - public List doSelect(IPage page) { - //return vvPromoterAwardLineDao.selectByCondition(page, - // vvPromoterRequest.getPromoterId(), - // vvPromoterRequest.getPromoterBuyerId(), - // vvPromoterRequest.getPromoterBuyerName(), - // vvPromoterRequest.getPromoterBuyerWeixin(), - // vvPromoterRequest.getPromoterBuyerPhone(), - // vvPromoterRequest.getMinCreateTimestamp(), - // vvPromoterRequest.getMaxCreateTimestamp(), - // vvPromoterRequest.getCreateTimestampSort() - //); - return null; - } - }); - - return R.ok().setData(pageUtils); - } - -} diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterController.java index 5ba247f..886ac11 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterController.java @@ -22,10 +22,8 @@ import java.util.List; @RequestMapping("/mm/promoter/buyer") public class AdminPromoterController { - @Autowired private VvPromoterBuyerDao vvPromoterBuyerDao; - /*** * 列表 * http://localhost:8888/mm/promoter/buyer/list @@ -51,4 +49,5 @@ public class AdminPromoterController { }); return R.ok().setData(pageUtils); } + } \ No newline at end of file diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java index b09bce5..567c5af 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java @@ -2,7 +2,7 @@ package com.heyu.api.controller.vv; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.heyu.api.alibaba.request.mm.VvPromoterLineRequest; +import com.heyu.api.alibaba.request.mm.VvPromoterTradeOrderLineRequest; import com.heyu.api.common.annotation.AppLogin; import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.utils.R; @@ -30,7 +30,7 @@ public class AppPromoterAwardLineController { */ @Describe("我的奖励列表") @RequestMapping("/list") - public R list(@RequestBody VvPromoterLineRequest vvPromoterRequest) { + public R list(@RequestBody VvPromoterTradeOrderLineRequest vvPromoterRequest) { PPageUtils pageUtils = PPageUtils.startPage(vvPromoterRequest.getPageNum(), vvPromoterRequest.getPageSize()) .doSelect(new ISelect() { @Override