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

单词错误

Browse Source
This commit is contained in:
wangw
2025-11-28 17:21:17 +08:00
parent 824f35e636
commit a3435a56b2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java
View File

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

8
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
View File

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

2
cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml
View File

@@ -8,7 +8,7 @@
SELECT SELECT
`order`.call_phone AS phone, `order`.call_phone AS phone,
count( 1 ) AS orderNum, 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 MAX(`order`.create_time) AS lastBookingTime
FROM FROM
`bk_order` `order` `bk_order` `order`