fix 排除账号注册关闭订单

netflix-dao/src/main/java/com/cyksj/mapper/RegisterOrderDonMapper.java

@@ -17,8 +17,7 @@ public interface RegisterOrderDonMapper extends BaseMapper<RegisterOrderDon> {
 	@Select("select platform,count(distinct user_id) as numOfUser," +
 			"count(user_id) as numOfOrder,sum(money) as money" +
 			" from register_order_don" +
-			" where created_time between #{yesZeroDate} and #{thisZeroDate} and status != 'noPayment' and platform = #{platform}" +
-			" group by platform")
+			" where created_time between #{yesZeroDate} and #{thisZeroDate} and status not in ('noPayment','close') and platform = #{platform}")
 	RegisterAccountData registerAccountDataEveryDay(@Param("yesZeroDate") Date yesZeroDate, @Param("thisZeroDate") Date thisZeroDate, @Param("platform") String platform);
 
 	@Select("select count(user_id) as 'numOfRefundOrder',"+

netflix-dao/src/main/resources/mapper/OrderDonMapper.xml

@@ -38,7 +38,7 @@
     </select>
 
     <select id="getAppleOneOrderDons" resultType="com.cyksj.model.entity.OrderDon">
-        select distinct s.* from (select id,sku_id,user_id,money,is_distribute from `order_don`
+        select distinct s.* from (select id,sku_id,user_id,money,is_distribute,`type` from `order_don`
         where sku_id in
         <foreach collection="skuIds" item="item" open="(" separator="," close=")">
             #{item}

netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -227,7 +227,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 
 	private void headerData(BackgroundDataView backgroundDataView, Date startDate, Date endDate) {
 		//总订单数
-		List<OrderDon> orderDons = Optional.ofNullable(orderDonService.list(Wrappers.lambdaQuery(OrderDon.class).notIn(OrderDon::getStatus, StatisticsDataScheduler.noOrderStatus).ge(ObjectUtil.isNotNull(startDate), OrderDon::getCreatedTime, startDate).le(ObjectUtil.isNotNull(endDate), OrderDon::getCreatedTime, endDate))).orElse(new ArrayList<>());
+		List<OrderDon> orderDons = Optional.ofNullable(orderDonService.list(Wrappers.lambdaQuery(OrderDon.class).notIn(OrderDon::getStatus, StatisticsDataScheduler.noOrderStatus).ge(ObjectUtil.isNotNull(startDate), OrderDon::getCreatedTime, startDate).lt(ObjectUtil.isNotNull(endDate), OrderDon::getCreatedTime, endDate))).orElse(new ArrayList<>());
 		backgroundDataView.setTotalNumOfOrder(orderDons.size());
 		//总下单用户数
 		backgroundDataView.setTotalNumOfUser(orderDons.stream().map(OrderDon::getUserId).collect(Collectors.toSet()).size());
@@ -235,7 +235,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		//总订单金额
 		backgroundDataView.setTotalOrderAmount(totalMoney.isPresent() ? totalMoney.get().divide(BigDecimal.valueOf(100)) : BigDecimal.ZERO);
 		//退款列表
-		List<OrderDon> refundOrders = Optional.ofNullable(orderDonService.list(Wrappers.lambdaQuery(OrderDon.class).eq(OrderDon::getStatus, OrderDon.Status.refund).ge(ObjectUtil.isNotNull(startDate), OrderDon::getCreatedTime, startDate).le(ObjectUtil.isNotNull(endDate), OrderDon::getCreatedTime, endDate).select(OrderDon::getId, OrderDon::getRefundMoney))).orElse(new ArrayList<>());
+		List<OrderDon> refundOrders = Optional.ofNullable(orderDonService.list(Wrappers.lambdaQuery(OrderDon.class).eq(OrderDon::getStatus, OrderDon.Status.refund).ge(ObjectUtil.isNotNull(startDate), OrderDon::getCreatedTime, startDate).lt(ObjectUtil.isNotNull(endDate), OrderDon::getCreatedTime, endDate).select(OrderDon::getId, OrderDon::getRefundMoney))).orElse(new ArrayList<>());
 		backgroundDataView.setTotalNumOfRefundOrder(refundOrders.size());
 		//退款金额
 		Optional<BigDecimal> totalRefundAmount = refundOrders.stream().map(OrderDon::getRefundMoney).reduce(BigDecimal::add);