Merge branch 'pay' into test

# Conflicts:
#	cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java

@@ -142,6 +142,14 @@ public class ShopInfo implements Serializable {
      * -1 平台禁用 0-过期，1正式营业，
      */
     private Integer status;
+    /**
+     * 微信商户id
+     */
+    private String wechatMerchantId;
+    /**
+     * 支付宝商户id
+     */
+    private String alipayMerchantId;
 
     /**
      * 到期时间

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java

@@ -37,6 +37,11 @@ public interface ShopInfoService extends IService<ShopInfo> {
 
     Boolean edit(ShopInfoEditDTO shopInfoEditDTO);
 
+    /**
+     * 进件结果保存
+     */
+    Boolean editEntry(Long shopId, String wechatMerchantId, String alipayMerchantId);
+
     ShopDetailDTO detail(Long id) throws CzgException;
 
     ShopInfoByCodeDTO getByCode(String tableCode, String lat, String lng, boolean checkState);

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java

@@ -0,0 +1,111 @@
+package com.czg.order.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.Table;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 商户进件 实体类。
+ *
+ * @author ww
+ * @since 2026-01-07
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_direct_merchant")
+public class ShopDirectMerchant implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 店铺id
+     */
+    @Id
+    private Long shopId;
+
+    /**
+     * 营业执照编号
+     */
+    private String licenceNo;
+
+    /**
+     * 商户编号（在当前系统唯一）
+     */
+    private String merchantCode;
+
+    /**
+     * 商户基础信息
+     */
+    private String merchantBaseInfo;
+
+    /**
+     * 法人信息
+     */
+    private String legalPersonInfo;
+
+    /**
+     * 营业执照信息
+     */
+    private String businessLicenceInfo;
+
+    /**
+     * 门店信息
+     */
+    private String storeInfo;
+
+    /**
+     * 结算信息
+     */
+    private String settlementInfo;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+
+    private String errorMsg;
+
+    /**
+     * 微信状态
+     */
+    private String wechatStatus;
+
+    /**
+     * 微信进件错误信息
+     */
+    private String wechatErrorMsg;
+    /**
+     * 微信进件签名地址
+     */
+    private String wechatSignUrl;
+
+    /**
+     * 支付宝状态
+     */
+    private String alipayStatus;
+
+    /**
+     * 支付宝进件错误信息
+     */
+    private String alipayErrorMsg;
+    /**
+     * 支付宝进件签名地址
+     */
+    private String alipaySignUrl;
+
+}

cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysBankInfo.java

@@ -0,0 +1,82 @@
+package com.czg.system.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 银行账户信息表 实体类。
+ *
+ * @author ww
+ * @since 2026-01-06
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("sys_bank_info")
+public class SysBankInfo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @Id(keyType = KeyType.Auto)
+    private BigInteger id;
+
+    /**
+     * 银行名称
+     */
+    private String accountBank;
+
+    /**
+     * 银行数字编码
+     */
+    private Integer accountBankCode;
+
+    /**
+     * 银行别名
+     */
+    private String bankAlias;
+
+    /**
+     * 银行别名编码
+     */
+    private String bankAliasCode;
+
+    /**
+     * 不知道干啥的
+     */
+    private Boolean needBankBranch;
+
+    /**
+     * 银行英文编码
+     */
+    private String bankCode;
+
+    /**
+     * 创建时间
+     */
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysCategoryInfo.java

@@ -0,0 +1,77 @@
+package com.czg.system.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 类目信息表 实体类。
+ *
+ * @author ww
+ * @since 2026-01-06
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("sys_category_info")
+public class SysCategoryInfo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @Id(keyType = KeyType.Auto)
+    private BigInteger id;
+
+    /**
+     * 一级类目
+     */
+    private String firstCategory;
+
+    /**
+     * 二级类目code
+     */
+    private String secondCategoryCode;
+
+    /**
+     * 二级类目
+     */
+    private String secondCategory;
+
+    /**
+     * 适用商家说明
+     */
+    private String applicableMerchant;
+
+    /**
+     * 特殊资质（为空则无需提供）
+     */
+    private String specialQualification;
+
+    /**
+     * 创建时间
+     */
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysRegion.java

@@ -0,0 +1,70 @@
+package com.czg.system.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+
+import java.io.Serial;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 行政区表 实体类。
+ *
+ * @author ww
+ * @since 2026-01-06
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("sys_region")
+public class SysRegion implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 区域编码
+     */
+    @Id
+    private String regionId;
+
+    /**
+     * 上级区域编码
+     */
+    private String parentRegionId;
+
+    /**
+     * 区域级别：1=国家，2=省，3=市，4=县
+     */
+    @Id
+    private Integer regionLevel;
+
+    /**
+     * 区域中文全称
+     */
+    private String regionName;
+
+    /**
+     * 区域拼音
+     */
+    private String regionPinyin;
+
+    /**
+     * 全级别名称（如“中国|北京|北京市|东城区）
+     */
+    private String fullName;
+
+    /**
+     * 子级区域
+     */
+    @Column(ignore = true)
+    private List<SysRegion> children;
+
+}

cash-common/cash-common-service/src/main/java/com/czg/system/service/SysBankInfoService.java

@@ -0,0 +1,19 @@
+package com.czg.system.service;
+
+import com.czg.BaseQueryParam;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.service.IService;
+import com.czg.system.entity.SysBankInfo;
+
+import java.util.List;
+
+/**
+ * 银行账户信息表 服务层。
+ *
+ * @author ww
+ * @since 2026-01-06
+ */
+public interface SysBankInfoService extends IService<SysBankInfo> {
+
+    Page<SysBankInfo> bankInfoList(BaseQueryParam param, String bankName);
+}

cash-common/cash-common-service/src/main/java/com/czg/system/service/SysCategoryInfoService.java

@@ -0,0 +1,20 @@
+package com.czg.system.service;
+
+import com.czg.system.vo.SysCategoryInfoVO;
+import com.mybatisflex.core.service.IService;
+import com.czg.system.entity.SysCategoryInfo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类目信息表 服务层。
+ *
+ * @author ww
+ * @since 2026-01-06
+ */
+public interface SysCategoryInfoService extends IService<SysCategoryInfo> {
+
+
+    List<SysCategoryInfoVO> categoryList();
+}

cash-common/cash-common-service/src/main/java/com/czg/system/service/SysRegionService.java

@@ -0,0 +1,17 @@
+package com.czg.system.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.system.entity.SysRegion;
+
+import java.util.List;
+
+/**
+ * 行政区表 服务层。
+ *
+ * @author ww
+ * @since 2026-01-06
+ */
+public interface SysRegionService extends IService<SysRegion> {
+
+    List<SysRegion> regionList();
+}

cash-common/cash-common-service/src/main/java/com/czg/system/vo/SysCategoryInfoVO.java

@@ -0,0 +1,40 @@
+package com.czg.system.vo;
+
+import com.czg.system.entity.SysCategoryInfo;
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 类目信息表 实体类。
+ *
+ * @author ww
+ * @since 2026-01-06
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysCategoryInfoVO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 一级类目
+     */
+    private String firstCategory;
+
+    private List<SysCategoryInfo> child;
+}