|
|
@@ -124,8 +124,12 @@ public class CmsOrderController {
|
|
|
* 导出用户意愿列表
|
|
|
*/
|
|
|
@GetMapping("/export/interest")
|
|
|
- public void exportInterest(HttpServletRequest request, HttpServletResponse response) {
|
|
|
- List<ExcelRealGoodsUserInterestData> excelRealGoodsUserInterestData = beanSearcher.searchAll(ExcelRealGoodsUserInterestData.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
|
+ public void exportInterest(RealGoodsInterestUser.Status interestStatus, HttpServletRequest request, HttpServletResponse response) {
|
|
|
+ MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
+ if (interestStatus == null) {
|
|
|
+ builder.field(RealGoodsInterestUserView::getInterestStatus, "hasPayment").op(Operator.NotEqual);
|
|
|
+ }
|
|
|
+ List<ExcelRealGoodsUserInterestData> excelRealGoodsUserInterestData = beanSearcher.searchAll(ExcelRealGoodsUserInterestData.class, builder.build());
|
|
|
excelRealGoodsUserInterestData.forEach(data -> {
|
|
|
Long goodsId = data.getGoodsId();
|
|
|
OrderDon order = cmsOrderDonService.getOne(Wrappers.lambdaQuery(OrderDon.class).eq(OrderDon::getUserId, data.getUserId()).eq(OrderDon::getGoodsId, goodsId).ne(OrderDon::getId, data.getId()).gt(OrderDon::getMoney, data.getMoney()).eq(OrderDon::getStatus, "close").last("limit 1"));
|