订单统计只计算充值成功和支付成功的

src/main/java/com/usky/dxtop/controller/web/OrderController.java

@@ -10,11 +10,9 @@ import com.usky.dxtop.model.Order;
 import com.usky.dxtop.service.OrderService;
 import com.usky.dxtop.service.emun.OrderStatus;
 import com.usky.dxtop.service.vo.OrderRequest;
-import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 
 /**
@@ -172,6 +170,7 @@ public class OrderController extends BaseController {
         Date date = new Date();
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("IFNULL(sum(money),0) as total","count(*) as count")
+                .and(wrapper -> wrapper.eq("order_flag",OrderStatus.SUCCESS.getCode()).or().eq("order_flag",OrderStatus.COMPLETE.getCode()))
                 .between("create_time",DateUtils.getDayStartTime(date),date);
         return AjaxResult.success(orderService.getMap(queryWrapper));
     }

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -522,6 +522,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     public List<Map<String, Object>> payTypeCollect() {
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("sum(money) as money","pay_type as payType")
+                .and(wrapper -> wrapper.eq("order_flag",OrderStatus.SUCCESS.getCode()).or().eq("order_flag",OrderStatus.COMPLETE.getCode()))
                 .groupBy("pay_type");
         List<Map<String, Object>> list = baseMapper.selectMaps(queryWrapper);
         for (OrderPayType orderPayType:OrderPayType.values()) {
@@ -549,6 +550,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             times = 13;
         }
         queryWrapper.select(String.format("%s%s",type,"as orderTime"),"IFNULL(sum(money),0) as total")
+                .and(wrapper -> wrapper.eq("order_flag",OrderStatus.SUCCESS.getCode()).or().eq("order_flag",OrderStatus.COMPLETE.getCode()))
                 .between("create_time",startTime,endTime)
                 .groupBy("orderTime");
         List<Map<String, Object>> list = baseMapper.selectMaps(queryWrapper);