From d7233545c7b5ecc9d3b13b1c122eb04cb255ca90 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 9 Jan 2026 15:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=87=BA=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/EntryManagerController.java | 12 ++++ .../czg/order/entity/ShopDirectMerchant.java | 18 +++++- .../order/dto/AggregateMerchantVO.java | 20 +++++++ .../service/order/dto/MerchantQueryDTO.java | 58 +++++++++++++++++++ .../mapper/ShopDirectMerchantMapper.java | 4 ++ .../service/ShopDirectMerchantService.java | 4 ++ .../impl/ShopDirectMerchantServiceImpl.java | 21 +++++++ .../mapper/ShopDirectMerchantMapper.xml | 18 ++++++ 8 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 cash-service/order-service/src/main/java/com/czg/service/order/dto/MerchantQueryDTO.java diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java index 25ee2cda0..0b11edac1 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java @@ -1,15 +1,19 @@ package com.czg.controller.admin; import com.alibaba.fastjson2.JSONObject; +import com.czg.BaseQueryParam; import com.czg.EntryManager; import com.czg.annotation.Debounce; import com.czg.dto.req.AggregateMerchantDto; import com.czg.dto.resp.BankBranchDto; +import com.czg.order.entity.ShopDirectMerchant; import com.czg.service.order.dto.AggregateMerchantVO; +import com.czg.service.order.dto.MerchantQueryDTO; import com.czg.service.order.service.ShopDirectMerchantService; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.czg.task.EntryManagerTask; +import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -62,6 +66,14 @@ public class EntryManagerController { return CzgResult.success(EntryManager.queryBankBranchList(province, city, instId)); } + /** + * 获取进件信息 + */ + @GetMapping("list") + public CzgResult> getEntryList(MerchantQueryDTO queryParam) { + return CzgResult.success(shopDirectMerchantService.getEntryList(queryParam)); + } + /** * 获取进件信息 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java index 99bfdeaeb..3f332b18a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java @@ -35,6 +35,10 @@ public class ShopDirectMerchant implements Serializable { */ @Id private Long shopId; + /** + * 店铺名称 + */ + private String shopName; /** * 营业执照编号 @@ -44,12 +48,24 @@ public class ShopDirectMerchant implements Serializable { * 支付宝账号 */ private String alipayAccount; - /** * 商户编号（在当前系统唯一） */ private String merchantCode; + /** + * 【必填】 + * 商户类型 + * 0: 个体商户; + * 1: 企业商户; + * 3: 小微商户 暂不支持 + */ + private String userType; + /** + * 【必填】 + * 商户简称--企业、个体必填 + */ + private String shortName; /** * 商户基础信息 */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java index 84aa15870..a39f49346 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java @@ -13,6 +13,8 @@ import java.time.LocalDateTime; @Data public class AggregateMerchantVO extends AggregateMerchantDto{ + private String shopName; + private LocalDateTime createTime; private LocalDateTime updateTime; @@ -30,6 +32,24 @@ public class AggregateMerchantVO extends AggregateMerchantDto{ * 支付宝账号 */ private String alipayAccount; + /** + * 商户编号（在当前系统唯一） + */ + private String merchantCode; + /** + * 【必填】 + * 商户类型 + * 0: 个体商户; + * 1: 企业商户; + * 3: 小微商户 暂不支持 + */ + private String userType; + + /** + * 【必填】 + * 商户简称--企业、个体必填 + */ + private String shortName; /** * 微信进件错误信息 diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/MerchantQueryDTO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/MerchantQueryDTO.java new file mode 100644 index 000000000..7f0ed3147 --- /dev/null +++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/MerchantQueryDTO.java @@ -0,0 +1,58 @@ +package com.czg.service.order.dto; + +import com.czg.BaseQueryParam; +import com.czg.utils.CzgStrUtils; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 进件查询参数 + * @author ww + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MerchantQueryDTO extends BaseQueryParam { + + /** + * 商户类型 + * 0: 个体商户; + * 1: 企业商户; + */ + private String userType; + /** + * 店铺名称 模糊查询 + */ + private String shopName; + /** + * 进件状态 + * {@link com.czg.PayCst.EntryStatus} + * WAIT 待提交 + * INIT 待处理 + * AUDIT 待审核 + * SIGN 待签约 + * FINISH 已完成 + * REJECTED 失败 + */ + private String status; + /** + * 支付宝账号 + */ + private String alipayAccount; + + public String getUserType() { + return CzgStrUtils.getStrOrNull(userType); + } + + public String getShopName() { + return CzgStrUtils.getStrOrNull(shopName); + } + + public String getStatus() { + return CzgStrUtils.getStrOrNull(status); + } + + public String getAlipayAccount() { + return CzgStrUtils.getStrOrNull(alipayAccount); + } +} diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopDirectMerchantMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopDirectMerchantMapper.java index 3b97bdb5a..36b91db54 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopDirectMerchantMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopDirectMerchantMapper.java @@ -1,8 +1,11 @@ package com.czg.service.order.mapper; +import com.czg.service.order.dto.MerchantQueryDTO; import com.mybatisflex.core.BaseMapper; import com.czg.order.entity.ShopDirectMerchant; +import java.util.List; + /** * 商户进件 映射层。 * @@ -11,4 +14,5 @@ import com.czg.order.entity.ShopDirectMerchant; */ public interface ShopDirectMerchantMapper extends BaseMapper { + List getEntryList(MerchantQueryDTO queryParam); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/ShopDirectMerchantService.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/ShopDirectMerchantService.java index dd8dbab65..6a9bc72ed 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/ShopDirectMerchantService.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/ShopDirectMerchantService.java @@ -2,6 +2,8 @@ package com.czg.service.order.service; import com.alibaba.fastjson2.JSONObject; import com.czg.dto.req.AggregateMerchantDto; import com.czg.service.order.dto.AggregateMerchantVO; +import com.czg.service.order.dto.MerchantQueryDTO; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.order.entity.ShopDirectMerchant; @@ -22,6 +24,8 @@ public interface ShopDirectMerchantService extends IService */ JSONObject getInfoByImg(String url, String type) throws Exception; + + Page getEntryList(MerchantQueryDTO queryParam); /** * 获取进件信息 */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java index 0f1f585ed..ac10c3a7f 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java @@ -11,16 +11,22 @@ import com.czg.constants.ParamCodeCst; import com.czg.dto.req.*; import com.czg.order.entity.ShopDirectMerchant; import com.czg.service.order.dto.AggregateMerchantVO; +import com.czg.service.order.dto.MerchantQueryDTO; import com.czg.service.order.mapper.ShopDirectMerchantMapper; import com.czg.service.order.service.ShopDirectMerchantService; import com.czg.system.service.SysParamsService; import com.czg.utils.FunUtils; +import com.czg.utils.PageUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; @@ -50,6 +56,13 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl getEntryList(MerchantQueryDTO queryParam) { + PageHelper.startPage(queryParam.getPage(), queryParam.getSize()); + List entryList = mapper.getEntryList(queryParam); + return PageUtil.convert(new PageInfo<>(entryList)); + } + @Override public AggregateMerchantVO getEntry(Long shopId) { ShopDirectMerchant merchant = getById(shopId); @@ -75,6 +88,11 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl +