pay/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay synced 2026-08-08 22:25:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 超级查询问题/商户号生成

Browse Source
This commit is contained in:
xxm
2023-05-22 22:25:29 +08:00
parent 9aa5b157d6
commit 2b340a486d
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.java
View File

@@ -1,13 +1,13 @@
package cn.bootx.platform.daxpay.core.merchant.dao;
import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
import cn.bootx.platform.daxpay.param.merchant.MerchantInfoParam;
import cn.bootx.platform.daxpay.core.merchant.entity.MerchantInfo;
import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
import cn.bootx.platform.common.mybatisplus.util.MpUtil;
import cn.bootx.platform.common.query.generator.QueryGenerator;
import cn.bootx.platform.daxpay.core.merchant.entity.MerchantInfo;
import cn.bootx.platform.daxpay.param.merchant.MerchantInfoParam;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@@ -25,9 +25,9 @@ public class MerchantInfoManager extends BaseManager<MerchantInfoMapper, Merchan
*/
public Page<MerchantInfo> page(PageParam pageParam, MerchantInfoParam param) {
Page<MerchantInfo> mpPage = MpUtil.getMpPage(pageParam, MerchantInfo.class);
return this.lambdaQuery()
.select(this.getEntityClass(),MpUtil::excludeBigField)
.orderByDesc(MpIdEntity::getId)
.page(mpPage);
QueryWrapper<MerchantInfo> wrapper = QueryGenerator.generator(param, this.getEntityClass());
wrapper.select(this.getEntityClass(),MpUtil::excludeBigField)
.orderByDesc(MpUtil.getColumnName(MerchantInfo::getId));
return this.page(mpPage,wrapper);
}
}

3
dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java
View File

@@ -9,6 +9,8 @@ import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
import cn.bootx.platform.daxpay.core.merchant.convert.MerchantInfoConvert;
import cn.bootx.platform.daxpay.dto.merchant.MerchantInfoDto;
import cn.bootx.platform.daxpay.param.merchant.MerchantInfoParam;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,6 +33,7 @@ public class MerchantInfo extends MpBaseEntity implements EntityBaseFunction<Mer
/** 商户号 */
@DbColumn(comment = "商户号")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String mchNo;
/** 商户名称 */

2
dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.java
View File

@@ -33,6 +33,7 @@ public class MerchantInfoService {
*/
public void add(MerchantInfoParam param){
MerchantInfo merchantInfo = MerchantInfo.init(param);
merchantInfo.setMchNo("M"+System.currentTimeMillis());
merchantInfoManager.save(merchantInfo);
}
@@ -41,7 +42,6 @@ public class MerchantInfoService {
*/
public void update(MerchantInfoParam param){
MerchantInfo merchantInfo = merchantInfoManager.findById(param.getId()).orElseThrow(DataNotExistException::new);
BeanUtil.copyProperties(param,merchantInfo, CopyOptions.create().ignoreNullValue());
merchantInfoManager.updateById(merchantInfo);
}

8
dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MerchantInfoParam.java
View File

@@ -1,9 +1,12 @@
package cn.bootx.platform.daxpay.param.merchant;
import cn.bootx.platform.common.core.annotation.QueryParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.experimental.Accessors;
import static cn.bootx.platform.common.core.annotation.QueryParam.CompareTypeEnum.*;
/**
* 商户
* @author xxm
@@ -17,16 +20,21 @@ public class MerchantInfoParam {
@Schema(description= "主键")
private Long id;
@QueryParam(type = LIKE)
@Schema(description = "商户号")
private String mchNo;
@QueryParam(type = LIKE)
@Schema(description = "商户名称")
private String mchName;
@QueryParam(type = LIKE)
@Schema(description = "商户简称")
private String mchShortName;
@Schema(description = "类型")
private String type;
@QueryParam(type = LIKE)
@Schema(description = "联系人姓名")
private String contactName;
@QueryParam(type = LIKE)
@Schema(description = "联系人手机号")
private String contactTel;
@Schema(description = "状态类型")

10
dax-pay/src/main/resources/codegen/template/java/manager.java.vm
View File

@@ -1,8 +1,8 @@
package ${corePack}.dao;
import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
import ${paramPack}.${entityUpName}Param;
import ${corePack}.entity.${entityUpName};
import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
import cn.bootx.platform.common.mybatisplus.util.MpUtil;
@@ -25,9 +25,9 @@ public class ${entityUpName}Manager extends BaseManager<${entityUpName}Mapper, $
*/
public Page<${entityUpName}> page(PageParam pageParam, ${entityUpName}Param param) {
Page<${entityUpName}> mpPage = MpUtil.getMpPage(pageParam, ${entityUpName}.class);
return this.lambdaQuery()
.select(this.getEntityClass(),MpUtil::excludeBigField)
.orderByDesc(MpIdEntity::getId)
.page(mpPage);
QueryWrapper<${entityUpName}> wrapper = QueryGenerator.generator(param, this.getEntityClass());
wrapper.select(this.getEntityClass(),MpUtil::excludeBigField)
.orderByDesc(MpUtil.getColumnName(${entityUpName}::getId));
return this.page(mpPage,wrapper);
}
}