fix 分销订单

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

@@ -18,7 +18,7 @@ import java.util.Date;
 @Setter
 @SearchBean(tables = "order_don od left join user_distribute_shared uds on uds.user_id = od.user_id" +
 		" left join user_distribute ud on ud.user_id = uds.shared_id",
-where = "od.is_distribute is true")
+where = "od.is_distribute is true and od.status not in ('close','noPayment')")
 public class DistributeOrdersView {
 	@DbField("od.id")
 	private Long id;
@@ -26,6 +26,9 @@ public class DistributeOrdersView {
 	@DbField("od.money")
 	private BigDecimal money;
 
+	@DbField("uds.shared_id")
+	private Long sharedId;
+
 	@DbField("ud.user_id")
 	private Long userId;
 

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

@@ -1,5 +1,6 @@
 package com.cyksj.model.views;
 
+import com.cyksj.model.entity.OrderDon;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
@@ -52,6 +53,9 @@ public class DistributePopularizeOrdersView {
 	@DbIgnore
 	private String goodsTitle;
 
+	@DbField("od.status")
+	private OrderDon.Status orderStatus;
+
 	@DbIgnore
 	private String specVal;
 

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -490,6 +490,13 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setStatus(OrderDon.Status.noPayment);
 		orderDon.setUserId(user.getId());
 		orderDon.setGoodsId(goodsDon.getId());
+		//虚拟商品订单,是否是分销订单
+		if (goodsDon.getType() == 1) {
+			UserDistributeShared userDistributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class).eq(UserDistributeShared::getUserId, user.getId()).last("limit 1"));
+			if (userDistributeShared != null) {
+				orderDon.setIsDistribute(true);
+			}
+		}
 		this.saveOrUpdate(orderDon);
 
 		jobManager.addJob(EXPIRY_TIME, () -> {

netflix-service/src/main/java/com/cyksj/task/StatisticsDataScheduler.java

@@ -50,9 +50,7 @@ public class StatisticsDataScheduler {
 	public static List<String> noOrderStatus = List.of("close", "noPayment");
 
 	public static List<String> payType = List.of("月", "季", "年");
-
-	private final static List<String> APPLE_ONE_AREA = List.of("美区", "马来西亚区");
-
+	
 	private static Long DAY_MILLS = 86400000l;
 
 	private final GoodsDonMapper goodsDonMapper;

netflix-web/src/main/java/com/cyksj/web/controller/user/DistributePopularizeController.java

@@ -105,7 +105,7 @@ public class DistributePopularizeController {
 		distributePopularizeView.setUrlCode(QrCodeUtil.generateAsBase64(distributePopularizeView.getUrl(), QrConfig.create(), "png"));
 		User user = userMapper.selectById(userId);
 		distributePopularizeView.setGotPoints(user.getPoints());
-		Number number = beanSearcher.searchCount(DistributeOrdersView.class, MapUtils.builder().field(DistributeOrdersView::getUserId, userId).op(Operator.Equal).build());
+		Number number = beanSearcher.searchCount(DistributeOrdersView.class, MapUtils.builder().field(DistributeOrdersView::getSharedId, userId).op(Operator.Equal).build());
 		distributePopularizeView.setDistributeOrders(number.intValue());
 		UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class).eq(UserDistribute::getUserId, userId).select(UserDistribute::getId).last("limit 1"));
 		if (userDistribute != null) {