Merge branch 'master' into cc_20250905_franchiseAgreement

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java

coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java

@@ -55,5 +55,7 @@ public class PreparationDTO {
 
     private Long managerRegionId;
 
+    private String storeId;
+
 
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/ShopSignerInfoDTO.java

@@ -0,0 +1,26 @@
+package com.cool.store.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/3 15:22
+ * @Version 1.0
+ */
+@Data
+public class ShopSignerInfoDTO {
+
+    @ApiModelProperty("签约人1姓名")
+    private String partnershipSignatoryFirst;
+
+    @ApiModelProperty("签约人1手机号")
+    private String partnershipSignatoryFirstMobile;
+
+    @ApiModelProperty("签约人2姓名")
+    private String partnershipSignatorySecond;
+
+    @ApiModelProperty("签约人2手机号")
+    private String partnershipSignatorySecondMobile;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java

@@ -43,4 +43,22 @@ public class StoreDTO {
     private String longitude;
 
     private String latitude;
+
+    @ApiModelProperty("订货人")
+    private String addresseeName;
+    @ApiModelProperty("手机号")
+    private String addresseeMobile;
+    @ApiModelProperty("收件省市区")
+    private String addresseeArea;
+    @ApiModelProperty("订货地址")
+    private String addresseeAddress;
+    @ApiModelProperty("管理督导-crm系统的regionId")
+    private String managerSupervisionName;
+    @ApiModelProperty("所属大区/分部")
+    private String branchName;
+
+    @ApiModelProperty("门店状态")
+    private String storeStatus;
+    @ApiModelProperty("门店状态名称")
+    private String status;
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/StoreNameDTO.java

@@ -0,0 +1,25 @@
+package com.cool.store.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 门店名称DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StoreNameDTO {
+    @ApiModelProperty("门店名称")
+    private String storeName;
+
+    @ApiModelProperty("门店编码")
+    private String storeNum;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationListDTO.java

@@ -0,0 +1,55 @@
+package com.cool.store.dto.decoration;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/3 11:23
+ * @Version 1.0
+ */
+@Data
+public class DecorationListDTO {
+
+    private Long id;
+
+    @ApiModelProperty("装修团队ID")
+    private Long teamId;
+
+    @ApiModelProperty("门店ID")
+    private Long shopId;
+
+    @ApiModelProperty("门店名称")
+    private String shopName;
+
+    @ApiModelProperty("门店编号")
+    private String shopCode;
+
+    @ApiModelProperty("门店区域ID")
+    private String regionId;
+
+    @ApiModelProperty("门店区域名称")
+    private String regionName;
+
+    @ApiModelProperty("门店省")
+    private String province;
+
+    @ApiModelProperty("门店市")
+    private String city;
+
+    @ApiModelProperty("门店县")
+    private String district;
+
+    @ApiModelProperty("门店详细地址")
+    private String detailAddress;
+
+    @ApiModelProperty("门店类型")
+    private Integer storeType;
+
+    @ApiModelProperty("门店签约类型")
+    private Integer signType;
+
+    @ApiModelProperty("门店装修分配状态")
+    private Integer decorationDescStatus;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationTeamDTO.java

@@ -0,0 +1,25 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/29 18:41
+ * @Version 1.0
+ */
+@Data
+public class DecorationTeamDTO {
+
+    private Long id;
+
+    private String teamName;
+
+    private String teamCode;
+
+    private Integer useSystem;
+
+    private List<TeamAreaMappingDTO> cityList;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/TeamAreaMappingDTO.java

@@ -0,0 +1,21 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/29 19:01
+ * @Version 1.0
+ */
+@Data
+public class TeamAreaMappingDTO {
+
+    private Long teamId;
+
+    private Long openCityId;
+
+    private String openCityName;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/AccountTagDTO.java

@@ -0,0 +1,20 @@
+package com.cool.store.dto.huoma;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/6 11:09
+ * @Version 1.0
+ */
+@Data
+public class AccountTagDTO {
+
+    @ApiModelProperty("门店编码")
+    private String storeNum;
+
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/HuoMaAccountDTO.java

@@ -0,0 +1,39 @@
+package com.cool.store.dto.huoma;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 火码账号DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class HuoMaAccountDTO {
+    /**
+     * 账号
+     */
+    private String account;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 是否已查询
+     */
+    private Boolean isQuery;
+
+    public HuoMaAccountDTO(String account, String password) {
+        this.account = account;
+        this.password = password;
+        this.isQuery = false;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/ProgramReqDTO.java

@@ -0,0 +1,40 @@
+package com.cool.store.dto.huoma;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/5 14:43
+ * @Version 1.0
+ */
+@Data
+public class ProgramReqDTO {
+
+    @ApiModelProperty(name = "门店编码",required = true)
+    private String storeCode;
+
+    @ApiModelProperty(name = "设备名称",required = true)
+    @NotEmpty(message = "设备名称不能为空")
+    private String deviceName;
+
+    @ApiModelProperty(name = "第几页,",required = true)
+    private Integer index;
+
+    @ApiModelProperty(name ="每页数量",required = true)
+    private Integer size;
+
+    @ApiModelProperty(name = "时间",hidden = true)
+    private String date;
+
+    @ApiModelProperty(name = "排序",hidden = true)
+    private String sort;
+
+    @ApiModelProperty("标签id列表")
+    private List<Integer> tagIds;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/ProgramResponseDTO.java

@@ -0,0 +1,25 @@
+package com.cool.store.dto.huoma;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/5 14:44
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ProgramResponseDTO {
+
+    @ApiModelProperty("节目ID")
+    private Long id;
+
+    @ApiModelProperty("节目名称")
+    private String  name;
+
+    @ApiModelProperty("节目缩略图")
+    private String thumbnail;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/PublishDTO.java

@@ -0,0 +1,27 @@
+package com.cool.store.dto.huoma;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/5 17:06
+ * @Version 1.0
+ */
+@Data
+public class PublishDTO {
+
+    @ApiModelProperty(name = "门店编号",required = true)
+    @NotEmpty(message = "门店编码不能为空")
+    private String storeCode;
+    @ApiModelProperty(name = "设备ID列表",required = true)
+    @NotEmpty(message = "设备ID列表不能为空")
+    @JSONField(name = "terminals")
+    private List<String> deviceIdList;
+    @ApiModelProperty("节目id")
+    private Long programId;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/StoreEquipmentDTO.java

@@ -0,0 +1,59 @@
+package com.cool.store.dto.huoma;
+
+import com.cool.store.utils.BrowserVersionUtils;
+import lombok.Data;
+
+import java.util.Objects;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/08/13/16:24
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class StoreEquipmentDTO {
+    /**
+     * 已授权登录数
+    */
+    private Integer activeCount;
+
+    /**
+     * 总设备
+    */
+    private Integer terminalCount;
+
+    /**
+     * 网点ID
+    */
+    private Integer pointId;
+
+    /**
+     * 网点号
+    */
+    private String pointCode;
+
+    /**
+     * 签到数
+    */
+    private Integer signCount;
+
+    /**
+     * 在线
+    */
+
+    private Integer connectCount;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        StoreEquipmentDTO that = (StoreEquipmentDTO) o;
+        return Objects.equals(pointCode, that.pointCode);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(pointCode);
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/StoreRequestDTO.java

@@ -0,0 +1,40 @@
+package com.cool.store.dto.huoma;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/8/18 16:00
+ * @Version 1.0
+ */
+@Data
+public class StoreRequestDTO {
+
+    private String reportCode;
+
+    private Integer index;
+
+    private Integer size;
+
+    private Params params;
+
+    public StoreRequestDTO(String reportCode, Integer index, Integer size, String shopCode) {
+        this.reportCode = reportCode;
+        this.index = index;
+        this.size = size;
+        this.params = new Params(shopCode);
+    }
+
+    @Data
+    static class Params{
+        private String inputText_2;
+
+        public Params(String inputText_2) {
+            this.inputText_2 = inputText_2;
+        }
+    }
+
+
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/StoreXinFaDetailRequestDTO.java

@@ -0,0 +1,24 @@
+package com.cool.store.dto.huoma;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/8/18 16:38
+ * @Version 1.0
+ */
+@Data
+public class StoreXinFaDetailRequestDTO {
+
+    private Integer index;
+
+    private Integer size;
+
+    private Integer pointId;
+
+    public StoreXinFaDetailRequestDTO(Integer index, Integer size, Integer pointId) {
+        this.index = index;
+        this.size = size;
+        this.pointId = pointId;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/StoreXinFaDeviceDetail.java

@@ -0,0 +1,81 @@
+package com.cool.store.dto.huoma;
+
+import com.alibaba.fastjson.parser.DefaultJSONParser;
+import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer;
+import com.cool.store.utils.BrowserVersionUtils;
+import com.cool.store.utils.StringUtil;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.lang.reflect.Type;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/8/18 16:27
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class StoreXinFaDeviceDetail {
+
+    /**
+     * 设备ID
+     */
+    @ApiModelProperty(value = "设备ID")
+    private String id;
+
+    @ApiModelProperty("设备id")
+    private String deviceId;
+
+    /**
+     * 设备名称
+     */
+    @ApiModelProperty(value = "设备名称")
+    private String name;
+
+    /**
+     * 设备连接状态 0:未连接 1:已连接
+     */
+    @ApiModelProperty(value = "设备连接状态 false:未连接 true:已连接")
+    private Boolean isConnect;
+
+    /**
+     * 设备总内存
+     */
+    @ApiModelProperty(value = "设备总内存")
+    private String totalRam;
+
+    /**
+     * 设备可用内存
+     */
+    @ApiModelProperty(value = "设备可用内存")
+    private String availRam;
+
+    /**
+     * 设备浏览器信息
+     */
+    @ApiModelProperty(value = "设备浏览器信息")
+    private String userAgent;
+
+    /**
+     * 内用内存小于300M 或者 浏览器版本小于60
+     */
+    @ApiModelProperty(value = "内用内存小于300M 或者 浏览器版本小于60")
+    private Boolean flag;
+
+    public boolean getFlag() {
+        if (StringUtil.isEmpty(availRam)||StringUtil.isEmpty(userAgent)){
+            return false;
+        }
+        try {
+            Boolean isOldChromeBrowser = BrowserVersionUtils.isOldChromeBrowser(userAgent);
+            long availableMemoryMB = Long.parseLong(availRam) / (1024 * 1024);
+            return availableMemoryMB < 300 || isOldChromeBrowser;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/TagDTO.java

@@ -0,0 +1,29 @@
+package com.cool.store.dto.huoma;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/5 9:33
+ * @Version 1.0
+ */
+@Data
+public class TagDTO {
+
+    private String channelType;
+
+    private Integer index;
+
+    private Integer size;
+
+    private String type;
+
+    public TagDTO(String channelType, Integer index, Integer size, String type) {
+        this.channelType = channelType;
+        this.index = index;
+        this.size = size;
+        this.type = type;
+    }
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/TagDetailDTO.java

@@ -0,0 +1,22 @@
+package com.cool.store.dto.huoma;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/5 9:41
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TagDetailDTO {
+
+    @ApiModelProperty("标签Id")
+    private Integer id;
+
+    @ApiModelProperty("标签名称")
+    private String name;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserLoginDTO.java

@@ -0,0 +1,27 @@
+package com.cool.store.dto.login;
+
+import com.cool.store.enums.LoginTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 登录DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/3
+ */
+@Data
+public class UserLoginDTO {
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("密码")
+    private String password;
+
+    @NotNull(message = "登录类型不能为空")
+    private LoginTypeEnum loginType;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserRefreshLoginDTO.java

@@ -0,0 +1,18 @@
+package com.cool.store.dto.login;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * RefreshToken登录DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/5
+ */
+@Data
+public class UserRefreshLoginDTO {
+    @ApiModelProperty("RefreshToken")
+    private String refreshToken;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java

@@ -75,4 +75,12 @@ public class NoticeDTO {
     @ApiModelProperty("发布人时间")
     private Date publishTime;
 
+    private String handlePersonInfo;
+
+    private String storeInfo;
+
+    private Integer jumpType;
+
+    private String jumpUrl;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/LaunchDataDTO.java

@@ -0,0 +1,21 @@
+package com.cool.store.dto.recipe;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 服务包菜品数据
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/30
+ */
+@Data
+public class LaunchDataDTO {
+    @ApiModelProperty("名称")
+    private String spName;
+    
+    @ApiModelProperty("上新时间，yyyy-MM-dd")
+    private String upSaleDate;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RecipeLaunchDTO.java

@@ -0,0 +1,34 @@
+package com.cool.store.dto.recipe;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 菜品上新DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/3
+ */
+@Data
+public class RecipeLaunchDTO {
+    @ApiModelProperty("商品编码")
+    private String goodsCode;
+
+    @ApiModelProperty("商品图片")
+    private String goodsImageUrl;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    @ApiModelProperty("上新时间")
+    private String launchTime;
+
+    @ApiModelProperty("单日最高销量")
+    private Integer maxQty;
+
+    @ApiModelProperty("销量总计")
+    private Integer sumQty;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RecipeSpLaunchDTO.java

@@ -0,0 +1,23 @@
+package com.cool.store.dto.recipe;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务包菜品上新DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/3
+ */
+@Data
+public class RecipeSpLaunchDTO {
+    @ApiModelProperty("菜品上新记录")
+    private List<RecipeLaunchDTO> recipeRecordList;
+
+    @ApiModelProperty("服务包执行记录")
+    private List<ServicePackageExecuteDTO> spRecordList;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java

@@ -0,0 +1,44 @@
+package com.cool.store.dto.recipe;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 营收数据
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/30
+ */
+@Data
+public class RevenueDataDTO {
+    @ApiModelProperty("门店编码")
+    private String storeCode;
+
+    @ApiModelProperty("营业额")
+    private BigDecimal amt;
+
+    @ApiModelProperty("实收")
+    private BigDecimal receivedAmt;
+
+    @ApiModelProperty("外卖实收")
+    private BigDecimal takeoutReceivedAmt;
+
+    @ApiModelProperty("堂食实收")
+    private BigDecimal dineInReceivedAmt;
+
+    @ApiModelProperty("营业时间，yyyy-MM-dd")
+    private String businessDate;
+
+    @ApiModelProperty("服务包列表")
+    private List<LaunchDataDTO> otherLaunchDates;
+
+    @ApiModelProperty("菜品列表")
+    private List<LaunchDataDTO> otherRecipeLaunchDates;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataQueryDTO.java

@@ -0,0 +1,28 @@
+package com.cool.store.dto.recipe;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 营收数据查询DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/30
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RevenueDataQueryDTO {
+    @ApiModelProperty("门店编码")
+    private String storeCode;
+
+    @ApiModelProperty("业务时间开始")
+    private String businessDateFrom;
+
+    @ApiModelProperty("业务时间结束")
+    private String businessDateTo;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/ServicePackageExecuteDTO.java

@@ -0,0 +1,30 @@
+package com.cool.store.dto.recipe;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 服务包执行DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/3
+ */
+@Data
+public class ServicePackageExecuteDTO {
+    @ApiModelProperty("服务包执行时间")
+    private String executeTime;
+
+    @ApiModelProperty("服务包图片")
+    private String spImage;
+
+    @ApiModelProperty("服务包名称")
+    private String spName;
+
+    @ApiModelProperty("服务包id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long spId;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreOrderTimeDTO.java

@@ -0,0 +1,27 @@
+package com.cool.store.dto.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 门店最新订货时间DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StoreOrderTimeDTO {
+    @ApiModelProperty("门店id")
+    private String storeId;
+
+    @ApiModelProperty("最新订货时间")
+    private Date latestOrderTime;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreUserDTO.java

@@ -1,6 +1,7 @@
 package com.cool.store.dto.store;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @Author suzhuhong
@@ -8,6 +9,7 @@ import lombok.Data;
  * @Version 1.0
  */
 @Data
+@NoArgsConstructor
 public class StoreUserDTO {
 
     private String userId;
@@ -18,4 +20,8 @@ public class StoreUserDTO {
 
     private String positionName;
 
+    public StoreUserDTO(String userName, String mobile) {
+        this.userName = userName;
+        this.mobile = mobile;
+    }
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreUserPositionDTO.java

@@ -18,6 +18,8 @@ public class StoreUserPositionDTO {
 
     private String shopCode;
 
+    private String storeCode;
+
     List<StoreUserDTO> userList;
 
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreUserUpdateDTO.java

@@ -0,0 +1,31 @@
+package com.cool.store.dto.store;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/9/25 15:37
+ * @Version 1.0
+ */
+@Data
+public class StoreUserUpdateDTO {
+
+    private String storeCode;
+
+    List<UserDTO> userList;
+
+    @Data
+    class UserDTO {
+
+        private String userName;
+
+        private String mobile;
+
+        private String positionName;
+
+    }
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountActiveUrlDTO.java

@@ -0,0 +1,20 @@
+package com.cool.store.dto.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/18 17:55
+ * @Version 1.0
+ */
+@Data
+public class AccountActiveUrlDTO {
+    @ApiModelProperty(value = "商户门店编号",required = true)
+    private String outStoreId;
+    @ApiModelProperty(value = "H5 激活页短链（商户需访问此链接完成操作，非公网可直接访问需确认权限）",required = true)
+    private String activateUrl;
+    @ApiModelProperty(value = "短链失效时间（格式：YYYY-MM-DD HH:mm:ss，过期后需重新调用接口生成）",required = true)
+    private String expireTime;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountAuthenticationDTO.java

@@ -0,0 +1,17 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 16:06
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AccountAuthenticationDTO {
+
+    private Integer accountStatus;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java

@@ -0,0 +1,89 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 门店签约人账户
+ * @Author suzhuhong
+ * @Date 2025/11/13 16:54
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AccountInfoDTO {
+
+    @ApiModelProperty(value = "结算卡业务类型 枚举值：1：对公 2：对私", required = true)
+    private Integer accountType;
+
+    @ApiModelProperty(value = "营业执照号码")
+    private String licenseNo;
+
+    @ApiModelProperty(value = "工商注册名称")
+    private String licenseName;
+
+    @ApiModelProperty(value = "法人姓名")
+    private String legalName;
+
+    @ApiModelProperty(value = "法人证件号码")
+    private String legalNo;
+
+    @ApiModelProperty(value = "法人联系电话")
+    private String legalPhone;
+
+    @ApiModelProperty(value = "门店编号", required = true)
+    private String storeSn;
+
+    @ApiModelProperty(value = "账户编号", required = true)
+    private String accountNo;
+
+    @ApiModelProperty(value = "账户名称", required = true)
+    private String accountName;
+
+    @ApiModelProperty(value = "账户别名", required = true)
+    private String accountAliasName;
+
+    @ApiModelProperty(value = "结算银行卡号", required = true)
+    private String accountCardNo;
+
+    @ApiModelProperty(value = "结算卡银行预留手机号", required = true)
+    private String accountPhone;
+
+    @ApiModelProperty(value = "开户支行名称", required = true)
+    private String bankName;
+
+    @ApiModelProperty(value = "支行编号", required = true)
+    private String bankNo;
+    
+    @ApiModelProperty(value = "总行名称")
+    private String headBankName;
+
+    @ApiModelProperty(value = "账户状态 1:待提交 2:待鉴权 3:鉴权中 4:开通 5:开通失败", required = true)
+    private Integer accountStatus;
+
+    @ApiModelProperty(value = "账户余额", required = true)
+    private String totalAmount;
+
+    @ApiModelProperty(value = "可提现余额", required = true)
+    private String withdrawAmount;
+
+    @ApiModelProperty(value = "打标状态 0 未打标 1 已打标", required = true)
+    private Integer labelingStatus;
+
+    @ApiModelProperty(value = "是否签约人账户 0 否 1 是", required = true)
+    private Integer isLegal;
+
+    @ApiModelProperty("工商类型 1.企业 2.个体工商户 3.小微商户(自然人)")
+    private Integer businessType;
+    
+    @ApiModelProperty("钱包类型 1平安 2网商")
+    private Integer walletType;
+    
+    @ApiModelProperty("失败原因(仅网商在创建失败或激活失败时返回)")
+    private String errMsg;
+
+    @ApiModelProperty("crm门店id")
+    private String outStoreId;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountNoDTO.java

@@ -0,0 +1,17 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 14:58
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AccountNoDTO {
+
+    private String accountNo;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountPageDTO.java

@@ -0,0 +1,20 @@
+package com.cool.store.dto.wallet;
+
+import com.cool.store.request.wallet.WalletBasicPageInfo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/18 10:12
+ * @Version 1.0
+ */
+@Data
+public class AccountPageDTO {
+
+    private List<AccountInfoDTO> pageData;
+
+    private WalletBasicPageInfo page;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountVerifyDTO.java

@@ -0,0 +1,19 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 16:09
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AccountVerifyDTO {
+
+    private String outStoreId;
+
+    private Integer openStatus;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AddTagDTO.java

@@ -0,0 +1,22 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 14:59
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AddTagDTO {
+
+    private Integer status;
+
+    private Integer addTagType;
+
+    @ApiModelProperty("网商状态，1.打标成功  2.打标失败  3.处理中")
+    private Integer wsStatus;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankDTO.java

@@ -0,0 +1,27 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 10:54
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BankDTO {
+
+    @ApiModelProperty("银行编号")
+    private String headCode;
+    @ApiModelProperty("银行名称")
+    private String headName;
+    @ApiModelProperty("支行号")
+    private String branchCode;
+    @ApiModelProperty("支行名称")
+    private String branchName;
+    @ApiModelProperty("支行地址")
+    private String branchAddress;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankListDTO.java

@@ -0,0 +1,22 @@
+package com.cool.store.dto.wallet;
+
+import com.cool.store.request.wallet.WalletBasicPageInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 14:36
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BankListDTO {
+
+    WalletBasicPageInfo page;
+
+    List<BankDTO> pageData;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillDTO.java

@@ -0,0 +1,84 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/14 10:31
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BillDTO {
+
+    /**
+     * 业务系统付款单号(如 CRM 单号)
+     */
+    private String reqNo;
+
+    /**
+     * 交易Id（营帐通）
+     */
+    private Long tradeId;
+
+    /**
+     * 交易编号（扫呗）
+     */
+    private String outTradeNo;
+
+    /**
+     * 费用科目
+     */
+    private Integer feeItemId;
+
+    /**
+     * 费用科目名称
+     */
+    private String feeItemName;
+
+    /**
+     * 门店账户编号
+     */
+    private String storeAccountNo;
+
+    /**
+     * 公司编号
+     */
+    private String companyCode;
+
+    /**
+     * 公司账户编号
+     */
+    private String companyAccountNo;
+
+    /**
+     * 提现银行卡
+     */
+    private String withdrawalBankCradNo;
+
+    /**
+     * 提现银行卡户名
+     */
+    private String withdrawalBankCradName;
+
+    /**
+     * 金额(元)
+     */
+    private String amount;
+
+    /**
+     * 交易状态 1.成功 2.失败 3.处理中
+     */
+    private Integer tradeStatus;
+
+    /**
+     * 交易类型 1.转账 2.提现
+     */
+    private Integer tradeType;
+
+    /**
+     * 交易发起时间
+     */
+    private String createTime;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillDetailDTO.java

@@ -0,0 +1,100 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/14 10:09
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BillDetailDTO {
+
+    /**
+     * 外部门店唯一标识
+     */
+    private String outStoreId;
+
+    /**
+     * 业务系统付款单号(如 CRM 单号)
+     */
+    private String reqNo;
+
+    /**
+     * 交易Id（营帐通）
+     */
+    private Long tradeId;
+
+    /**
+     * 交易编号（扫呗）
+     */
+    private String outTradeNo;
+
+    /**
+     * 交易科目
+     */
+    private Integer feeItemId;
+
+    /**
+     * 费用科目名称
+     */
+    private String feeItemName;
+
+    /**
+     * 门店账户编号
+     */
+    private String storeAccountNo;
+
+    /**
+     * 交易对方账户编号
+     */
+    private String transAccountNo;
+
+    /**
+     * 交易对方账户名称
+     */
+    private String transAccountName;
+
+    /**
+     * 公司编号
+     */
+    private String companyCode;
+
+    /**
+     * 公司账户编号
+     */
+    private String companyAccountNo;
+
+    /**
+     * 提现银行卡
+     */
+    private String withdrawalBankCardNo;
+
+    /**
+     * 提现银行卡户名
+     */
+    private String withdrawalBankCardName;
+
+    /**
+     * 金额(元)
+     */
+    private String amount;
+
+    /**
+     * 交易状态 1.成功 2.失败 3.处理中
+     */
+    private Integer tradeStatus;
+
+    /**
+     * 交易类型 1.转账 2.提现
+     */
+    private Integer tradeType;
+
+    /**
+     * 交易发起时间
+     */
+    private String createTime;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java

@@ -0,0 +1,33 @@
+package com.cool.store.dto.wallet;
+
+import com.cool.store.request.wallet.WalletBasicPageInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 交易列表DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/17
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BillPageDTO {
+    private List<TradeRecordDTO> pageData;
+
+    private WalletBasicPageInfo page;
+
+    /**
+     * 收入
+     */
+    private Long getAmount;
+
+    /**
+     * 支出
+     */
+    private Long useAmount;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyDTO.java

@@ -0,0 +1,25 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/14 10:34
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CompanyDTO {
+
+    @ApiModelProperty(value = "公司编号")
+    private String companyCode;
+
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "公司账户")
+    private String companyAccountNo;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyListDTO.java

@@ -0,0 +1,23 @@
+package com.cool.store.dto.wallet;
+
+import com.cool.store.request.wallet.WalletBasicPageInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/14 10:57
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CompanyListDTO {
+
+    private List<CompanyDTO> pageData;
+
+    private WalletBasicPageInfo page;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/LargePaymentDTO.java

@@ -0,0 +1,55 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 17:15
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class LargePaymentDTO {
+
+    @ApiModelProperty(value = "外部门店唯一标识", required = true)
+    private String outStoreId;
+
+    @ApiModelProperty(value = "请求预支付Id", required = true)
+    private String paymentId;
+
+    @ApiModelProperty(value = "收款码唯一流水号", required = true)
+    private String transOrderTrace;
+
+    @ApiModelProperty(value = "付款人账户编号", required = true)
+    private String payerAcctNo;
+
+    @ApiModelProperty(value = "付款人户名", required = true)
+    private String payerAcctName;
+
+    @ApiModelProperty(value = "付款银行名称")
+    private String payerBankName;
+
+    @ApiModelProperty(value = "付款银行行号")
+    private String payerBankNo;
+
+    @ApiModelProperty(value = "充值金额", required = true)
+    private String amt;
+
+    @ApiModelProperty(value = "收款账号", required = true)
+    private String payeeAccNo;
+
+    @ApiModelProperty(value = "收款账户名称", required = true)
+    private String payeeAccName;
+
+    @ApiModelProperty(value = "收款银行名称", required = true)
+    private String payeeBankName;
+
+    @ApiModelProperty(value = "收款银行行号", required = true)
+    private String payeeBankNo;
+
+    @ApiModelProperty(value = "账号过期时间")
+    private String expireTime;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/OpenBasicInfoDTO.java

@@ -0,0 +1,116 @@
+package com.cool.store.dto.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 开通网商需要的基本信息
+ * @Author suzhuhong
+ * @Date 2025/11/20 10:49
+ * @Version 1.0
+ */
+@Data
+public class OpenBasicInfoDTO {
+
+    @ApiModelProperty(value = "门店编号")
+    private String storeCode;
+
+    @ApiModelProperty("门店id")
+    private String storeId;
+
+    /**
+     * 签约人名称
+     */
+    @ApiModelProperty(value = "签约人名称")
+    private String signerName;
+
+    /**
+     * 签约人身份证号码
+     */
+    @ApiModelProperty(value = "签约人身份证号码")
+    private String signerIdCard;
+
+    /**
+     * 签约人手机号
+     */
+    @ApiModelProperty(value = "签约人手机号")
+    private String signerPhone;
+
+    /**
+     * 签约人身份证正面
+     */
+    @ApiModelProperty(value = "签约人身份证正面")
+    private String signerIdCardFront;
+
+    /**
+     * 签约人身份证反面
+     */
+    @ApiModelProperty(value = "签约人身份证反面")
+    private String signerIdCardBack;
+
+    /**
+     * 营业执照名字
+     */
+    @ApiModelProperty(value = "营业执照名字")
+    private String businessLicenseName;
+
+    /**
+     * 营业执照社会信用代码
+     */
+    @ApiModelProperty(value = "营业执照社会信用代码")
+    private String businessLicenseCode;
+
+    /**
+     * 营业执照照片
+     */
+    @ApiModelProperty(value = "营业执照照片")
+    private String businessLicensePhoto;
+
+    /**
+     * 法人是否签约人
+     */
+    @ApiModelProperty(value = "法人是否签约人")
+    private Integer legalIsSigner;
+
+    /**
+     * 法人身份证正面
+     */
+    @ApiModelProperty(value = "法人身份证正面")
+    private String legalIdCardFront;
+
+    /**
+     * 法人身份证反面
+     */
+    @ApiModelProperty(value = "法人身份证反面")
+    private String legalIdCardBack;
+
+    /**
+     * 结算卡
+     */
+    @ApiModelProperty(value = "结算卡")
+    private String settlementCard;
+
+    /**
+     * 开户支行名称
+     */
+    @ApiModelProperty(value = "开户支行名称")
+    private String bankBranchName;
+
+    /**
+     * 开户支行编号
+     */
+    @ApiModelProperty(value = "开户支行编号")
+    private String bankBranchCode;
+
+    /**
+     * 银行预留手机号
+     */
+    @ApiModelProperty(value = "银行预留手机号")
+    private String bankReservedPhone;
+
+    @ApiModelProperty("来源，开通流程传1，其他0")
+    private Integer source;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PasswordDTO.java

@@ -0,0 +1,22 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/26 18:14
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PasswordDTO {
+
+    @ApiModelProperty(value = "密码是否已存在 1.存在 2.不存在", required = true)
+    private Integer isExist;
+
+    @ApiModelProperty(value = "是否已存在账户 1.存在 2.不存在", required = true)
+    private Boolean isExistAccount;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDTO.java

@@ -0,0 +1,76 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Pattern;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 18:23
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PaymentDTO {
+
+    @ApiModelProperty(name = "外部门店唯一标识", required = true)
+    private String outStoreId;
+
+    @ApiModelProperty(name = "请求预支付Id", required = true)
+    private String paymentId;
+
+    @ApiModelProperty(name = "收款码唯一流水号", required = true)
+    private String transOrderTrace;
+
+    @ApiModelProperty(name = "金额", required = true)
+    private String totalFee;
+
+    @ApiModelProperty(name = "状态:1-成功 2-失败 3-支付中 4-撤销", required = true)
+    private Integer orderStatus;
+
+    @ApiModelProperty(name = "利楚订单号(商户订单号)")
+    private String outTradeNo;
+
+    @ApiModelProperty(name = "通道订单号(银行订单号)")
+    private String channelOrderNo;
+
+    @ApiModelProperty(name = "付款人账号")
+    private String payerAccNo;
+
+    @ApiModelProperty(name = "付款人户名")
+    private String payerAccName;
+
+    @ApiModelProperty(name = "付款人银行名称")
+    private String payerBankName;
+
+    @ApiModelProperty(name = "付款银行行号")
+    private String payerBankNo;
+
+    @ApiModelProperty(name = "收款账号", required = true)
+    private String payeeAccNo;
+
+    @ApiModelProperty(name = "收款账户名称", required = true)
+    private String payeeAccName;
+
+    @ApiModelProperty(name = "收款银行名称", required = true)
+    private String payeeBankName;
+
+    @ApiModelProperty(name = "收款银行行号", required = true)
+    private String payeeBankNo;
+
+    @ApiModelProperty(name = "账号过期时间")
+    private String expireTime;
+
+    @ApiModelProperty(name = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(name = "付款明细")
+    private List<PaymentDetailDTO> payList;
+
+
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDetailDTO.java

@@ -0,0 +1,34 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 17:38
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PaymentDetailDTO {
+
+    @ApiModelProperty(value = "打款金额", required = true)
+    private String tranAmt;
+
+    @ApiModelProperty(value = "付款人账号", required = true)
+    private String payerAccountName;
+
+    @ApiModelProperty(value = "付款时间", required = true)
+    private String paySuccessTime;
+
+    @ApiModelProperty(value = "付款银行账号", required = true)
+    private String payerAccountBankNo;
+
+    @ApiModelProperty(value = "银行受理时间", required = true)
+    private String tranSeqNo;
+
+    @ApiModelProperty(value = "付款账号", required = true)
+    private String payerAccountNo;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/StoreAccountDTO.java

@@ -0,0 +1,21 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 14:54
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class StoreAccountDTO {
+
+    /**
+     * 营帐通的账户ID
+     */
+    private String accountNo;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/StoreIdDTO.java

@@ -0,0 +1,16 @@
+package com.cool.store.dto.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/18 18:20
+ * @Version 1.0
+ */
+@Data
+public class StoreIdDTO {
+    @ApiModelProperty(value = "商户门店编号",required = true)
+    private String outStoreId;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TextMsgSendDTO.java

@@ -0,0 +1,24 @@
+package com.cool.store.dto.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 网商激活短链DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/20
+ */
+@Data
+public class TextMsgSendDTO {
+    @ApiModelProperty("crm门店id")
+    private String outStoreId;
+    
+    @ApiModelProperty("H5 激活页短链（商户需访问此链接完成操作，非公网可直接访问需确认权限）")
+    private String activityUrl;
+    
+    @ApiModelProperty("短链失效时间（格式：YYYY-MM-DD HH:mm:ss，过期后需重新调用接口生成）")
+    private String expireTime;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TradeRecordDTO.java

@@ -0,0 +1,80 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/19 11:14
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TradeRecordDTO implements Serializable {
+
+    @ApiModelProperty(value = "业务系统付款单号(如 CRM 单号)", required = true)
+    private String reqNo;
+
+    @ApiModelProperty(value = "交易（营帐通）", required = true)
+    private Long tradeId;
+
+    @ApiModelProperty(value = "交易流水号（扫呗）", required = true)
+    private String outTradeNo;
+
+    @ApiModelProperty(value = "费用科目", required = true)
+    private Integer feeItemId;
+
+    @ApiModelProperty(value = "费用科目名称", required = true)
+    private String feeItemName;
+
+    @ApiModelProperty(value = "转出方门店编号")
+    private String outStoreCode;
+
+    @ApiModelProperty(value = "转入方门店编号")
+    private String inStoreCode;
+
+    @ApiModelProperty(value = "转出方门店名称")
+    private String outStoreName;
+
+    @ApiModelProperty(value = "转入方门店名称")
+    private String inStoreName;
+
+    @ApiModelProperty(value = "转出方账户编号")
+    private String outAccountNo;
+
+    @ApiModelProperty(value = "转入方账户编号")
+    private String inAccountNo;
+
+    @ApiModelProperty(value = "转出方账户名称")
+    private String outAccountName;
+
+    @ApiModelProperty(value = "转入方账户名称")
+    private String inAccountName;
+
+    @ApiModelProperty(value = "提现银行卡号")
+    private String withdrawalBankCardNo;
+
+    @ApiModelProperty(value = "提现银行卡户名")
+    private String withdrawalBankCardName;
+
+    @ApiModelProperty(value = "金额(元)", required = true)
+    private String amount;
+
+    @ApiModelProperty(value = "交易状态1.成功 2.失败 3.处理中 4.已退款", required = true)
+    private Integer tradeStatus;
+
+    @ApiModelProperty(value = "1.转账2.提现 交易类型", required = true)
+    private Integer tradeType;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "错误原因")
+    private String errMsg;
+
+    @ApiModelProperty(value = "交易发起时间YYYY-MM-DD HH:MM:SS", required = true)
+    private String createTime;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TradeRecordListDTO.java

@@ -0,0 +1,22 @@
+package com.cool.store.dto.wallet;
+
+import com.cool.store.request.wallet.WalletBasicPageInfo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/19 11:15
+ * @Version 1.0
+ */
+@Data
+public class TradeRecordListDTO {
+
+    private List<TradeRecordDTO> pageData;
+
+
+    private WalletBasicPageInfo page;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TransferDTO.java

@@ -0,0 +1,25 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/14 9:49
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TransferDTO {
+
+    @ApiModelProperty(value="业务系统付款单号(如 CRM 单号)",required = true)
+    private String reqNo;
+    @ApiModelProperty(value="转账交易Id",required = true)
+    private Long tradeId;
+    @ApiModelProperty(value="金额(元)",required = true)
+    private String amount;
+    @ApiModelProperty(value="交易状态1.成功 2.失败 3.处理中",required = true)
+    private Integer tradeStatus;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/WithDrawerDTO.java

@@ -0,0 +1,31 @@
+package com.cool.store.dto.wallet;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/14 9:59
+ * @Version 1.0
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class WithDrawerDTO {
+
+    @ApiModelProperty(value = "门店ID",required = true)
+    private String outStoreId;
+    @ApiModelProperty(value = "业务系统付款单号(如 CRM 单号)",required = true)
+    private String reqNo;
+    @ApiModelProperty(value = "转账交易Id（营帐通系统）",required = true)
+    private String tradeId;
+    @ApiModelProperty(value = "提现科目",required = true)
+    private Long feeItemId;
+    @ApiModelProperty(value = "提现账户编号",required = true)
+    private String accountNo;
+    @ApiModelProperty(value = "金额(元)",required = true)
+    private String amount;
+    @ApiModelProperty(value = "交易状态1.成功 2.失败 3.处理中",required = true)
+    private String tradeStatus;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wechat/AccessTokenDTO.java

@@ -0,0 +1,17 @@
+package com.cool.store.dto.wechat;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/10 15:01
+ * @Version 1.0
+ */
+@Data
+public class AccessTokenDTO {
+
+    private String access_token;
+
+    private Integer expires_in;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wechat/CallbackMessageDTO.java

@@ -0,0 +1,26 @@
+package com.cool.store.dto.wechat;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/14 14:39
+ * @Version 1.0
+ */
+@Data
+public class CallbackMessageDTO {
+
+    private String toUserName;
+
+    private String fromUserName;
+
+    private Long createTime;
+
+    private String msgType;
+
+    private String event;
+
+    private String eventKey;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wechat/ServiceAccountOpenIdDTO.java

@@ -0,0 +1,23 @@
+package com.cool.store.dto.wechat;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/16 14:13
+ * @Version 1.0
+ */
+@Data
+public class ServiceAccountOpenIdDTO {
+
+    private String partnerId;
+
+    private String unionId;
+
+    private String serviceAccountOpenId;
+
+    private Date lastUpdateTime;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wechat/WechatTemplateMessageDTO.java

@@ -0,0 +1,90 @@
+package com.cool.store.dto.wechat;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/10 14:36
+ * @Version 1.0
+ */
+@Data
+public class WechatTemplateMessageDTO {
+
+    /**
+     * 接收者openid
+     */
+    @JsonProperty("touser")
+    private String toUser;
+
+    /**
+     * 模板ID
+     */
+    @JsonProperty("template_id")
+    private String templateId;
+
+    /**
+     * 模板跳转链接（非必须）
+     */
+    private String url;
+
+    /**
+     * 跳小程序所需数据，不需跳小程序可不用传该数据
+     */
+    private MiniprogramDTO miniprogram;
+
+    /**
+     * 模板数据
+     */
+    private Map<String, TemplateDataItemDTO> data;
+
+    /**
+     * 小程序跳转DTO
+     */
+    @Data
+    public static class MiniprogramDTO {
+
+        /**
+         * 所需跳转到的小程序appid
+         */
+        private String appid;
+
+        /**
+         * 所需跳转到小程序的具体页面路径，支持带参数
+         */
+        private String pagepath;
+    }
+
+    /**
+     * 模板数据项DTO
+     */
+    @Data
+    public static class TemplateDataItemDTO {
+
+        /**
+         * 模板内容
+         */
+        private String value;
+
+        /**
+         * 模板内容字体颜色，不填默认为黑色
+         */
+        private String color;
+
+        public TemplateDataItemDTO() {
+        }
+
+        public TemplateDataItemDTO(String value) {
+            this.value = value;
+            this.color = "#333333";
+        }
+
+        public TemplateDataItemDTO(String value, String color) {
+            this.value = value;
+            this.color = color;
+        }
+    }
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wechat/WechatUserInfoDTO.java

@@ -0,0 +1,115 @@
+package com.cool.store.dto.wechat;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/15 9:56
+ * @Version 1.0
+ */
+@Data
+public class WechatUserInfoDTO {
+    /**
+     * 用户是否订阅该公众号标识
+     * 0代表未关注，1代表关注
+     */
+    private Integer subscribe;
+
+    /**
+     * 用户的标识，对当前公众号唯一
+     */
+    private String openid;
+
+    /**
+     * 用户的昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户的性别
+     * 1为男性，2为女性，0为未知
+     */
+    private Integer sex;
+
+    /**
+     * 用户所在城市
+     */
+    private String city;
+
+    /**
+     * 用户所在国家
+     */
+    private String country;
+
+    /**
+     * 用户所在省份
+     */
+    private String province;
+
+    /**
+     * 用户的语言
+     * 简体中文为zh_CN
+     */
+    private String language;
+
+    /**
+     * 用户头像
+     */
+    private String headimgurl;
+
+    /**
+     * 用户关注时间，为时间戳
+     */
+    @JsonProperty("subscribe_time")
+    private Long subscribeTime;
+
+    /**
+     * 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段
+     */
+    private String unionid;
+
+    /**
+     * 公众号运营者对粉丝的备注
+     */
+    private String remark;
+
+    /**
+     * 用户所在的分组ID（兼容旧的用户分组接口）
+     */
+    private Integer groupid;
+
+    /**
+     * 用户被打上的标签ID列表
+     */
+    @JsonProperty("tagid_list")
+    private List<Integer> tagidList;
+
+    /**
+     * 返回用户关注的渠道来源
+     */
+    @JsonProperty("subscribe_scene")
+    private String subscribeScene;
+
+    /**
+     * 二维码扫码场景（开发者自定义）
+     */
+    @JsonProperty("qr_scene")
+    private Long qrScene;
+
+    /**
+     * 二维码扫码场景描述（开发者自定义）
+     */
+    @JsonProperty("qr_scene_str")
+    private String qrSceneStr;
+
+    /**
+     * 是否已关注
+     */
+    public boolean isSubscribed() {
+        return subscribe != null && subscribe == 1;
+    }
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramFreeLoginDTO.java

@@ -0,0 +1,21 @@
+package com.cool.store.dto.wx;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <p>
+ * 小程序免登DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/18
+ */
+@Data
+public class MiniProgramFreeLoginDTO {
+    @ApiModelProperty("手机号")
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/BigRegionDO.java

@@ -70,6 +70,12 @@ public class BigRegionDO {
     @Column(name = "hqt_region_name")
     private String hqtRegionName;
 
+    /**
+     * 加盟品牌
+     */
+    @Column(name = "join_brand")
+    private Integer joinBrand;
+
     public String getHqtRegionName() {
         return hqtRegionName;
     }

coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java

@@ -5,7 +5,10 @@ import java.io.Serializable;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
 import javax.persistence.*;
@@ -18,6 +21,9 @@ import javax.validation.constraints.NotBlank;
  */
 @Table(name = "xfsg_build_information")
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class BuildInformationDO {
 
     @Id

coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java

@@ -72,4 +72,8 @@ public class FranchiseFeeDO {
     @ApiModelProperty("新管家已缴金额")
     private BigDecimal xgjFeesPaid;
 
+    @Column(name = "cashier_fee")
+    @ApiModelProperty("收银费(系统费)")
+    private String cashierFee;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/MessageTemplateDO.java

@@ -151,5 +151,13 @@ public class MessageTemplateDO {
     @Column(name = "store_info")
     private String storeInfo;
 
+    @Column(name = "jump_type")
+    private Integer jumpType;
+    @Column(name = "jump_url")
+    private String jumpUrl;
+
+    @Column(name = "handle_keyword")
+    private String handleKeyword;
+
 
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/OldShopDO.java

@@ -1,13 +1,19 @@
 package com.cool.store.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 import java.util.Date;
 
 @Data
 @Table(name = "xfsg_old_shop")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class OldShopDO {
 
     /**

coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java

@@ -117,4 +117,8 @@ public class OrderSysInfoDO {
     /** 总部订货收款修改人 */
     @Column(name = "receiving_update_user")
     private String receivingUpdateUser;
+
+    /** 订货方式，0先款后货、1先货后款 */
+    @Column(name = "order_type")
+    private Integer orderType;
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/PartnerUserWechatBindDO.java

@@ -36,6 +36,10 @@ public class PartnerUserWechatBindDO implements Serializable {
      */
     private String partnerId;
 
+    private String unionId;
+
+    private String serviceAccountOpenId;
+
     /**
      * 创建时间
      */

coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java

@@ -158,4 +158,7 @@ public class ShopInfoDO {
     //红圈通门店id
     @Column(name = "hqt_shop_id")
     private String hqtShopId;
+    // 门店id
+    @Column(name = "store_id")
+    private String storeId;
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java

@@ -238,5 +238,31 @@ public class StoreDO {
 
     private String miniProgramOrderStoreName;
 
+    /**
+     * 是否接入物联网
+     */
+    private Integer isIot;
+
+    /**
+     * 收件人
+     */
+    private String addresseeName;
+
+    /**
+     * 手机号
+     */
+    private String addresseeMobile;
+
+    /**
+     * 收件省市区
+     */
+    private String addresseeArea;
+
+    /**
+     * 收件详细地址
+     */
+    private String addresseeAddress;
+
+    private Long branch;
 
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/decoration/DecorationTeamConfigDO.java

@@ -0,0 +1,168 @@
+package com.cool.store.entity.decoration;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "zxjp_decoration_team_config")
+public class DecorationTeamConfigDO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 团队名称
+     */
+    @Column(name = "team_name")
+    private String teamName;
+
+    /**
+     * 团队编号
+     */
+    @Column(name = "team_code")
+    private String teamCode;
+
+    /**
+     * 使用系统（1-CRM，2-红圈通）
+     */
+    @Column(name = "use_system")
+    private Integer useSystem;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 删除状态（0-正常，1-删除）
+     */
+    private Integer deleted;
+
+    /**
+     * @return id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取团队名称
+     *
+     * @return team_name - 团队名称
+     */
+    public String getTeamName() {
+        return teamName;
+    }
+
+    /**
+     * 设置团队名称
+     *
+     * @param teamName 团队名称
+     */
+    public void setTeamName(String teamName) {
+        this.teamName = teamName;
+    }
+
+    /**
+     * 获取团队编号
+     *
+     * @return team_code - 团队编号
+     */
+    public String getTeamCode() {
+        return teamCode;
+    }
+
+    /**
+     * 设置团队编号
+     *
+     * @param teamCode 团队编号
+     */
+    public void setTeamCode(String teamCode) {
+        this.teamCode = teamCode;
+    }
+
+    /**
+     * 获取使用系统（1-CRM，2-红圈通）
+     *
+     * @return use_system - 使用系统（1-CRM，2-红圈通）
+     */
+    public Integer getUseSystem() {
+        return useSystem;
+    }
+
+    /**
+     * 设置使用系统（1-CRM，2-红圈通）
+     *
+     * @param useSystem 使用系统（1-CRM，2-红圈通）
+     */
+    public void setUseSystem(Integer useSystem) {
+        this.useSystem = useSystem;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return create_time - 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取更新时间
+     *
+     * @return update_time - 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置更新时间
+     *
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取删除状态（0-正常，1-删除）
+     *
+     * @return deleted - 删除状态（0-正常，1-删除）
+     */
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    /**
+     * 设置删除状态（0-正常，1-删除）
+     *
+     * @param deleted 删除状态（0-正常，1-删除）
+     */
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/decoration/ShopDecorationAssignDO.java

@@ -0,0 +1,145 @@
+package com.cool.store.entity.decoration;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "zxjp_shop_decoration_assign")
+public class ShopDecorationAssignDO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 装修团队id
+     */
+    @Column(name = "shop_id")
+    private Long shopId;
+
+    /**
+     * 分配状态（0-待分配，1-已分配）
+     */
+    @Column(name = "decoration_desc_status")
+    private Integer decorationDescStatus;
+
+    /**
+     * 装修团队id
+     */
+    @Column(name = "decoration_team_id")
+    private Long decorationTeamId;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "created_time")
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "updated_time")
+    private Date updatedTime;
+
+    /**
+     * @return id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取装修团队id
+     *
+     * @return shop_id - 装修团队id
+     */
+    public Long getShopId() {
+        return shopId;
+    }
+
+    /**
+     * 设置装修团队id
+     *
+     * @param shopId 装修团队id
+     */
+    public void setShopId(Long shopId) {
+        this.shopId = shopId;
+    }
+
+    /**
+     * 获取分配状态（0-待分配，1-已分配）
+     *
+     * @return decoration_desc_status - 分配状态（0-待分配，1-已分配）
+     */
+    public Integer getDecorationDescStatus() {
+        return decorationDescStatus;
+    }
+
+    /**
+     * 设置分配状态（0-待分配，1-已分配）
+     *
+     * @param decorationDescStatus 分配状态（0-待分配，1-已分配）
+     */
+    public void setDecorationDescStatus(Integer decorationDescStatus) {
+        this.decorationDescStatus = decorationDescStatus;
+    }
+
+    /**
+     * 获取装修团队id
+     *
+     * @return decoration_team_id - 装修团队id
+     */
+    public Long getDecorationTeamId() {
+        return decorationTeamId;
+    }
+
+    /**
+     * 设置装修团队id
+     *
+     * @param decorationTeamId 装修团队id
+     */
+    public void setDecorationTeamId(Long decorationTeamId) {
+        this.decorationTeamId = decorationTeamId;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return created_time - 创建时间
+     */
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createdTime 创建时间
+     */
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    /**
+     * 获取更新时间
+     *
+     * @return updated_time - 更新时间
+     */
+    public Date getUpdatedTime() {
+        return updatedTime;
+    }
+
+    /**
+     * 设置更新时间
+     *
+     * @param updatedTime 更新时间
+     */
+    public void setUpdatedTime(Date updatedTime) {
+        this.updatedTime = updatedTime;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/decoration/TeamAreaMappingDO.java

@@ -0,0 +1,97 @@
+package com.cool.store.entity.decoration;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "zxjp_team_area_mapping")
+public class TeamAreaMappingDO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 团队ID
+     */
+    @Column(name = "team_id")
+    private Long teamId;
+
+    /**
+     * 城市ID
+     */
+    @Column(name = "open_city_id")
+    private Long openCityId;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * @return id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取团队ID
+     *
+     * @return team_id - 团队ID
+     */
+    public Long getTeamId() {
+        return teamId;
+    }
+
+    /**
+     * 设置团队ID
+     *
+     * @param teamId 团队ID
+     */
+    public void setTeamId(Long teamId) {
+        this.teamId = teamId;
+    }
+
+    /**
+     * 获取城市ID
+     *
+     * @return open_city_id - 城市ID
+     */
+    public Long getOpenCityId() {
+        return openCityId;
+    }
+
+    /**
+     * 设置城市ID
+     *
+     * @param openCityId 城市ID
+     */
+    public void setOpenCityId(Long openCityId) {
+        this.openCityId = openCityId;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return create_time - 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/login/UserLoginDO.java

@@ -0,0 +1,33 @@
+package com.cool.store.entity.login;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 用户登录信息
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/3
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserLoginDO {
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 密码
+     */
+    private String password;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreMasterSignerInfoDO.java

@@ -0,0 +1,63 @@
+package com.cool.store.entity.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * @author   wangff
+ * @date   2025-09-23 11:32
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StoreMasterSignerInfoDO implements Serializable {
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("门店ID")
+    private String storeId;
+
+    @ApiModelProperty("签约人1姓名")
+    private String signer1Name;
+
+    @ApiModelProperty("签约人1手机号")
+    private String signer1Mobile;
+
+    @ApiModelProperty("签约人1身份证号()")
+    private String signer1IdCardNo;
+
+    @ApiModelProperty("签约人1身份证正面图片路径")
+    private String signer1IdCardFront;
+
+    @ApiModelProperty("签约人1身份证反面图片路径")
+    private String signer1IdCardBack;
+
+    @ApiModelProperty("签约人2姓名")
+    private String signer2Name;
+
+    @ApiModelProperty("签约人2手机号")
+    private String signer2Mobile;
+
+    @ApiModelProperty("签约人2身份证号()")
+    private String signer2IdCardNo;
+
+    @ApiModelProperty("签约人2身份证正面图片路径")
+    private String signer2IdCardFront;
+
+    @ApiModelProperty("签约人2身份证反面图片路径")
+    private String signer2IdCardBack;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/OpenBankInfoDO.java

@@ -0,0 +1,148 @@
+package com.cool.store.entity.wallet;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Table(name = "zxjp_open_bank_info")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class OpenBankInfoDO {
+    /**
+     * 门店编号
+     */
+    @Column(name = "store_code")
+    private String storeCode;
+
+    /**
+     * 门店id
+     */
+    @Column(name = "store_id")
+    private String storeId;
+
+    /**
+     * 签约人名称
+     */
+    @Column(name = "signer_name")
+    private String signerName;
+
+    /**
+     * 签约人身份证号码
+     */
+    @Column(name = "signer_id_card")
+    private String signerIdCard;
+
+    /**
+     * 签约人手机号
+     */
+    @Column(name = "signer_phone")
+    private String signerPhone;
+
+    /**
+     * 签约人身份证正面
+     */
+    @Column(name = "signer_id_card_front")
+    private String signerIdCardFront;
+
+    /**
+     * 签约人身份证反面
+     */
+    @Column(name = "signer_id_card_back")
+    private String signerIdCardBack;
+
+    /**
+     * 营业执照名字
+     */
+    @Column(name = "business_license_name")
+    private String businessLicenseName;
+
+    /**
+     * 营业执照社会信用代码
+     */
+    @Column(name = "business_license_code")
+    private String businessLicenseCode;
+
+    /**
+     * 营业执照照片
+     */
+    @Column(name = "business_license_photo")
+    private String businessLicensePhoto;
+
+    /**
+     * 法人名称
+     */
+    @Column(name = "legal_name")
+    private String legalName;
+
+    /**
+     * 法人身份证号码
+     */
+    @Column(name = "legal_id_card")
+    private String legalIdCard;
+
+    /**
+     * 法人身份证有效期字段
+     */
+    @Column(name = "legal_id_card_expire_time")
+    private String legalIdCardExpireTime;
+
+    /**
+     * 法人手机号
+     */
+    @Column(name = "legal_phone")
+    private String legalPhone;
+
+    /**
+     * 法人是否签约人
+     */
+    @Column(name = "legal_is_signer")
+    private Integer legalIsSigner;
+
+    /**
+     * 法人身份证正面
+     */
+    @Column(name = "legal_id_card_front")
+    private String legalIdCardFront;
+
+    /**
+     * 法人身份证反面
+     */
+    @Column(name = "legal_id_card_back")
+    private String legalIdCardBack;
+
+    /**
+     * 结算卡
+     */
+    @Column(name = "settlement_card")
+    private String settlementCard;
+
+    /**
+     * 开户支行名称
+     */
+    @Column(name = "bank_branch_name")
+    private String bankBranchName;
+
+    /**
+     * 开户支行编号
+     */
+    @Column(name = "bank_branch_code")
+    private String bankBranchCode;
+
+    /**
+     * 银行预留手机号
+     */
+    @Column(name = "bank_reserved_phone")
+    private String bankReservedPhone;
+
+    /**
+     * 来源，开通流程传1，其他0
+     */
+    @Column(name = "source")
+    private Integer source;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/TempOpenWalletInfoDO.java

@@ -0,0 +1,599 @@
+package com.cool.store.entity.wallet;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "zxjp_temp_open_wallet_info")
+public class TempOpenWalletInfoDO {
+    /**
+     * 门店编号
+     */
+    @Column(name = "store_code")
+    private String storeCode;
+
+    /**
+     * 门店名称
+     */
+    @Column(name = "store_name")
+    private String storeName;
+
+    /**
+     * 门店模式
+     */
+    @Column(name = "store_mode")
+    private String storeMode;
+
+    /**
+     * 台账名称
+     */
+    @Column(name = "ledger_name")
+    private String ledgerName;
+
+    /**
+     * 台账状态
+     */
+    @Column(name = "ledger_status")
+    private String ledgerStatus;
+
+    /**
+     * 工商类型
+     */
+    @Column(name = "business_type")
+    private String businessType;
+
+    /**
+     * 工商注册名称
+     */
+    @Column(name = "business_reg_name")
+    private String businessRegName;
+
+    /**
+     * 营业执照编号
+     */
+    @Column(name = "business_license_no")
+    private String businessLicenseNo;
+
+    /**
+     * 工商地址
+     */
+    @Column(name = "business_address")
+    private String businessAddress;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区
+     */
+    private String district;
+
+    /**
+     * 法人名称
+     */
+    @Column(name = "legal_person_name")
+    private String legalPersonName;
+
+    /**
+     * 法人证件号
+     */
+    @Column(name = "legal_person_id_no")
+    private String legalPersonIdNo;
+
+    /**
+     * 身份证开始时间
+     */
+    @Column(name = "legal_id_start_date")
+    private Date legalIdStartDate;
+
+    /**
+     * 身份证过期时间
+     */
+    @Column(name = "legal_id_expire_date")
+    private Date legalIdExpireDate;
+
+    /**
+     * 结算人
+     */
+    @Column(name = "settler_name")
+    private String settlerName;
+
+    /**
+     * 结算人证件号
+     */
+    @Column(name = "settler_id_no")
+    private String settlerIdNo;
+
+    /**
+     * 结算人身份证开始时间
+     */
+    @Column(name = "settler_id_start_date")
+    private Date settlerIdStartDate;
+
+    /**
+     * 结算人身份证过期时间
+     */
+    @Column(name = "settler_id_expire_date")
+    private Date settlerIdExpireDate;
+
+    /**
+     * 开户支行名称
+     */
+    @Column(name = "bank_branch_name")
+    private String bankBranchName;
+
+    /**
+     * 开户支行编号
+     */
+    @Column(name = "bank_branch_no")
+    private String bankBranchNo;
+
+    /**
+     * 结算卡
+     */
+    @Column(name = "settlement_card_no")
+    private String settlementCardNo;
+
+    /**
+     * 银行预留手机号
+     */
+    @Column(name = "bank_reserved_phone")
+    private String bankReservedPhone;
+
+    /**
+     * 分账关系
+     */
+    @Column(name = "accounting_relation")
+    private String accountingRelation;
+
+    /**
+     * 获取门店编号
+     *
+     * @return store_id - 门店编号
+     */
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    /**
+     * 获取门店名称
+     *
+     * @return store_name - 门店名称
+     */
+    public String getStoreName() {
+        return storeName;
+    }
+
+    /**
+     * 设置门店名称
+     *
+     * @param storeName 门店名称
+     */
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    /**
+     * 获取门店模式
+     *
+     * @return store_mode - 门店模式
+     */
+    public String getStoreMode() {
+        return storeMode;
+    }
+
+    /**
+     * 设置门店模式
+     *
+     * @param storeMode 门店模式
+     */
+    public void setStoreMode(String storeMode) {
+        this.storeMode = storeMode;
+    }
+
+    /**
+     * 获取台账名称
+     *
+     * @return ledger_name - 台账名称
+     */
+    public String getLedgerName() {
+        return ledgerName;
+    }
+
+    /**
+     * 设置台账名称
+     *
+     * @param ledgerName 台账名称
+     */
+    public void setLedgerName(String ledgerName) {
+        this.ledgerName = ledgerName;
+    }
+
+    /**
+     * 获取台账状态
+     *
+     * @return ledger_status - 台账状态
+     */
+    public String getLedgerStatus() {
+        return ledgerStatus;
+    }
+
+    /**
+     * 设置台账状态
+     *
+     * @param ledgerStatus 台账状态
+     */
+    public void setLedgerStatus(String ledgerStatus) {
+        this.ledgerStatus = ledgerStatus;
+    }
+
+    /**
+     * 获取工商类型
+     *
+     * @return business_type - 工商类型
+     */
+    public String getBusinessType() {
+        return businessType;
+    }
+
+    /**
+     * 设置工商类型
+     *
+     * @param businessType 工商类型
+     */
+    public void setBusinessType(String businessType) {
+        this.businessType = businessType;
+    }
+
+    /**
+     * 获取工商注册名称
+     *
+     * @return business_reg_name - 工商注册名称
+     */
+    public String getBusinessRegName() {
+        return businessRegName;
+    }
+
+    /**
+     * 设置工商注册名称
+     *
+     * @param businessRegName 工商注册名称
+     */
+    public void setBusinessRegName(String businessRegName) {
+        this.businessRegName = businessRegName;
+    }
+
+    /**
+     * 获取营业执照编号
+     *
+     * @return business_license_no - 营业执照编号
+     */
+    public String getBusinessLicenseNo() {
+        return businessLicenseNo;
+    }
+
+    /**
+     * 设置营业执照编号
+     *
+     * @param businessLicenseNo 营业执照编号
+     */
+    public void setBusinessLicenseNo(String businessLicenseNo) {
+        this.businessLicenseNo = businessLicenseNo;
+    }
+
+    /**
+     * 获取工商地址
+     *
+     * @return business_address - 工商地址
+     */
+    public String getBusinessAddress() {
+        return businessAddress;
+    }
+
+    /**
+     * 设置工商地址
+     *
+     * @param businessAddress 工商地址
+     */
+    public void setBusinessAddress(String businessAddress) {
+        this.businessAddress = businessAddress;
+    }
+
+    /**
+     * 获取省
+     *
+     * @return province - 省
+     */
+    public String getProvince() {
+        return province;
+    }
+
+    /**
+     * 设置省
+     *
+     * @param province 省
+     */
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    /**
+     * 获取市
+     *
+     * @return city - 市
+     */
+    public String getCity() {
+        return city;
+    }
+
+    /**
+     * 设置市
+     *
+     * @param city 市
+     */
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    /**
+     * 获取区
+     *
+     * @return district - 区
+     */
+    public String getDistrict() {
+        return district;
+    }
+
+    /**
+     * 设置区
+     *
+     * @param district 区
+     */
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    /**
+     * 获取法人名称
+     *
+     * @return legal_person_name - 法人名称
+     */
+    public String getLegalPersonName() {
+        return legalPersonName;
+    }
+
+    /**
+     * 设置法人名称
+     *
+     * @param legalPersonName 法人名称
+     */
+    public void setLegalPersonName(String legalPersonName) {
+        this.legalPersonName = legalPersonName;
+    }
+
+    /**
+     * 获取法人证件号
+     *
+     * @return legal_person_id_no - 法人证件号
+     */
+    public String getLegalPersonIdNo() {
+        return legalPersonIdNo;
+    }
+
+    /**
+     * 设置法人证件号
+     *
+     * @param legalPersonIdNo 法人证件号
+     */
+    public void setLegalPersonIdNo(String legalPersonIdNo) {
+        this.legalPersonIdNo = legalPersonIdNo;
+    }
+
+    /**
+     * 获取身份证开始时间
+     *
+     * @return legal_id_start_date - 身份证开始时间
+     */
+    public Date getLegalIdStartDate() {
+        return legalIdStartDate;
+    }
+
+    /**
+     * 设置身份证开始时间
+     *
+     * @param legalIdStartDate 身份证开始时间
+     */
+    public void setLegalIdStartDate(Date legalIdStartDate) {
+        this.legalIdStartDate = legalIdStartDate;
+    }
+
+    /**
+     * 获取身份证过期时间
+     *
+     * @return legal_id_expire_date - 身份证过期时间
+     */
+    public Date getLegalIdExpireDate() {
+        return legalIdExpireDate;
+    }
+
+    /**
+     * 设置身份证过期时间
+     *
+     * @param legalIdExpireDate 身份证过期时间
+     */
+    public void setLegalIdExpireDate(Date legalIdExpireDate) {
+        this.legalIdExpireDate = legalIdExpireDate;
+    }
+
+    /**
+     * 获取结算人
+     *
+     * @return settler_name - 结算人
+     */
+    public String getSettlerName() {
+        return settlerName;
+    }
+
+    /**
+     * 设置结算人
+     *
+     * @param settlerName 结算人
+     */
+    public void setSettlerName(String settlerName) {
+        this.settlerName = settlerName;
+    }
+
+    /**
+     * 获取结算人证件号
+     *
+     * @return settler_id_no - 结算人证件号
+     */
+    public String getSettlerIdNo() {
+        return settlerIdNo;
+    }
+
+    /**
+     * 设置结算人证件号
+     *
+     * @param settlerIdNo 结算人证件号
+     */
+    public void setSettlerIdNo(String settlerIdNo) {
+        this.settlerIdNo = settlerIdNo;
+    }
+
+    /**
+     * 获取结算人身份证开始时间
+     *
+     * @return settler_id_start_date - 结算人身份证开始时间
+     */
+    public Date getSettlerIdStartDate() {
+        return settlerIdStartDate;
+    }
+
+    /**
+     * 设置结算人身份证开始时间
+     *
+     * @param settlerIdStartDate 结算人身份证开始时间
+     */
+    public void setSettlerIdStartDate(Date settlerIdStartDate) {
+        this.settlerIdStartDate = settlerIdStartDate;
+    }
+
+    /**
+     * 获取结算人身份证过期时间
+     *
+     * @return settler_id_expire_date - 结算人身份证过期时间
+     */
+    public Date getSettlerIdExpireDate() {
+        return settlerIdExpireDate;
+    }
+
+    /**
+     * 设置结算人身份证过期时间
+     *
+     * @param settlerIdExpireDate 结算人身份证过期时间
+     */
+    public void setSettlerIdExpireDate(Date settlerIdExpireDate) {
+        this.settlerIdExpireDate = settlerIdExpireDate;
+    }
+
+    /**
+     * 获取开户支行名称
+     *
+     * @return bank_branch_name - 开户支行名称
+     */
+    public String getBankBranchName() {
+        return bankBranchName;
+    }
+
+    /**
+     * 设置开户支行名称
+     *
+     * @param bankBranchName 开户支行名称
+     */
+    public void setBankBranchName(String bankBranchName) {
+        this.bankBranchName = bankBranchName;
+    }
+
+    /**
+     * 获取开户支行编号
+     *
+     * @return bank_branch_no - 开户支行编号
+     */
+    public String getBankBranchNo() {
+        return bankBranchNo;
+    }
+
+    /**
+     * 设置开户支行编号
+     *
+     * @param bankBranchNo 开户支行编号
+     */
+    public void setBankBranchNo(String bankBranchNo) {
+        this.bankBranchNo = bankBranchNo;
+    }
+
+    /**
+     * 获取结算卡
+     *
+     * @return settlement_card_no - 结算卡
+     */
+    public String getSettlementCardNo() {
+        return settlementCardNo;
+    }
+
+    /**
+     * 设置结算卡
+     *
+     * @param settlementCardNo 结算卡
+     */
+    public void setSettlementCardNo(String settlementCardNo) {
+        this.settlementCardNo = settlementCardNo;
+    }
+
+    /**
+     * 获取银行预留手机号
+     *
+     * @return bank_reserved_phone - 银行预留手机号
+     */
+    public String getBankReservedPhone() {
+        return bankReservedPhone;
+    }
+
+    /**
+     * 设置银行预留手机号
+     *
+     * @param bankReservedPhone 银行预留手机号
+     */
+    public void setBankReservedPhone(String bankReservedPhone) {
+        this.bankReservedPhone = bankReservedPhone;
+    }
+
+    /**
+     * 获取分账关系
+     *
+     * @return accounting_relation - 分账关系
+     */
+    public String getAccountingRelation() {
+        return accountingRelation;
+    }
+
+    /**
+     * 设置分账关系
+     *
+     * @param accountingRelation 分账关系
+     */
+    public void setAccountingRelation(String accountingRelation) {
+        this.accountingRelation = accountingRelation;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/WalletPaymentOrderDO.java

@@ -0,0 +1,74 @@
+package com.cool.store.entity.wallet;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.*;
+
+/**
+ * 钱包支付订单
+ */
+@Table(name = "zxjp_wallet_payment_order")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class WalletPaymentOrderDO {
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 门店id
+     */
+    @Column(name = "store_id")
+    private String storeId;
+
+    /**
+     * 预支付id
+     */
+    @Column(name = "payment_id")
+    private String paymentId;
+
+    /**
+     * 订单类型，0充值 1提现
+     */
+    @Column(name = "type")
+    private Integer type;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 过期时间
+     */
+    @Column(name = "expire_time")
+    private String expireTime;
+
+    /**
+     * 订单状态:1-成功 2-失败 3-支付中 4-撤销
+     */
+    @Column(name = "order_status")
+    private Integer orderStatus;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java

@@ -44,6 +44,8 @@ public class FranchiseFeeRequest {
     @ApiModelProperty("加盟费优惠原因")
     private String discountReason;
 
+    @ApiModelProperty("收银费(系统费)（三明治使用）")
+    private String cashierFee;
 
     public FranchiseFeeDO toFranchiseFeeDO() {
         FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO();
@@ -63,6 +65,7 @@ public class FranchiseFeeRequest {
         franchiseFeeDO.setThirdYearFee(this.thirdYearFee);
         franchiseFeeDO.setPerformanceBond(this.performanceBond);
         franchiseFeeDO.setDiscountReason(this.discountReason);
+        franchiseFeeDO.setCashierFee(this.cashierFee);
         return franchiseFeeDO;
     }
 }

coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java

@@ -1,5 +1,6 @@
 package com.cool.store.request;
 
+import com.cool.store.constants.CommonConstants;
 import com.cool.store.entity.OrderSysInfoDO;
 import com.cool.store.enums.JoinModeEnum;
 import com.cool.store.enums.OrderSysTypeEnum;
@@ -94,6 +95,9 @@ public class OrderSysInfoRequest {
 
     @ApiModelProperty(value = "总部订货收款修改人" )
     private String receivingUpdateUser;
+
+    @ApiModelProperty("订货方式，0先款后货、1先货后款")
+    private Integer orderType;
     
     public OrderSysInfoDO toOrderSysInfoDO() {
         OrderSysInfoDO orderSysInfoDO = new OrderSysInfoDO();
@@ -131,7 +135,10 @@ public class OrderSysInfoRequest {
             if (Objects.equals(joinMode, JoinModeEnum.FLAGSHIP_STORE.getCode())&&this.shopCode!=null){
                 return true;
             }
-            if (StringUtils.isAnyBlank(this.receivingFirmName,this.receivingMsBankAccount,this.receivingMsBankBranch,this.bankUnionPayAccount,this.shopCode)){
+            if (StringUtils.isBlank(this.shopCode)) {
+                return false;
+            }
+            if (!CommonConstants.INDEX_ONE.equals(this.orderType) && StringUtils.isAnyBlank(this.receivingFirmName,this.receivingMsBankAccount,this.receivingMsBankBranch,this.bankUnionPayAccount)){
                 return false;
             }
         }

coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java

@@ -16,6 +16,8 @@ import java.util.Date;
 public class StoreMasterDTO {
 
     private String enterpriseId;
+    @ApiModelProperty("门店id")
+    private String storeId;
 
     @ApiModelProperty("门店名称(加盟签约)")
     private String storeName;
@@ -49,6 +51,12 @@ public class StoreMasterDTO {
 
     @ApiModelProperty("省市区")
     private String area;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区/县")
+    private String district;
     @ApiModelProperty("乡镇")
     private String town;
     @ApiModelProperty("门店地址")

coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java

@@ -219,6 +219,8 @@ public class ZxjpApiRequest {
 
     private Long shopId;
 
+    @ApiModelProperty("合同编号")
+    private String contractCode;
 
 
 

coolstore-partner-model/src/main/java/com/cool/store/request/bigdata/LatestOrderDateRequest.java

@@ -0,0 +1,33 @@
+package com.cool.store.request.bigdata;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 最新订货日期Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LatestOrderDateRequest {
+    /**
+     * 页码
+     */
+    private Integer pageNum;
+
+    /**
+     * 页数量
+     */
+    private Integer pageSize;
+
+    /**
+     * 门店编码列表
+     */
+    private String store_code;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/decoration/AddTeamRequest.java

@@ -0,0 +1,21 @@
+package com.cool.store.request.decoration;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/29 16:13
+ * @Version 1.0
+ */
+@Data
+public class AddTeamRequest {
+    @ApiModelProperty("团队名称")
+    private String teamName;
+    @ApiModelProperty("负责区域列表 直传市ID，选择省时，将市Id全部传入")
+    private List<Long> openCityIdList;
+    @ApiModelProperty("团队名称")
+    private Integer userSystem;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/decoration/DecorationListRequest.java

@@ -0,0 +1,38 @@
+package com.cool.store.request.decoration;
+
+import com.cool.store.common.PageBasicInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/3 13:31
+ * @Version 1.0
+ */
+@Data
+public class DecorationListRequest extends PageBasicInfo {
+
+    @ApiModelProperty("关键字 门店名称/门店编码")
+    private String keyword;
+
+    @ApiModelProperty("门店类型")
+    private Integer storeType;
+
+    @ApiModelProperty("门店签约类型")
+    private Integer signType;
+
+    @ApiModelProperty("门店区域ID")
+    private Integer regionId;
+
+    @ApiModelProperty("门店意向开店区域")
+    private Long wantShopAreaId;
+
+    @ApiModelProperty(value = "门店意向开店区域IDs",hidden = true)
+    private List<Long> wantShopAreaIds;
+
+    @ApiModelProperty("门店装修分配状态")
+    private Integer decorationDescStatus;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/decoration/DeletedRequest.java

@@ -0,0 +1,15 @@
+package com.cool.store.request.decoration;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/3 16:40
+ * @Version 1.0
+ */
+@Data
+public class DeletedRequest {
+
+    private Long teamId;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/decoration/UpdateConstructionTeamRequest.java

@@ -0,0 +1,17 @@
+package com.cool.store.request.decoration;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/3 16:00
+ * @Version 1.0
+ */
+@Data
+public class UpdateConstructionTeamRequest {
+
+    private Long id;
+
+    private Long teamId;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/decoration/UpdateTeamRequest.java

@@ -0,0 +1,28 @@
+package com.cool.store.request.decoration;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/29 16:16
+ * @Version 1.0
+ */
+@Data
+public class UpdateTeamRequest {
+
+    @ApiModelProperty("ID")
+    private Long id;
+    @ApiModelProperty("团队名称")
+    private String teamCode;
+    @ApiModelProperty("团队名称")
+    private String teamName;
+    @ApiModelProperty("负责区域列表 直传市ID，选择省时，将市Id全部传入")
+    private List<Long> openCityIdList;
+    @ApiModelProperty("团队名称")
+    private Integer userSystem;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/notice/BatchPublishRequest.java

@@ -22,4 +22,6 @@ public class BatchPublishRequest {
     @ApiModelProperty( "默认处理人信息 type[person position userGroup organization]")
     List<CommonDTO> userInfoList;
 
+    @ApiModelProperty("事项类型")
+    private Integer matterType;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigAddRequest.java

@@ -28,13 +28,13 @@ public class MatterConfigAddRequest {
     private String systemSource;
 
     @ApiModelProperty( "1:H5 2:小程序")
-    private Boolean jumpType;
+    private Integer jumpType;
 
     @ApiModelProperty( "跳转链接")
     private String jumpUrl;
 
     @ApiModelProperty( "状态(0:禁用 1:启用)")
-    private Boolean status;
+    private Integer status;
 
     @ApiModelProperty( "备注")
     private String remark;

coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdHandleMessageRequest.java

@@ -0,0 +1,26 @@
+package com.cool.store.request.notice;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/8/29 11:10
+ * @Version 1.0
+ */
+@Data
+public class ThirdHandleMessageRequest {
+
+    @ApiModelProperty("发起任务时 传的handleKeyword")
+    @NotBlank(message = "handleKeyword不能为空")
+    private String handleKeyword;
+
+    @ApiModelProperty("门店编码列表")
+    @NotNull(message = "门店编码列表不能为空")
+    private List<String> shopCodeList;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdMatterRequest.java

@@ -0,0 +1,66 @@
+package com.cool.store.request.notice;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/8/26 16:10
+ * @Version 1.0
+ */
+@Data
+public class ThirdMatterRequest {
+
+    @ApiModelProperty("0-提交订单 5-已分配拣货 10-拣货完成 15-已出库 20-配送中 25-订单签收 30-服务包发布 35-补货 40-盘点通知 ")
+    @NotNull(message = "场景不能为空")
+    private Integer sceneCode;
+
+    @ApiModelProperty("事项配置ID CRM配置好部分信息 找CRM提供")
+    @NotNull(message = "事项配置ID不能为空")
+    private Long matterConfigId;
+
+    @ApiModelProperty("事项标题")
+    @NotBlank(message = "事项标题不能为空")
+    private String matterTitle;
+
+    @ApiModelProperty("处理类型(1:仅阅读 2:需要处理)")
+    @NotNull(message = "处理类型不能为空")
+    private Integer processType;
+
+    @ApiModelProperty("提醒类型(1:持续提醒 2:阶段提醒)")
+    @NotNull(message = "提醒类型不能为空")
+    private Integer remindType;
+
+    @ApiModelProperty("阶段提醒时 需要设置时间范围 开始时间")
+    private Date remindStartTime;
+
+    @ApiModelProperty("阶段提醒时 需要设置时间范围 结束时间")
+    private Date remindEndTime;
+
+    @ApiModelProperty("截止时间")
+    private Date deadline;
+
+    @ApiModelProperty("今日必办标识 0非必办 1必办")
+    @NotNull(message = "今日必办标识不能为空")
+    private Integer todayTask;
+
+    @ApiModelProperty("消息图片URL 物流crm自动匹配 无需传递")
+    private String messageImage;
+
+    @ApiModelProperty("门店范围 如果不传 默认取matterConfigId对应的门店范围 如果都没有 任务处于待发布状态")
+    List<String> shopCodeList;
+
+    @ApiModelProperty("手机号列表 如果不传 默认取matterConfigId配置的人员信息 如果都没有 任务处于待发布状态")
+    List<String> mobileList;
+
+    private String jumpUrl;
+
+    @ApiModelProperty("处理关键字 针对processType需要处理的字段 需要传递该关键字识别 注意 每个批次门店任务keyword不能重复")
+    private String handleKeyword;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/recipe/RevenueDataRequest.java

@@ -0,0 +1,29 @@
+package com.cool.store.request.recipe;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <p>
+ * 营收数据Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/30
+ */
+@Data
+public class RevenueDataRequest {
+    @ApiModelProperty("门店id")
+    @NotBlank(message = "门店id不能为空")
+    private String storeId;
+
+    @ApiModelProperty("业务时间开始，yyyy-MM-dd")
+    @NotBlank(message = "业务时间开始不能为空")
+    private String businessDateFrom;
+
+    @ApiModelProperty("业务时间结束，yyyy-MM-dd")
+    @NotBlank(message = "业务时间结束不能为空")
+    private String businessDateTo;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountAddTagRequest.java

@@ -0,0 +1,76 @@
+package com.cool.store.request.wallet;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/13 14:09
+ * @Version 1.0
+ */
+@Data
+@ApiModel(description = "营业执照信息请求参数")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class AccountAddTagRequest {
+
+    @ApiModelProperty(value = "外部门店唯一标识", required = true)
+    @NotBlank(message = "外部门店唯一标识不能为空")
+    private String outStoreId;
+
+    @ApiModelProperty(value = "营业执照号码", required = true)
+    @NotBlank(message = "营业执照号码不能为空")
+    private String licenseNo;
+
+    @ApiModelProperty(value = "工商注册名称", required = true)
+    @NotBlank(message = "工商注册名称不能为空")
+    private String licenseName;
+
+    @ApiModelProperty(value = "营业执照到期日（格式YYYY-MM-DD），如果证件到期日期为“长期”，则传：“2999-12-31”）")
+    private String licenseExpire;
+
+    @ApiModelProperty(value = "法人姓名", required = true)
+    @NotBlank(message = "法人姓名不能为空")
+    private String legalName;
+
+    @ApiModelProperty(value = "法人证件号码", required = true)
+    @NotBlank(message = "法人证件号码不能为空")
+    private String legalNo;
+
+    @ApiModelProperty(value = "证件发证日期 yyyy-MM-dd")
+    private String idCardStartDate;
+
+    @ApiModelProperty(value = "证件到期日期 yyyy-MM-dd，如果证件到期日期为“长期”，则传：“2999-12-31”")
+    private String idCardEndDate;
+
+    @ApiModelProperty(value = "法人联系电话", required = true)
+    @NotBlank(message = "法人联系电话不能为空")
+    private String legalPhone;
+
+    @ApiModelProperty(value = "开户许可证图片链接,企业必选", required = true)
+    private String industryLicensePhoto;
+
+    @ApiModelProperty(value = "法人代表证件人像面图片链接", required = true)
+    private String certPhotoA;
+
+    @ApiModelProperty(value = "法人代表证件国徽面 / 签证面图片链接", required = true)
+    private String certPhotoB;
+
+    @ApiModelProperty(value = "营业执照图片链接", required = true)
+    private String licensePhoto;
+
+    @ApiModelProperty(value = "签约人证件人像面图片链接", required = true)
+    private String signatoryPhotoA;
+
+    @ApiModelProperty(value = "签约人证件国徽面图片链接", required = true)
+    private String signatoryPhotoB;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountBatchQueryRequest.java

@@ -0,0 +1,31 @@
+package com.cool.store.request.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/18 10:02
+ * @Version 1.0
+ */
+@Data
+public class AccountBatchQueryRequest {
+
+    @ApiModelProperty(value = "关键字(账户名称、账户别名)")
+    private String keyword;
+
+    @ApiModelProperty(value = "账户状态 1 待提交 2 待鉴权 3 鉴权中 4开通 账户状态")
+    private Integer accountStatus;
+
+    @ApiModelProperty(value = "工商类型 1.企业 2.个体工商户 3.小微商户(自然人)")
+    private Integer businessType;
+
+    @ApiModelProperty(value = "门店id")
+    private String outStoreId;
+
+    @ApiModelProperty(value = "分页信息",required = true)
+    private WalletBasicPageInfo page;
+
+    @ApiModelProperty(value = "钱包类型 1.平安 2.网商", required = true)
+    private Integer walletType;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountBillQueryRequest.java

@@ -0,0 +1,44 @@
+package com.cool.store.request.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * <p>
+ * 交易流水查询Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/17
+ */
+@Data
+public class AccountBillQueryRequest extends StoreShopRequest {
+
+    @ApiModelProperty("交易开始时间，不传查当月")
+    private Date beginDate;
+
+    @ApiModelProperty("交易结束时间")
+    private Date endDate;
+
+    @ApiModelProperty(value = "钱包类型 1.平安 2.网商", required = true)
+    @NotNull(message = "钱包类型不能为空")
+    private Integer walletType;
+
+    @ApiModelProperty("是否签约人账户 0 否 1 是")
+    private Integer isLegal;
+
+    @ApiModelProperty("交易类型:  0.全部,1.支出 2.收入")
+    private Integer recordType;
+
+    @ApiModelProperty("费用类型ID")
+    private Long feeItemId;
+
+    //页码
+    private Integer pageNum;
+
+    //分页大小
+    private Integer pageSize;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountCreateRequest.java

@@ -0,0 +1,50 @@
+package com.cool.store.request.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 平安钱包账户创建Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/13
+ */
+@Data
+public class AccountCreateRequest {
+    @ApiModelProperty("门店id")
+    @NotNull(message = "门店id不能为空")
+    private Long shopId;
+
+    @ApiModelProperty("签约人姓名")
+    @NotBlank(message = "签约人姓名不能为空")
+    private String userName;
+
+    @ApiModelProperty("签约人手机号")
+    @NotBlank(message = "签约人手机号不能为空")
+    private String mobile;
+
+    @ApiModelProperty("签约人身份证号")
+    @NotBlank(message = "签约人身份证号不能为空")
+    private String idCardNo;
+
+    @ApiModelProperty("银行卡号")
+    @NotBlank(message = "银行卡号不能为空")
+    private String bankNumber;
+
+    @ApiModelProperty("银行开户支行")
+    @NotBlank(message = "银行开户行不能为空")
+    private String bankName;
+
+    @ApiModelProperty("银行开户支行编号")
+    @NotBlank(message = "银行开户行编号不能为空")
+    private String bankNo;
+    
+    @ApiModelProperty("银行卡预留手机号")
+    @NotBlank(message = "银行卡预留手机号不能为空")
+    private String bankMobile;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountOpenRequest.java

@@ -0,0 +1,21 @@
+package com.cool.store.request.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 平安钱包账户开通Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/13
+ */
+@Data
+public class AccountOpenRequest {
+    @ApiModelProperty("shopId")
+    private Long shopId;
+    
+    @ApiModelProperty("短信验证码")
+    private String code;
+}