diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenDeptTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenDeptTotalController.java index 3f9cb1525..695fdbaa8 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenDeptTotalController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenDeptTotalController.java @@ -38,11 +38,4 @@ public class HardCanteenDeptTotalController { return R.ok(canteenTotalService.listByDept(dto, dataScope)); } - @Operation(summary = "食堂菜品购买用餐时间段统计", description = "食堂菜品购买用餐时间段统计") - @PostMapping("/list-by-hour-type") - public R> listByHourType(@RequestBody HardOrderDto dto) { - DataScope dataScope = null; - return R.ok(canteenTotalService.listByHourType(dto, dataScope)); - } - } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardCanteenTotalService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardCanteenTotalService.java index 14951e329..2ccc58d4c 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardCanteenTotalService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardCanteenTotalService.java @@ -32,8 +32,4 @@ public interface HardCanteenTotalService { */ List listByDept(HardOrderDto dto, DataScope dataScope); - /** - * 食堂菜品购买用餐时间段统计 - */ - List listByHourType(HardOrderDto dto, DataScope dataScope); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java index db89480a3..8ab5a494f 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java @@ -16,11 +16,9 @@ import com.bsd.pjcloud.hard.mapper.order.HardCarMapper; import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper; import com.bsd.pjcloud.hard.service.HardCanteenTotalService; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; -import com.bsd.pjcloud.wallet.api.feign.RemoteWalletService; import com.bsd.pjcloud.wallet.api.vo.MchManageVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -130,14 +128,6 @@ public class HardCanteenTotalServiceImpl implements HardCanteenTotalService { return list; } - /** - * 食堂菜品购买用餐时间段统计 - */ - @Override - public List listByHourType(HardOrderDto dto, DataScope dataScope) { - return List.of(); - } - /** * 为HardCanteenProductTotalVo增加部门信息 */ diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml index 7f7f0dd45..3956cd160 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml @@ -61,7 +61,7 @@ inner join hard_order o on o.parent_car_id = p.id and o.del_flag = '0' and o.hour_type is not null and o.hour_type not in ('-1') - + and o.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]} @@ -244,6 +244,9 @@ and o.merchant_id = #{dto.merchantId} + + and o.pay_time between #{dto.payTimeList[0]} and #{dto.payTimeList[1]} + group by o.merchant_id order by o.merchant_id @@ -269,8 +272,14 @@ and o.merchant_id = #{dto.merchantId} - - and o.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]} + + and o.order_status in + + #{v} + + + + and o.pay_time between #{dto.payTimeList[0]} and #{dto.payTimeList[1]} group by o.user_dept_id, o.hour_type