czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-12-02 14:35:00 +08:00
parent 5d2ffd181f b06737027a
commit 1958ddfadf
9 changed files with 128 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkOrderMapper.java
View File

@@ -1,5 +1,6 @@
package com.czg.service.account.mapper;
import com.czg.account.vo.BookingOrderStatisticsVO;
import com.mybatisflex.core.BaseMapper;
import com.czg.account.entity.BkOrder;
@@ -14,6 +15,11 @@ import java.util.List;
*/
public interface BkOrderMapper extends BaseMapper<BkOrder> {
/**
* 查询预约单统计信息
*/
BookingOrderStatisticsVO bookingOrderStatistics(Long shopId, String search, LocalDate start, LocalDate end, String status);
/**
* 查询预约单列表
*/

20
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java
View File

@@ -3,18 +3,19 @@ package com.czg.service.account.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import com.czg.account.dto.BkOrderDTO;
import com.czg.account.entity.BkOrder;
import com.czg.account.entity.BkOrderTable;
import com.czg.account.service.BkOrderService;
import com.czg.account.vo.BkTableVO;
import com.czg.account.vo.BookingOrderStatisticsVO;
import com.czg.exception.CzgException;
import com.czg.service.account.mapper.BkOrderMapper;
import com.czg.service.account.mapper.BkOrderTableMapper;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.update.UpdateWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.account.entity.BkOrder;
import com.czg.account.service.BkOrderService;
import com.czg.service.account.mapper.BkOrderMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -34,6 +35,11 @@ public class BkOrderServiceImpl extends ServiceImpl<BkOrderMapper, BkOrder> impl
@Resource
private BkOrderTableMapper tableMapper;
@Override
public BookingOrderStatisticsVO bookingOrderStatistics(Long shopId, String search, LocalDate start, LocalDate end, String status) {
return mapper.bookingOrderStatistics(shopId, search, start, end, status);
}
/**
* 预约端-预约单：列表
*/
@@ -42,8 +48,14 @@ public class BkOrderServiceImpl extends ServiceImpl<BkOrderMapper, BkOrder> impl
return mapper.bookings(shopId, search, start, end, status);
}
@Override
public List<BkOrderTable> bookingTables(Long shopId, Long bkOrderId) {
return tableMapper.selectListByQuery(QueryWrapper.create().eq(BkOrderTable::getBookOrderId, bkOrderId).eq(BkOrderTable::getShopId, shopId));
}
@Override
@Transactional
public void booking(Long shopId, BkOrderDTO bkOrder) {
BkOrder bkOrderEntity = BeanUtil.copyProperties(bkOrder, BkOrder.class);
bkOrderEntity.setShopId(shopId);

35
cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml
View File

@@ -32,4 +32,39 @@
group by o.id
order by o.booking_time desc
</select>
<select id="bookingOrderStatistics" resultType="com.czg.account.vo.BookingOrderStatisticsVO">
SELECT
COUNT(CASE WHEN DATE(create_time) = CURDATE() THEN 1 END) as todayBookingCount,
COUNT(CASE WHEN YEAR(create_time) = YEAR(CURDATE()) AND MONTH(create_time) = MONTH(CURDATE()) THEN 1 END) as thisMonthBookingCount,
COUNT(CASE WHEN status = '待到店' THEN 1 END) as arrivedCount,
COALESCE(
ROUND(
COUNT(CASE WHEN status = '已到店' THEN 1 END) * 100.0 /
NULLIF(COUNT(CASE WHEN status != '已取消' THEN 1 END), 0),
2
), 0
) as arrivalRate
FROM bk_order
WHERE shop_id = #{shopId}
<if test="search != null and search != ''">
AND (o.call_username LIKE CONCAT('%', #{search}, '%')
OR o.call_phone LIKE CONCAT('%', #{search}, '%')
OR o.booking_username LIKE CONCAT('%', #{search}, '%')
OR o.booking_phone LIKE CONCAT('%', #{search}, '%'))
</if>
<if test="start != null and end != null">
AND o.booking_time >= CONCAT(#{start}, ' 00:00:00')
AND o.booking_time &lt;= CONCAT(#{end}, ' 23:59:59')
</if>
<if test="status != null and status != ''">
<if test="status == '已超时'">
AND o.status = '待到店'
AND o.booking_time &lt; DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%s')
</if>
<if test="status != '已超时'">
AND o.status = #{status}
</if>
</if>
</select>
</mapper>

2
cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java
View File

@@ -26,7 +26,7 @@ public interface KitchenDetailMapper {
List<KitchenTableFoodVO> getKitchenTableFoods(Long shopId, Long orderId, String tableCode, Long isNoTable);
/**
* 按台桌查看商品列表
* 按商品查看
*/
List<KitchenFoodVO> getKitchenFood(Long shopId, String productName, Long categoryId);
}

4
cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml
View File

@@ -19,7 +19,7 @@
`staff`.`name` AS staffName,
sum(detail.num - detail.return_num) AS num,
detail.sub_status AS subStatus,
detail.order_time AS orderTime,
detail.create_time AS orderTime,
detail.start_order_time AS startOrderTime,
detail.dish_out_time AS dishOutTime,
detail.food_serve_time AS foodServeTime
@@ -90,7 +90,7 @@
detail.sku_name AS skuName,
sum(detail.num - detail.return_num) AS num,
detail.sub_status AS subStatus,
detail.order_time AS orderTime,
detail.create_time AS orderTime,
detail.start_order_time AS startOrderTime,
detail.dish_out_time AS dishOutTime,
detail.food_serve_time AS foodServeTime