Merge branch 'master' into cc_20251010_wxnotice

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java

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/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/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/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/request/StoreMasterDTO.java

@@ -49,6 +49,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/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/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/response/bigdata/ApiPageResponse.java

@@ -0,0 +1,21 @@
+package com.cool.store.response.bigdata;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 分页对象
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/27
+ */
+@Data
+public class ApiPageResponse<T> {
+    private Integer total;
+    private List<T> list;
+    private Integer pageNum;
+    private Integer pageSize;
+}

coolstore-partner-model/src/main/java/com/cool/store/response/bigdata/LatestOrderDateResponse.java

@@ -0,0 +1,24 @@
+package com.cool.store.response.bigdata;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 最新订货日期Response
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/23
+ */
+@Data
+public class LatestOrderDateResponse {
+    /**
+     * 门店编码
+     */
+    private String store_code;
+
+    /**
+     * 最新订货日期，yyyy-MM-dd
+     */
+    private String latest_buy_date;
+}

coolstore-partner-model/src/main/java/com/cool/store/userholder/RefreshUser.java

@@ -0,0 +1,33 @@
+package com.cool.store.userholder;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * RefreshToken用户信息
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/5
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RefreshUser {
+    /**
+     * 用户Id
+     */
+    private String userId;
+
+    /**
+     * RefreshToken
+     */
+    private String refreshToken;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/login/UserBaseInfoVO.java

@@ -0,0 +1,35 @@
+package com.cool.store.vo.login;
+
+import com.cool.store.entity.SysRoleDO;
+import lombok.Data;
+
+/**
+ * <p>
+ * 登录用户基本信息VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/5
+ */
+@Data
+public class UserBaseInfoVO {
+    private String id;
+
+    private String userId;
+
+    private String name;
+
+    private Boolean isAdmin;
+
+    private String mobile;
+
+    private String email;
+
+    private String avatar;
+
+    private String roles;
+
+    private String language;
+
+    private SysRoleDO sysRoleDO;
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/login/UserLoginVO.java

@@ -0,0 +1,38 @@
+package com.cool.store.vo.login;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 用户登录VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserLoginVO {
+    /**
+     * 登录token
+     */
+    private String accessToken;
+
+    /**
+     * 刷新token
+     */
+    private String refreshToken;
+
+    /**
+     * accessToken过期时间
+     */
+    private Integer expire;
+
+    /**
+     * 用户信息
+     */
+    private UserBaseInfoVO user;
+}