From 2b340a486d9165901f891b0b07fb60b5419e4d4a Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 22 May 2023 22:25:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B6=85=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98/=E5=95=86=E6=88=B7=E5=8F=B7=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/merchant/dao/MerchantInfoManager.java | 18 +++++++++---------
 .../core/merchant/entity/MerchantInfo.java     |  3 +++
 .../merchant/service/MerchantInfoService.java  |  2 +-
 .../param/merchant/MerchantInfoParam.java      |  8 ++++++++
 .../codegen/template/java/manager.java.vm      | 10 +++++-----
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.java
index 416f47875..0a80532d1 100644
--- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.java
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.java
@@ -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);
     }
 }
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java
index 8237ee385..6e80a0228 100644
--- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java
@@ -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;
 
     /** 商户名称 */
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.java
index 20cc57353..3836f4720 100644
--- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.java
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.java
@@ -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);
     }
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MerchantInfoParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MerchantInfoParam.java
index a4e418f7b..c8c54664d 100644
--- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MerchantInfoParam.java
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MerchantInfoParam.java
@@ -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 = "状态类型")
diff --git a/dax-pay/src/main/resources/codegen/template/java/manager.java.vm b/dax-pay/src/main/resources/codegen/template/java/manager.java.vm
index 59bb001d1..05b24471b 100644
--- a/dax-pay/src/main/resources/codegen/template/java/manager.java.vm
+++ b/dax-pay/src/main/resources/codegen/template/java/manager.java.vm
@@ -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);
     }
 }