zoujiajian 1 год назад
Родитель
Сommit
fc71e884db

+ 7 - 0
netflix-dao/src/main/java/com/cyksj/model/views/GoodsWholesaleOrderView.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.views;
 
+import com.cyksj.model.entity.GoodsWholesaleOrderDon;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
@@ -57,6 +58,12 @@ public class GoodsWholesaleOrderView {
 	@DbField("go.balance")
 	private BigDecimal balance;
 
+	@DbField("go.status")
+	private GoodsWholesaleOrderDon.Status status;
+
+	@DbField("go.type")
+	private GoodsWholesaleOrderDon.Type type;
+
 	@DbField("go.pay_time")
 	private Date payTime;
 

+ 4 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonWholeSaleController.java

@@ -22,6 +22,7 @@ import com.cyksj.service.mange.RefreshCacheService;
 import com.cyksj.service.user.UserBindRelationService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -163,7 +164,9 @@ public class CmsGoodsDonWholeSaleController {
 	 */
 	@GetMapping("/get/deposit")
 	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 -> {
 			List<Long> userIdList = userBindRelationService.getRelationUserIdList(data.getUserId(), null);
 			Integer total = goodsWholesaleOrderDonMapper.getUserWholesaleNumByUserIds(userIdList);