|
|
@@ -31,6 +31,7 @@ import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
import java.util.List;
|
|
|
@@ -69,10 +70,12 @@ public class DistributePopularizeController {
|
|
|
* 推广订单明细
|
|
|
*/
|
|
|
@GetMapping("/orders/detail")
|
|
|
- public Result<SearchResult<DistributePopularizeOrdersView>> getOrdersView() {
|
|
|
+ public Result<SearchResult<DistributePopularizeOrdersView>> getOrdersView(HttpServletRequest request) {
|
|
|
Long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
SearchResult<DistributePopularizeOrdersView> search = beanSearcher.search(DistributePopularizeOrdersView.class,
|
|
|
- MapUtils.builder().field(DistributePopularizeOrdersView::getSharedId, userId).build());
|
|
|
+ MapUtils.flatBuilder(request.getParameterMap())
|
|
|
+ .field(DistributePopularizeOrdersView::getSharedId, userId)
|
|
|
+ .build());
|
|
|
search.getDataList().forEach(data -> {
|
|
|
GoodsDon goodsDon = goodsDonMapper.selectById(data.getGoodsId());
|
|
|
GoodsDonSku goodsDonSku = goodsDonSkuMapper.selectById(data.getSkuId());
|
|
|
@@ -86,10 +89,11 @@ public class DistributePopularizeController {
|
|
|
* 提现明细
|
|
|
*/
|
|
|
@GetMapping("/applyMoney/detail")
|
|
|
- public Result<SearchResult<DistributeMoneyApplyView>> getApplyMoneyView() {
|
|
|
+ public Result<SearchResult<DistributeMoneyApplyView>> getApplyMoneyView(HttpServletRequest request) {
|
|
|
Long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
SearchResult<DistributeMoneyApplyView> search = beanSearcher.search(DistributeMoneyApplyView.class,
|
|
|
- MapUtils.builder().field(DistributeMoneyApplyView::getUserId, userId).op(Operator.Equal)
|
|
|
+ MapUtils.flatBuilder(request.getParameterMap())
|
|
|
+ .field(DistributeMoneyApplyView::getUserId, userId).op(Operator.Equal)
|
|
|
.build());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
|
}
|