提交修改
This commit is contained in:
parent
6d27e381b6
commit
13a8ea3dea
@ -4,7 +4,7 @@ package com.heyu.api.alibaba.request.mm;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class VvPromoterLineRequest extends VVAdminBaseRequest {
|
public class VvPromoterTradeOrderLineRequest extends VVAdminBaseRequest {
|
||||||
|
|
||||||
//推广者id,唯一值
|
//推广者id,唯一值
|
||||||
private String promoterId;
|
private String promoterId;
|
||||||
@ -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);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -22,10 +22,8 @@ import java.util.List;
|
|||||||
@RequestMapping("/mm/promoter/buyer")
|
@RequestMapping("/mm/promoter/buyer")
|
||||||
public class AdminPromoterController {
|
public class AdminPromoterController {
|
||||||
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private VvPromoterBuyerDao vvPromoterBuyerDao;
|
private VvPromoterBuyerDao vvPromoterBuyerDao;
|
||||||
|
|
||||||
/***
|
/***
|
||||||
* 列表
|
* 列表
|
||||||
* http://localhost:8888/mm/promoter/buyer/list
|
* http://localhost:8888/mm/promoter/buyer/list
|
||||||
@ -51,4 +49,5 @@ public class AdminPromoterController {
|
|||||||
});
|
});
|
||||||
return R.ok().setData(pageUtils);
|
return R.ok().setData(pageUtils);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -2,7 +2,7 @@ package com.heyu.api.controller.vv;
|
|||||||
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
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.AppLogin;
|
||||||
import com.heyu.api.common.annotation.Describe;
|
import com.heyu.api.common.annotation.Describe;
|
||||||
import com.heyu.api.data.utils.R;
|
import com.heyu.api.data.utils.R;
|
||||||
@ -30,7 +30,7 @@ public class AppPromoterAwardLineController {
|
|||||||
*/
|
*/
|
||||||
@Describe("我的奖励列表")
|
@Describe("我的奖励列表")
|
||||||
@RequestMapping("/list")
|
@RequestMapping("/list")
|
||||||
public R list(@RequestBody VvPromoterLineRequest vvPromoterRequest) {
|
public R list(@RequestBody VvPromoterTradeOrderLineRequest vvPromoterRequest) {
|
||||||
PPageUtils pageUtils = PPageUtils.startPage(vvPromoterRequest.getPageNum(), vvPromoterRequest.getPageSize())
|
PPageUtils pageUtils = PPageUtils.startPage(vvPromoterRequest.getPageNum(), vvPromoterRequest.getPageSize())
|
||||||
.doSelect(new ISelect() {
|
.doSelect(new ISelect() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user