fix 后台用户分销用户数据

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

@@ -18,19 +18,21 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "order_don od left join goods_don gd on gd.id = od.goods_id")
+@SearchBean(tables = "distribute_waiting_send_points dw left join order_don od on od.id = dw.order_id and dw.is_vip = false" +
+		" left join vip_order_don vod on vod.id = dw.order_id and dw.is_vip = true" +
+		" left join goods_don gd on gd.id = ifnull(od.goods_id,vod.goods_id)")
 public class RegisterDistributeOrdersDetailView {
 
-	@DbField("od.created_time")
+	@DbField("ifnull(od.created_time,vod.created_time)")
 	private Date createdTime;
 
-	@DbField("od.money")
+	@DbField("ifnull(od.money,vod.money)")
 	private BigDecimal money;
 
-	@DbField("od.status")
+	@DbField("ifnull(od.status,vod.status)")
 	private OrderDon.Status status;
 
-	@DbField("od.user_id")
+	@DbField("dw.user_id")
 	private Long userId;
 
 	@DbIgnore
@@ -47,10 +49,4 @@ public class RegisterDistributeOrdersDetailView {
 
 	@DbIgnore
 	private String specVal;
-
-	@DbField("od.is_distribute")
-	private Boolean isDistribute;
-
-	@DbField("od.is_fixed_distribute")
-	private Boolean isFixedDistribute;
 }

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

@@ -437,9 +437,11 @@ public class DistributeController {
 		SearchResult<RegisterDistributeOrdersDetailView> search = beanSearcher.search(RegisterDistributeOrdersDetailView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		search.getDataList().forEach(data -> {
 			User user = userMapper.selectById(data.getUserId());
-			GoodsDonSku sku = goodsDonSkuMapper.selectById(data.getSkuId());
+			if (data.getSkuId() != null) {
+				GoodsDonSku sku = goodsDonSkuMapper.selectById(data.getSkuId());
+				data.setSpecVal(sku != null ? sku.getSpecVal() : "");
+			}
 			data.setNickname(user != null ? user.getNickname() : "");
-			data.setSpecVal(sku != null ? sku.getSpecVal() : "");
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}