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

激活码相关接口

This commit is contained in:
张松 2025-02-11 11:33:44 +08:00
parent 1603139acb
commit 30b9cef27f
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java
View File

@ -27,7 +27,7 @@ public class MerchantRegisterController {
/** /**
* 激活码列表 * 激活码列表
* * 权限标识: merchantRegister:list
* @param pageDTO 分页参数 * @param pageDTO 分页参数
* @param state 状态 0未激活 1已激活 * @param state 状态 0未激活 1已激活
* @param startTime 开始时间 * @param startTime 开始时间
@ -37,7 +37,7 @@ public class MerchantRegisterController {
@SaAdminCheckRole("管理员") @SaAdminCheckRole("管理员")
@SaAdminCheckPermission("merchantRegister:add") @SaAdminCheckPermission("merchantRegister:add")
@GetMapping @GetMapping
public CzgResult<Page<MerchantRegister>> get(PageDTO pageDTO, Integer state, LocalDateTime startTime, LocalDateTime endTime) { public CzgResult<Page<MerchantRegister>> get(PageDTO pageDTO, Integer state, String startTime, String endTime) {
return CzgResult.success(merchantRegisterService.get(pageDTO, state, startTime, endTime)); return CzgResult.success(merchantRegisterService.get(pageDTO, state, startTime, endTime));
} }

2
cash-service/account-service/src/main/java/com/czg/service/account/service/MerchantRegisterService.java
View File

@ -16,7 +16,7 @@ import java.time.LocalDateTime;
*/ */
public interface MerchantRegisterService extends IService<MerchantRegister> { public interface MerchantRegisterService extends IService<MerchantRegister> {
Page<MerchantRegister> get(PageDTO pageDTO, Integer state, LocalDateTime startTime, LocalDateTime endTime); Page<MerchantRegister> get(PageDTO pageDTO, Integer state, String startTime, String endTime);
Boolean add(MerchantRegisterDTO merchantRegisterDTO); Boolean add(MerchantRegisterDTO merchantRegisterDTO);
} }

12
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.czg.service.account.service.impl; package com.czg.service.account.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.service.account.dto.PageDTO; import com.czg.service.account.dto.PageDTO;
import com.czg.service.account.dto.register.MerchantRegisterDTO; import com.czg.service.account.dto.register.MerchantRegisterDTO;
import com.czg.service.account.entity.SysRole; import com.czg.service.account.entity.SysRole;
@ -27,19 +29,19 @@ import static com.mybatisflex.core.query.QueryMethods.column;
public class MerchantRegisterServiceImpl extends ServiceImpl<MerchantRegisterMapper, MerchantRegister> implements MerchantRegisterService{ public class MerchantRegisterServiceImpl extends ServiceImpl<MerchantRegisterMapper, MerchantRegister> implements MerchantRegisterService{
@Override @Override
public Page<MerchantRegister> get(PageDTO pageDTO, Integer state, LocalDateTime startTime, LocalDateTime endTime) { public Page<MerchantRegister> get(PageDTO pageDTO, Integer state, String startTime, String endTime) {
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper queryWrapper = new QueryWrapper();
if (state != null) { if (state != null) {
queryWrapper.eq(MerchantRegister::getStatus, state); queryWrapper.eq(MerchantRegister::getStatus, state);
} }
if (startTime != null) { if (StrUtil.isNotBlank(startTime)) {
queryWrapper.ge(SysRole::getCreateTime, startTime); queryWrapper.ge(MerchantRegister::getCreateTime, DateUtil.parse(startTime).toLocalDateTime());
} }
if (endTime != null) { if (StrUtil.isNotBlank(endTime)) {
queryWrapper.le(SysRole::getCreateTime, endTime); queryWrapper.le(MerchantRegister::getCreateTime, DateUtil.parse(endTime).toLocalDateTime());
} }
return page(new Page<>(pageDTO.page(), pageDTO.size()), queryWrapper); return page(new Page<>(pageDTO.page(), pageDTO.size()), queryWrapper);