From a3435a56b276eb985cc9598a15531ba387c326b8 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 28 Nov 2025 17:21:17 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8D=95=E8=AF=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/account/entity/BkContactList.java | 2 +- .../account/service/impl/AShopUserServiceImpl.java | 8 ++++---- .../src/main/resources/mapper/BkContactListMapper.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java index b2e0e0dad..4e83deaee 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java @@ -56,7 +56,7 @@ public class BkContactList implements Serializable { * 取消数 */ @Column(ignore = true) - private Integer cannelNum; + private Integer cancelNum; /** * 最后一次预约时间 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java index 114df43c7..7e68b3c09 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java @@ -97,10 +97,10 @@ public class AShopUserServiceImpl implements AShopUserService { Long mainIdByShopId = shopInfoService.getMainIdByShopId(StpKit.USER.getShopId()); PageHelper.startPage(PageUtil.buildPageHelp()); PageInfo 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); } diff --git a/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml b/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml index 6af02096e..f42bef410 100644 --- a/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml @@ -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` From af8d528a2f1bdcee48cecde1d69f5ee99b8230e5 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 28 Nov 2025 17:30:39 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/order/vo/KitchenFoodVO.java | 9 ++++++--- .../src/main/resources/mapper/KitchenDetailMapper.xml | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java index 1da3b826a..46ce8418d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java @@ -1,6 +1,7 @@ package com.czg.order.vo; import lombok.Data; + import java.util.List; /** @@ -18,13 +19,15 @@ public class KitchenFoodVO { private String productName; private String skuName; + private Long categoryId; + String categoryName; private List foodItems; record KitchenFoodItemVO( - //员工名称 - Long orderId, String staffName, - String tableName,String areaName,Long orderDetailId,Long categoryId,String categoryName, + //员工名称 + Long orderId, String staffName, + String tableName, String areaName, Long orderDetailId, //下单数 //菜品状态 待起菜 PENDING_PREP 待出菜 READY_TO_SERVE 已出菜 SENT_OUT 已上菜 DELIVERED Long num, String subStatus, //下单时间 起菜时间 出菜时间 上菜时间 diff --git a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml index 2c19edff7..5abf405f4 100644 --- a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml @@ -108,6 +108,8 @@ + + @@ -115,8 +117,6 @@ - - From 002a34042bcc3b13065e0f9f566985878820500a Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 28 Nov 2025 17:43:27 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/BkContactListServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java index f93d5b345..9e3557b3c 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java @@ -20,12 +20,12 @@ import java.util.stream.Collectors; * @since 2025-11-27 */ @Service -public class BkContactListServiceImpl extends ServiceImpl implements BkContactListService{ +public class BkContactListServiceImpl extends ServiceImpl implements BkContactListService { @Override public List getUserList(Long shopId, Set phones) { remove(QueryWrapper.create().eq(BkContactList::getShopId, shopId)); - saveBatch(phones.stream() + List collect = phones.stream() .filter(StrUtil::isNotEmpty) .map(phone -> { BkContactList bkContact = new BkContactList(); @@ -33,7 +33,8 @@ public class BkContactListServiceImpl extends ServiceImpl Date: Fri, 28 Nov 2025 17:47:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5=2050?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/account/service/impl/BkContactListServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java index 9e3557b3c..a2992db98 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java @@ -34,7 +34,7 @@ public class BkContactListServiceImpl extends ServiceImpl Date: Fri, 28 Nov 2025 18:08:12 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MerchantRegisterServiceImpl.java | 10 +++------- .../account/service/impl/ShopExtendServiceImpl.java | 4 ++-- .../account/service/impl/ShopTableServiceImpl.java | 2 +- .../account/service/impl/SysRoleServiceImpl.java | 9 ++++----- .../market/service/impl/MkCouponGiftServiceImpl.java | 4 ++-- .../service/impl/MkShopCouponRecordServiceImpl.java | 2 +- .../service/impl/ShopProdStatisticServiceImpl.java | 2 +- .../impl/ShopTableOrderStatisticServiceImpl.java | 2 +- .../product/service/impl/ConsStockFlowServiceImpl.java | 4 ++-- .../service/impl/ProdConsRelationServiceImpl.java | 6 +++--- .../product/service/impl/ShopSyncServiceImpl.java | 2 +- .../product/service/impl/ShopVendorServiceImpl.java | 2 +- 12 files changed, 22 insertions(+), 27 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java index d26850de9..13273aab3 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java @@ -1,24 +1,19 @@ package com.czg.service.account.service.impl; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; import com.czg.account.dto.PageDTO; import com.czg.account.dto.register.MerchantRegisterDTO; import com.czg.account.entity.MerchantRegister; import com.czg.account.service.MerchantRegisterService; -import com.czg.account.vo.MerchantRegisterVO; import com.czg.service.account.mapper.MerchantRegisterMapper; import com.czg.utils.PageUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.List; /** * 激活码 服务层实现。 @@ -27,7 +22,7 @@ import java.util.List; * @since 2025-02-11 */ @Service -public class MerchantRegisterServiceImpl extends ServiceImpl implements MerchantRegisterService { +public class MerchantRegisterServiceImpl extends ServiceImpl implements MerchantRegisterService { @Override public Page get(PageDTO pageDTO, Integer state, String startTime, String endTime) { @@ -46,6 +41,7 @@ public class MerchantRegisterServiceImpl extends ServiceImpl 0; } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java index 56f68c092..ff67e2939 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java @@ -61,7 +61,7 @@ public class ShopExtendServiceImpl extends ServiceImpl implements SysRoleService { +public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { @Resource private SysMenuService sysMenuService; @Resource @@ -87,7 +87,7 @@ public class SysRoleServiceImpl extends ServiceImpl imp } return apiInfoItemDTOS.stream() - .map(pattern -> StrUtil.format("({} LIKE '{}' ESCAPE '\\\\' and method = '{}')" , columnName, toSqlLikePattern(pattern.getUrl()), pattern.getMethod())) + .map(pattern -> StrUtil.format("({} LIKE '{}' ESCAPE '\\\\' and method = '{}')", columnName, toSqlLikePattern(pattern.getUrl()), pattern.getMethod())) .collect(Collectors.joining(" OR ")); } @@ -95,7 +95,7 @@ public class SysRoleServiceImpl extends ServiceImpl imp public Page getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper(); // if (!StpKit.USER.isAdmin()) { - queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()); + queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()); // } if (StrUtil.isNotBlank(key)) { @@ -180,11 +180,10 @@ public class SysRoleServiceImpl extends ServiceImpl imp // Step 4: 批量保存（如有数据） - return rolesMenus.isEmpty() || sysRolesMenusService.saveBatch(rolesMenus); + return rolesMenus.isEmpty() || sysRolesMenusService.getMapper().insertBatchSelective(rolesMenus, 50) > 0; } - @Override @Transactional(rollbackFor = Exception.class) public Boolean editPermission(long userId, RolePermissionDTO rolePermissionDTO) { diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java index ca091b361..b193a9cdb 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java @@ -49,7 +49,7 @@ public class MkCouponGiftServiceImpl extends ServiceImpl couponGiftList) { remove(new QueryWrapper().eq(MkCouponGift::getSourceId, sourceId).eq(MkCouponGift::getType, type)); if (CollUtil.isNotEmpty(couponGiftList)) { - List newCoupons = new ArrayList<>(); + List newCoupons = new ArrayList<>(); for (MkCouponGiftDTO giftDTO : couponGiftList) { ShopCoupon coupon = couponMapper.selectOneByQuery(new QueryWrapper().eq(ShopCoupon::getId, giftDTO.getCouponId())); if (coupon == null) { @@ -64,7 +64,7 @@ public class MkCouponGiftServiceImpl extends ServiceImpl entityList = BeanUtil.copyToList(consList, ProdConsRelation.class); - super.saveBatch(entityList); + mapper.insertBatchSelective(entityList, 50); } } \ No newline at end of file diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java index 414681786..da2f7a6c6 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java @@ -733,7 +733,7 @@ public class ShopSyncServiceImpl implements ShopSyncService { } } if (CollUtil.isNotEmpty(addList)) { - prodGroupRelationService.saveBatch(addList, 100); + prodGroupRelationService.getMapper().insertBatchSelective(addList, 100); } if (CollUtil.isNotEmpty(upList)) { prodGroupRelationService.updateBatch(addList, 100); diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java index f1300b38b..26adb0078 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java @@ -157,7 +157,7 @@ public class ShopVendorServiceImpl extends ServiceImpl Date: Mon, 1 Dec 2025 09:12:29 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/task/OTimeTask.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java b/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java index 933205b5b..a042ec9ba 100644 --- a/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java +++ b/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java @@ -2,7 +2,9 @@ package com.czg.task; import cn.hutool.core.date.DateUtil; import com.czg.market.service.OrderInfoService; +import com.czg.order.entity.CashierCart; import com.czg.order.entity.OrderInfo; +import com.czg.order.service.CashierCartService; import com.czg.service.order.enums.OrderStatusEnums; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; @@ -21,6 +23,8 @@ import org.springframework.stereotype.Component; public class OTimeTask { @Resource private OrderInfoService orderInfoService; + @Resource + private CashierCartService cartService; /** * order 过期 @@ -32,5 +36,12 @@ public class OTimeTask { orderInfoService.update(orderInfo, QueryWrapper.create() .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode()) .lt(OrderInfo::getTradeDay, DateUtil.format(DateUtil.yesterday(), "yyyy-MM-dd"))); + + QueryWrapper cartUpdateWrapper = new QueryWrapper(); + cartUpdateWrapper.lt(CashierCart::getCreateTime, DateUtil.format(DateUtil.yesterday(), "yyyy-MM-dd HH:mm:ss")) + .and(wrapper -> { + wrapper.isNull(CashierCart::getUpdateTime).or(CashierCart::getUpdateTime).lt(DateUtil.format(DateUtil.yesterday(), "yyyy-MM-dd HH:mm:ss")); + }); + cartService.remove(cartUpdateWrapper); } } From 601656e97b7e6e0b4c60b0d5862e150bebc3fecf Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 1 Dec 2025 10:49:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/account/entity/BkContactList.java | 5 +++++ .../account/mapper/BkContactListMapper.java | 2 +- .../impl/BkContactListServiceImpl.java | 12 +++++++---- .../resources/mapper/BkContactListMapper.xml | 20 +++++++++---------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java index 4e83deaee..e4e2364c7 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java @@ -4,6 +4,7 @@ import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; + import java.io.Serializable; import java.time.LocalDateTime; @@ -45,6 +46,10 @@ public class BkContactList implements Serializable { * 电话号码 */ private String phone; + /** + * 昵称 + */ + private String nickName; /** * 历史订单数 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java index 32fed0153..a5264978a 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java @@ -18,5 +18,5 @@ public interface BkContactListMapper extends BaseMapper { * @param shopId 店铺ID * @return 通讯录联系人列表 */ - List getUserList(Long shopId); + List getUserList(Long shopId, Long mainShopId); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java index a2992db98..dc42b26a8 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java @@ -1,12 +1,13 @@ package com.czg.service.account.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.BkContactList; import com.czg.account.service.BkContactListService; +import com.czg.account.service.ShopInfoService; import com.czg.service.account.mapper.BkContactListMapper; +import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import java.util.List; @@ -21,6 +22,8 @@ import java.util.stream.Collectors; */ @Service public class BkContactListServiceImpl extends ServiceImpl implements BkContactListService { + @Resource + private ShopInfoService shopInfoService; @Override public List getUserList(Long shopId, Set phones) { @@ -35,6 +38,7 @@ public class BkContactListServiceImpl extends ServiceImpl From b0846f829d9eaf7b0254dc1a119ff775bd9a1ba2 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 1 Dec 2025 11:23:53 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=98=B5=E7=A7=B0=20=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/account/entity/BkContactList.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java index e4e2364c7..2d8470c83 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java @@ -49,6 +49,7 @@ public class BkContactList implements Serializable { /** * 昵称 */ + @Column(ignore = true) private String nickName; /**