|
|
@@ -319,8 +319,12 @@ public class StatisticsDataController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/get/original")
|
|
|
- public Result<String> getOriginal(String start, String end) throws Exception {
|
|
|
- List<OrderDon> orderDons = orderDonMapper.selectList(Wrappers.lambdaQuery(OrderDon.class).eq(OrderDon::getOrderType, 2).notIn(OrderDon::getStatus, noOrderStatus).between(OrderDon::getCreatedTime, start, end));
|
|
|
+ public Result<String> getOriginal(String start, String end, Long goodsId) throws Exception {
|
|
|
+ List<OrderDon> orderDons = orderDonMapper.selectList(Wrappers.lambdaQuery(OrderDon.class)
|
|
|
+ .eq(goodsId != null, OrderDon::getGoodsId, goodsId)
|
|
|
+ .eq(OrderDon::getOrderType, 2)
|
|
|
+ .notIn(OrderDon::getStatus, noOrderStatus)
|
|
|
+ .between(OrderDon::getCreatedTime, start, end));
|
|
|
Integer twoPay = orderDonMapper.getTowPayUser(start, end);
|
|
|
Map<String, Integer> map = new HashMap<>();
|
|
|
map.put("账号续费的订单数", orderDons.size());
|