fix 分销人展示所有状态订单

netflix-dao/src/main/java/com/cyksj/model/views/RegisterDistributeOrdersDetailView.java

@@ -4,7 +4,6 @@ import com.cyksj.model.entity.OrderDon;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,8 +18,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "distribute_waiting_send_points dp left join order_don od on od.id = dp.order_id" +
-		" left join goods_don gd on gd.id = od.goods_id")
+@SearchBean(tables = "order_don od left join goods_don gd on gd.id = od.goods_id")
 public class RegisterDistributeOrdersDetailView {
 
 	@DbField("od.created_time")
@@ -32,11 +30,7 @@ public class RegisterDistributeOrdersDetailView {
 	@DbField("od.status")
 	private OrderDon.Status status;
 
-	@DbField("dp.shared_id")
-	@JsonIgnore
-	private Long sharedId;
-
-	@DbField("dp.user_id")
+	@DbField("od.user_id")
 	private Long userId;
 
 	@DbIgnore

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -17,6 +17,7 @@ import com.cyksj.model.request.DistributeApplyMoneyReq;
 import com.cyksj.model.request.UserDistributeReq;
 import com.cyksj.model.views.*;
 import com.cyksj.service.distribute.DistributeService;
+import com.cyksj.task.OrderCustomerHandleScheduler;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.param.Operator;
@@ -147,10 +148,15 @@ public class DistributeController {
 	@GetMapping("/get/register/distribute/user")
 	public Result<SearchResult<RegisterDistributeOrdersView>> getRegisterDistributeUserDetail(HttpServletRequest request) {
 		SearchResult<RegisterDistributeOrdersView> search = beanSearcher.search(RegisterDistributeOrdersView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
-		search.getDataList().forEach(data->{
+		search.getDataList().forEach(data -> {
 			List<RegisterDistributeOrdersDetailView> ordersDetailViewList = beanSearcher.searchAll(RegisterDistributeOrdersDetailView.class, MapUtils.builder().field(RegisterDistributeOrdersDetailView::getUserId, data.getUserId()).op(Operator.Equal).build());
 			data.setOrderNums(ordersDetailViewList.size());
-			Optional<BigDecimal> money = ordersDetailViewList.stream().map(RegisterDistributeOrdersDetailView::getMoney).reduce(BigDecimal::add);
+			Optional<BigDecimal> money = ordersDetailViewList.stream().filter(order -> {
+				if (!OrderCustomerHandleScheduler.noOrderStatus.contains(order.getStatus().name())) {
+					return true;
+				}
+				return false;
+			}).map(RegisterDistributeOrdersDetailView::getMoney).reduce(BigDecimal::add);
 			data.setMoney(money.isPresent() ? money.get() : BigDecimal.ZERO);
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);