Merge remote-tracking branch 'origin/master' into cc_20250903_big_screen

# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java

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

@@ -43,4 +43,17 @@ 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;
 }

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/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/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/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/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/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/response/caipin/StoreUserResponse.java

@@ -0,0 +1,17 @@
+package com.cool.store.response.caipin;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/9/25 15:05
+ * @Version 1.0
+ */
+@Data
+public class StoreUserResponse {
+
+    private String msgDetail;
+
+    private String msgFront;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MessageDetailVO.java

@@ -39,5 +39,7 @@ public class MessageDetailVO {
     private Integer processStatus;
 
     private Integer processType;
+    @ApiModelProperty("第三方id")
+    private String handleKeyword;
 
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MessageTemplateDetailVO.java

@@ -51,6 +51,8 @@ public class MessageTemplateDetailVO {
     private Integer totalNum;
     @ApiModelProperty("系统来源")
     private String systemSource;
+    @ApiModelProperty("第三方id")
+    private String handleKeyword;
 
 
 }