|
@@ -22,6 +22,7 @@ import com.cyksj.service.mange.RefreshCacheService;
|
|
|
import com.cyksj.service.user.UserBindRelationService;
|
|
import com.cyksj.service.user.UserBindRelationService;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
import com.ejlchina.searcher.SearchResult;
|
|
import com.ejlchina.searcher.SearchResult;
|
|
|
|
|
+import com.ejlchina.searcher.param.Operator;
|
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -163,7 +164,9 @@ public class CmsGoodsDonWholeSaleController {
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/get/deposit")
|
|
@GetMapping("/get/deposit")
|
|
|
public Result<SearchResult<GoodsWholesaleUserDeposit>> getDeposit() {
|
|
public Result<SearchResult<GoodsWholesaleUserDeposit>> getDeposit() {
|
|
|
- SearchResult<GoodsWholesaleUserDeposit> search = beanSearcher.search(GoodsWholesaleUserDeposit.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
|
|
|
|
|
+ SearchResult<GoodsWholesaleUserDeposit> search = beanSearcher.search(GoodsWholesaleUserDeposit.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
|
|
|
+ .field(GoodsWholesaleUserDeposit::getStatus, GoodsWholesaleUserDeposit.Status.noPayment).op(Operator.NotEqual)
|
|
|
|
|
+ .build());
|
|
|
search.getDataList().forEach(data -> {
|
|
search.getDataList().forEach(data -> {
|
|
|
List<Long> userIdList = userBindRelationService.getRelationUserIdList(data.getUserId(), null);
|
|
List<Long> userIdList = userBindRelationService.getRelationUserIdList(data.getUserId(), null);
|
|
|
Integer total = goodsWholesaleOrderDonMapper.getUserWholesaleNumByUserIds(userIdList);
|
|
Integer total = goodsWholesaleOrderDonMapper.getUserWholesaleNumByUserIds(userIdList);
|