单词错误
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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`
|
||||
|
||||
Reference in New Issue
Block a user