diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java index ad41e5abc..c4e57c9bf 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java @@ -100,9 +100,6 @@ public class HandoverRecordController { //@SaAdminCheckPermission("handoverRecord:handover") public CzgResult handover(@RequestParam Integer isPrint) { Long id = handoverRecordService.handover(); - if (isPrint == 1){ - rabbitPublisher.sendHandoverPrintMsg(id.toString()); - } return CzgResult.success(id); } diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java index 554e5dbcf..17b284ad2 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java @@ -3,14 +3,10 @@ package com.czg.controller.admin; import com.czg.account.dto.user.SysUserAddDTO; import com.czg.account.dto.user.SysUserEditDTO; import com.czg.account.dto.user.SysUserEditPwdDTO; -import com.czg.account.entity.SysUser; -import com.czg.account.entity.SysUsersRoles; import com.czg.account.service.SysUserService; import com.czg.account.vo.SysUserDetailVO; -import com.czg.annotation.SaAdminCheckPermission; import com.czg.annotation.SaAdminCheckRole; import com.czg.resp.CzgResult; -import com.czg.sa.StpKit; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -40,7 +36,7 @@ public class SysController { // @SaAdminCheckPermission("sysUser:list") @SaAdminCheckRole("admin") @GetMapping - public CzgResult> list(String key, String startTime, String endTime, Integer status) { + public CzgResult> list(String key, String startTime, String endTime, Integer status) { return CzgResult.success(sysUserService.getPage(key, startTime, endTime, status)); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java index 592f36444..d01d71712 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java @@ -4,11 +4,24 @@ import com.czg.account.entity.ShopUser; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + /** * @author Administrator */ @EqualsAndHashCode(callSuper = true) @Data public class ShopUserDTO extends ShopUser { + /** + * 优惠券数量 + */ private Long couponNum; + /** + * 订单数量 + */ + private Long orderNumber; + /** + * 充值金额 + */ + private BigDecimal rechargeAmount; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java index 041b44846..b6b26abc6 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java @@ -30,9 +30,6 @@ public class FreeDineConfig implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id(keyType = KeyType.Auto) - private Long id; - /** * 是否启用 */ @@ -71,6 +68,7 @@ public class FreeDineConfig implements Serializable { /** * 门店id */ + @Id private Long shopId; /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java index cf37f0451..c9e0431ab 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java @@ -25,7 +25,7 @@ public interface SysUserService extends IService { Boolean removeUserAndRole(Long id); - Page getPage(String key, String startTime, String endTime, Integer status); + Page getPage(String key, String startTime, String endTime, Integer status); Boolean edit(SysUserEditDTO sysUserEditDTO); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/SysUserMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/SysUserMapper.java index faf2edb5e..9ea592566 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/SysUserMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/SysUserMapper.java @@ -1,7 +1,11 @@ package com.czg.service.account.mapper; import com.czg.account.entity.SysUser; +import com.czg.account.vo.SysUserDetailVO; import com.mybatisflex.core.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 系统用户 映射层。 @@ -11,4 +15,5 @@ import com.mybatisflex.core.BaseMapper; */ public interface SysUserMapper extends BaseMapper { + List page(@Param("key") String key, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("status") Integer status); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index 37933b288..4979d6b1d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -31,6 +31,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.Objects; @@ -98,7 +99,13 @@ public class ShopInfoServiceImpl extends ServiceImpl i if (merchantRegister.getStatus() == 1) { throw new CzgException("激活码已使用"); } - shopInfo.setExpireTime(DateUtil.offsetMonth(DateUtil.date(), merchantRegister.getPeriodMonth()).toLocalDateTime()); + + // 续期 + if (shopInfo.getExpireTime() != null && shopInfo.getExpireTime().isAfter(LocalDateTime.now())) { + shopInfo.setExpireTime(DateUtil.offsetMonth(DateUtil.date(shopInfo.getExpireTime()), merchantRegister.getPeriodMonth()).toLocalDateTime()); + }else { + shopInfo.setExpireTime(DateUtil.offsetMonth(DateUtil.date(), merchantRegister.getPeriodMonth()).toLocalDateTime()); + } merchantRegister.setStatus(1); merchantRegister.setShopId(shopInfo.getId()); merchantRegisterService.updateById(merchantRegister); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java index 5cf8e52b4..f8026a2a6 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java @@ -22,6 +22,8 @@ import com.czg.service.account.mapper.SysRoleMapper; import com.czg.service.account.mapper.SysUserMapper; import com.czg.service.account.mapper.SysUsersRolesMapper; 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; @@ -99,24 +101,9 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public Page getPage(String key, String startTime, String endTime, Integer status) { - QueryWrapper queryWrapper = new QueryWrapper(); - if (StrUtil.isNotBlank(key)) { - queryWrapper.and(column(SysUser::getAccount).like(key).or(column(SysUser::getNickName).like(key))); - } - - if (StrUtil.isNotBlank(startTime)) { - queryWrapper.ge(SysUser::getCreateTime, DateUtil.parse(startTime)); - } - - if (StrUtil.isNotBlank(endTime)) { - queryWrapper.le(SysUser::getCreateTime, DateUtil.parse(endTime)); - } - - if (status != null) { - queryWrapper.eq(SysUser::getStatus, status); - } - return page(PageUtil.buildPage(), queryWrapper); + public Page getPage(String key, String startTime, String endTime, Integer status) { + PageHelper.startPage(PageUtil.buildPageHelp()); + return PageUtil.convert(new PageInfo<>(mapper.page(key, startTime, endTime, status))); } @Override @@ -180,8 +167,8 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public void download(String key, String startTime, String endTime, Integer status, HttpServletResponse response) throws IOException { - Page sysUserPage = getPage(key, startTime, endTime, status); - List records = sysUserPage.getRecords(); + Page sysUserPage = getPage(key, startTime, endTime, status); + List records = sysUserPage.getRecords(); // 1. 创建 ExcelWriter // true 表示使用 XLSX 格式 diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml index b09c42a1d..6b12b4311 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -41,7 +41,7 @@ + select a.*, b.role_id from sys_user as a + left join sys_users_roles as b on a.id=b.user_id + + + and (a.nick_name like concat('%', #{key}, '%') or a.account like concat('%', #{key}, '%')) + + + and a.create_time >= #{startTime} + + + + and a.create_time <= #{endTime} + + + + and a.status=#{status} + + + order by a.create_time desc + diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java index 4b084b457..97f4d5dfc 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java @@ -162,7 +162,7 @@ public interface PrinterImpl { StringBuilder builder = new StringBuilder() .append(getFormatLabel(handoverRecord.getShopName(), signLabelInfo.center, signLabelInfo.f)).append(signLabelInfo.br) .append(getFormatLabel("交班小票", signLabelInfo.l,signLabelInfo.center)).append(signLabelInfo.br) - .append("交班时间: ").append(handoverRecord.getHandoverTime()).append(signLabelInfo.br) + .append("交班时间: ").append(DateUtil.format(handoverRecord.getHandoverTime(), "yyyy-MM-dd HH:mm:ss")).append(signLabelInfo.br) .append("收银员: ").append(handoverRecord.getStaffName()).append(signLabelInfo.br) .append("当班总收入: ").append(handoverRecord.getHandAmount()).append(signLabelInfo.br) .append("现金收入: ").append(handoverRecord.getCashAmount()).append(signLabelInfo.br)