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

激活码相关接口

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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> {
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);
}

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;
import cn.hutool.core.date.DateUtil;
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.register.MerchantRegisterDTO;
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{
@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();
if (state != null) {
queryWrapper.eq(MerchantRegister::getStatus, state);
}
if (startTime != null) {
queryWrapper.ge(SysRole::getCreateTime, startTime);
if (StrUtil.isNotBlank(startTime)) {
queryWrapper.ge(MerchantRegister::getCreateTime, DateUtil.parse(startTime).toLocalDateTime());
}
if (endTime != null) {
queryWrapper.le(SysRole::getCreateTime, endTime);
if (StrUtil.isNotBlank(endTime)) {
queryWrapper.le(MerchantRegister::getCreateTime, DateUtil.parse(endTime).toLocalDateTime());
}
return page(new Page<>(pageDTO.page(), pageDTO.size()), queryWrapper);