单词错误

This commit is contained in:
2025-11-28 17:21:17 +08:00
parent 824f35e636
commit a3435a56b2
3 changed files with 6 additions and 6 deletions

View File

@@ -56,7 +56,7 @@ public class BkContactList implements Serializable {
* 取消数
*/
@Column(ignore = true)
private Integer cannelNum;
private Integer cancelNum;
/**
* 最后一次预约时间

View File

@@ -97,10 +97,10 @@ public class AShopUserServiceImpl implements AShopUserService {
Long mainIdByShopId = shopInfoService.getMainIdByShopId(StpKit.USER.getShopId());
PageHelper.startPage(PageUtil.buildPageHelp());
PageInfo<ShopUserDTO> shopUserDTOPageInfo = new PageInfo<>(shopUserMapper.selectPageByKeyAndIsVip(mainIdByShopId, isVip, key, amount));
shopUserDTOPageInfo.getList().forEach(item -> {
item.setNew(consumeDiscountService.isNewUser(item, StpKit.USER.getShopId()));
setUserDiscount(item);
});
// shopUserDTOPageInfo.getList().forEach(item -> {
// item.setNew(consumeDiscountService.isNewUser(item, StpKit.USER.getShopId()));
// setUserDiscount(item);
// });
return PageUtil.convert(shopUserDTOPageInfo);
}

View File

@@ -8,7 +8,7 @@
SELECT
`order`.call_phone AS phone,
count( 1 ) AS orderNum,
sum( CASE `order`.`status` WHEN '已取消' THEN 1 ELSE 0 END ) AS cannelNum,
sum( CASE `order`.`status` WHEN '已取消' THEN 1 ELSE 0 END ) AS cancelNum,
MAX(`order`.create_time) AS lastBookingTime
FROM
`bk_order` `order`