Merge #30 into master from cc_20260106_process_change

fix:加盟合同签约及建店资料修改

* cc_20260106_process_change: (6 commits squashed)

  - fix:加盟合同签约新增财务审批

  - fix:建店资料阶段逻辑修改

  - fix:加盟合同签约待办，财务查看待财务审批的待办

  - feat:城市规划

  - feat:行政区划接口;
    fix:城市规划修改

  - fix:加盟合同签约审批日志逻辑修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/30

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

@@ -0,0 +1,55 @@
+package com.cool.store.entity.ad;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Data
+@Table(name = "ad_district_${enterpriseId}")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class AdDistrictDO {
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 父级id
+     */
+    private Long pid;
+
+    /**
+     * 级别
+     */
+    private Boolean level;
+
+    /**
+     * 区划代码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+}

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

@@ -0,0 +1,68 @@
+package com.cool.store.entity.plan;
+
+import lombok.Data;
+
+import java.util.Date;
+import javax.persistence.*;
+
+/**
+ * 城市规划
+ */
+@Data
+@Table(name = "zxjp_city_planning")
+public class CityPlanningDO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 规划编码
+     */
+    @Column(name = "plan_no")
+    private String planNo;
+
+    /**
+     * 规划年份
+     */
+    private Integer year;
+
+    /**
+     * 季度
+     */
+    private Integer quarter;
+
+    /**
+     * 省区划代码
+     */
+    @Column(name = "province_code")
+    private String provinceCode;
+
+    /**
+     * 市区划代码
+     */
+    @Column(name = "city_code")
+    private String cityCode;
+
+    /**
+     * 季度目标
+     */
+    private Integer target;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "create_user_id")
+    private String createUserId;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+}

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

@@ -0,0 +1,28 @@
+package com.cool.store.request.plan;
+
+import com.cool.store.common.PageBasicInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 城市规划查询请求
+ */
+@Data
+public class CityPlanningQueryRequest extends PageBasicInfo {
+    
+    @ApiModelProperty("规划id")
+    private String planNo;
+
+    @ApiModelProperty("规划年份")
+    private Integer year;
+
+    @ApiModelProperty("规划季度")
+    private Integer quarter;
+
+    @ApiModelProperty("省区划代码")
+    private String provinceCode;
+
+    @ApiModelProperty("市区划代码")
+    private String cityCode;
+}
+

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

@@ -0,0 +1,40 @@
+package com.cool.store.request.plan;
+
+import com.cool.store.common.InsertGroup;
+import com.cool.store.common.UpdateGroup;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 城市规划编辑请求
+ */
+@Data
+public class CityPlanningUpdateRequest {
+    @ApiModelProperty(value = "规划id")
+    @NotNull(message = "规划id不能为空", groups = {UpdateGroup.class})
+    private Long id;
+    
+    @ApiModelProperty(value = "省区划代码")
+    @NotBlank(message = "省区划代码不能为空", groups = {InsertGroup.class, UpdateGroup.class})
+    private String provinceCode;
+
+    @ApiModelProperty(value = "市区划代码")
+    @NotBlank(message = "市区划代码不能为空", groups = {InsertGroup.class, UpdateGroup.class})
+    private String cityCode;
+
+    @ApiModelProperty(value = "年份")
+    @NotNull(message = "年份不能为空", groups = {InsertGroup.class, UpdateGroup.class})
+    private Integer year;
+
+    @ApiModelProperty(value = "季度")
+    @NotNull(message = "季度不能为空", groups = {InsertGroup.class, UpdateGroup.class})
+    private Integer quarter;
+
+    @ApiModelProperty(value = "季度目标")
+    @NotNull(message = "季度目标不能为空", groups = {InsertGroup.class, UpdateGroup.class})
+    private Integer target;
+}
+

coolstore-partner-model/src/main/java/com/cool/store/vo/ad/AdDistrictVO.java

@@ -0,0 +1,27 @@
+package com.cool.store.vo.ad;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 行政区划VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/14
+ */
+@Data
+public class AdDistrictVO {
+    @ApiModelProperty("id")
+    private Long id;
+
+    @ApiModelProperty("行政区划编码")
+    private String code;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("父级id")
+    private Long pid;
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/plan/CityPlanningStatisticsVO.java

@@ -0,0 +1,30 @@
+package com.cool.store.vo.plan;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 规划进度统计VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/1/8
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CityPlanningStatisticsVO {
+    @ApiModelProperty("总计季度目标")
+    private Integer target;
+
+    @ApiModelProperty("总计已完成数量")
+    private Integer completeNum;
+
+    @ApiModelProperty("总计完成率")
+    private BigDecimal completeRate;
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/plan/CityPlanningVO.java

@@ -0,0 +1,50 @@
+package com.cool.store.vo.plan;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 城市规划VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/1/8
+ */
+@Data
+public class CityPlanningVO {
+    @ApiModelProperty("id")
+    private Long id;
+
+    @ApiModelProperty("规划编码")
+    private String planNo;
+
+    @ApiModelProperty("规划年份")
+    private Integer year;
+
+    @ApiModelProperty("季度")
+    private Integer quarter;
+
+    @ApiModelProperty("省区划代码")
+    private String provinceCode;
+
+    @ApiModelProperty("省")
+    private String province;
+
+    @ApiModelProperty("市区划代码")
+    private String cityCode;
+
+    @ApiModelProperty("市")
+    private String city;
+
+    @ApiModelProperty("季度目标")
+    private Integer target;
+
+    @ApiModelProperty("已完成数量")
+    private Integer completeNum;
+
+    @ApiModelProperty("完成率")
+    private BigDecimal completeRate;
+}