Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

coolstore-partner-common/src/main/java/com/cool/store/enums/BusinessModelEnum.java

@@ -0,0 +1,37 @@
+package com.cool.store.enums;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/07/18:23
+ * @Version 1.0
+ * @注释:
+ */
+public enum BusinessModelEnum {
+    NULL(0, "无"),
+    DIRECT_SALES(1, "直营"),
+    JOIN_SALES(2, "加盟");
+
+    private Integer code;
+    private String desc;
+
+    BusinessModelEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

coolstore-partner-common/src/main/java/com/cool/store/enums/DownSystemTypeEnum.java

@@ -0,0 +1,24 @@
+package com.cool.store.enums;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/07/17:03
+ * @Version 1.0
+ * @注释:
+ */
+public enum DownSystemTypeEnum {
+    XGJ(1,"新管家"),
+    POS(2,"POS");
+    private Integer code;
+    private String desc;
+    DownSystemTypeEnum(Integer code,String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+    public Integer getCode() {
+        return code;
+    }
+    public String getDesc() {
+        return desc;
+    }
+}

coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

@@ -236,6 +236,7 @@ public enum ErrorCodeEnum {
     UPDATE_INVESTMENT_MANAGER_FAIL(131005,"当前用户已经为该门店招商经理",null),
     CONFIRM_THE_APPROVER(131006,"您提交的铺位暂时找不到选址审批人，请联系系统管理员配置选址审批权限后再提交铺位审批",null),
     CREATE_PASSWORD_FAIL(131007,"身份证号信息错误",null),
+    GET_HOME_TEMPLATE_ERROR(131008,"获取首页模板失败",null),
 
     TALLY_BOOK_NOT_EXIST(180001, "记账本数据不存在", null),
 

coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java

@@ -7,9 +7,10 @@ package com.cool.store.enums;
  * @注释:
  */
 public enum JoinModeEnum {
-    FRANCHISE_DEPARTMENT(1,"社会加盟模式/加盟部加盟店"),
+    FRANCHISE_DEPARTMENT(1,"加盟部加盟店"),
-    FRANCHISE_COMPANIES(2,"强加盟模式/加盟公司加盟店"),
+    FRANCHISE_COMPANIES(2,"加盟公司加盟店"),
-    OWN_STORE(3,"加盟公司自有店");
+    OWN_STORE(3,"加盟公司自有店"),
+    STRONG_FRANCHISE(4,"强加盟");
     private int code;
     private String desc;
     private JoinModeEnum(int code, String desc) {

coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java

@@ -49,7 +49,7 @@ public enum UserRoleEnum {
     FINANCE(1735895867344L,"财务"),
     CHUAN_XIAO_MEI_MANAGER(1731635078802L,"串小妹大区执行总经理"),
     REGIONAL_MANAGER(420000000L,"大区经理"),
-
+    LOGISTICS(430000000L,"物流")
     ;
 
     private Long code;

coolstore-partner-common/src/main/java/com/cool/store/utils/HomeTemplateTypeEnum.java

@@ -0,0 +1,23 @@
+package com.cool.store.utils;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/09:52
+ * @Version 1.0
+ * @注释:
+ */
+public enum HomeTemplateTypeEnum {
+    MINI_OPEN_SOURCE_HOME(1,"Mini开源首页");
+    private Integer code;
+    private String desc;
+    HomeTemplateTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+    public Integer getCode() {
+        return code;
+    }
+    public String getDesc() {
+        return desc;
+    }
+}

coolstore-partner-dao/src/main/java/com/cool/store/dao/HomeTemplateDAO.java

@@ -0,0 +1,31 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.HomeTemplateDO;
+import com.cool.store.mapper.HomeTemplateMapper;
+import io.swagger.models.auth.In;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/09:39
+ * @Version 1.0
+ * @注释:
+ */
+@Repository
+public class HomeTemplateDAO {
+
+    @Resource
+    private HomeTemplateMapper homeTemplateMapper;
+    public HomeTemplateDO getHomeTemplateById(Long id) {
+        return homeTemplateMapper.selectByPrimaryKey(id);
+    }
+    public Long insertSelective(HomeTemplateDO homeTemplateDO) {
+        homeTemplateMapper.insertSelective(homeTemplateDO);
+        return homeTemplateDO.getId();
+    }
+    public Integer updateByPrimaryKeySelective(HomeTemplateDO homeTemplateDO) {
+        return homeTemplateMapper.updateByPrimaryKeySelective(homeTemplateDO);
+    }
+}

coolstore-partner-dao/src/main/java/com/cool/store/dao/HomeTemplateUserMappingDAO.java

@@ -0,0 +1,34 @@
+package com.cool.store.dao;
+
+
+import com.cool.store.entity.HomeTemplateUserMappingDO;
+import com.cool.store.mapper.HomeTemplateUserMappingMapper;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/10:25
+ * @Version 1.0
+ * @注释:
+ */
+@Repository
+public class HomeTemplateUserMappingDAO {
+
+    @Resource
+    private HomeTemplateUserMappingMapper homeTemplateUserMappingMapper;
+
+    public int insertSelective(HomeTemplateUserMappingDO homeTemplateRoleMappingDO) {
+        return homeTemplateUserMappingMapper.insertSelective(homeTemplateRoleMappingDO);
+    }
+    public HomeTemplateUserMappingDO getHomeTemplateRoleMappingByUserId(String userId) {
+        Example example = new Example(HomeTemplateUserMappingDO.class);
+        example.createCriteria().andEqualTo("userId", userId);
+        return homeTemplateUserMappingMapper.selectOneByExample(example);
+    }
+    public int updateByPrimaryKeySelective(HomeTemplateUserMappingDO homeTemplateRoleMappingDO) {
+        return homeTemplateUserMappingMapper.updateByPrimaryKeySelective(homeTemplateRoleMappingDO);
+    }
+}

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java

@@ -79,11 +79,9 @@ public class ShopInfoDAO {
         return shopInfoMapper.getShopList(lineId);
     }
 
-    public List<ShopInfoDO> getShopIdByShopStatus(Integer shopStatus){
+    public List<ShopInfoDO> getShopIdBySuccessOpen(String eid){
-        if (Objects.isNull(shopStatus)){
+
-            return new ArrayList<>();
+        return shopInfoMapper.getShopIdBySuccessOpen(eid);
-        }
-        return shopInfoMapper.getShopIdByShopStatus(shopStatus);
     }
 
     public List<ShopInfoDO> getShopListByRegion(Long lineId,List<Long> regionIdList,String userId){
@@ -245,4 +243,14 @@ public class ShopInfoDAO {
        }
        return shopInfoMapper.getOpenName(eid,shopId);
    }
+   public Integer updateShopCode(String shopCode,Long shopId){
+       return shopInfoMapper.updateShopCode(shopCode,shopId);
+   }
+
+   public List<String> getShopCodeList(Long lineId){
+       if (lineId == null){
+           return new ArrayList<>();
+       }
+       return shopInfoMapper.getShopCodeList(lineId);
+   }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HomeTemplateMapper.java

@@ -0,0 +1,14 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.HomeTemplateDO;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/09:35
+ * @Version 1.0
+ * @注释:
+ */
+public interface HomeTemplateMapper extends Mapper<HomeTemplateDO> {
+
+}

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HomeTemplateUserMappingMapper.java

@@ -0,0 +1,13 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.HomeTemplateUserMappingDO;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/10:19
+ * @Version 1.0
+ * @注释:
+ */
+public interface HomeTemplateUserMappingMapper extends Mapper<HomeTemplateUserMappingDO> {
+}

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java

@@ -123,9 +123,13 @@ public interface ShopInfoMapper extends Mapper<ShopInfoDO> {
 
     List<ShopInfoDO> selectByLines (@Param("list") List<Long> list,@Param("regionIds") List<Long> regionIds);
 
-    List<ShopInfoDO> getShopIdByShopStatus(@Param("shopStatus") Integer shopStatus);
+    List<ShopInfoDO> getShopIdBySuccessOpen(@Param("eid") String eid);
 
      List<MiniShopsResponse> getShopListSuccessOpen(@Param("eid") String eid,@Param("lineId") Long lineId);
 
     String getOpenName(@Param("eid") String eid,@Param("shopId")Long shopId);
+
+    Integer updateShopCode(@Param("shopCode") String shopCode,@Param("shopId") Long shopId);
+
+    List<String> getShopCodeList(@Param("lineId") Long lineId);
 }

coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml

@@ -36,6 +36,8 @@
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
         <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+        <result property="cShopName" column="c_shop_name" jdbcType="VARCHAR"/>
+        <result property="settlerBankBackPhotoUrl" column="settler_bank_back_photo_url" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -47,6 +49,6 @@
         settler_id_card_front,settler_id_card_reverse,settler_in_hand_front_picture,settler_in_hand_back_picture,settler_id_card_no,
         settler_bank_number,settler_bank_mobile,settler_bank_name,
         create_time,update_time,create_user,
-        update_user
+        update_user,c_shop_name,settler_bank_back_photo_url
     </sql>
 </mapper>

coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml

@@ -171,7 +171,8 @@
     <select id="getAllUser" resultType="com.cool.store.dto.UserDTO">
         select
         user_id as userId,
-        name
+        name,
+        mobile
         from enterprise_user_${eid}
         where active = true
         <if test="keyword!=null and keyword!=''">

coolstore-partner-dao/src/main/resources/mapper/HomeTemplateMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--mybatis-3-mapper.dtd:约束文件的名称，限制和检查在当前文件中出现的标签和属性符合mybatis的要求-->
+<!--namespace：命名空间，要有唯一的值，要求使用dao接口的权限定名称（一个dao接口对应一个mapper，namespace指明对应哪个dao接口）-->
+<mapper namespace="com.cool.store.mapper.HomeTemplateMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.HomeTemplateDO">
+
+      <id column="id" jdbcType="BIGINT" property="id" />
+      <result column="template_name" jdbcType="VARCHAR" property="templateName" />
+      <result column="template_description" jdbcType="VARCHAR" property="templateDescription" />
+      <result column="is_default" jdbcType="BIT" property="isDefault" />
+      <result column="deleted" jdbcType="BIT" property="deleted" />
+      <result column="mini_open_components_json" jdbcType="VARCHAR" property="miniOpenComponentsJson" />
+      <result column="create_id" jdbcType="VARCHAR" property="createId" />
+      <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+      <result column="update_id" jdbcType="VARCHAR" property="updateId" />
+      <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+
+  </resultMap>
+</mapper>

coolstore-partner-dao/src/main/resources/mapper/HomeTemplateUserMappingMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--mybatis-3-mapper.dtd:约束文件的名称，限制和检查在当前文件中出现的标签和属性符合mybatis的要求-->
+<!--namespace：命名空间，要有唯一的值，要求使用dao接口的权限定名称（一个dao接口对应一个mapper，namespace指明对应哪个dao接口）-->
+<mapper namespace="com.cool.store.mapper.HomeTemplateUserMappingMapper">
+<resultMap id="BaseResultMapper" type="com.cool.store.entity.HomeTemplateUserMappingDO">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="template_id" jdbcType="BIGINT" property="templateId" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="create_id" jdbcType="VARCHAR" property="createId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_id" jdbcType="VARCHAR" property="updateId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+
+</resultMap>
+</mapper>

coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

@@ -413,10 +413,11 @@
             #{item}
         </foreach>
     </select>
-    <select id="getShopIdByShopStatus" resultType="com.cool.store.entity.ShopInfoDO">
+    <select id="getShopIdBySuccessOpen" resultType="com.cool.store.entity.ShopInfoDO">
-        select id ,partner_id as partnerId
+        select a.id as id, a.partner_id as partnerId
-        from xfsg_shop_info
+        from xfsg_shop_info a
-        where shop_status = #{shopStatus}
+        inner join store_${eid} b on a.shop_code = b.store_num
+
     </select>
     <select id="getShopListSuccessOpen" resultType="com.cool.store.response.MiniShopsResponse">
         select a.shop_name as shopName,
@@ -432,6 +433,11 @@
         inner join store_${eid} b on a.shop_code = b.store_num
         where a.id = #{shopId}
     </select>
+    <select id="getShopCodeList" resultType="java.lang.String">
+        select shop_code
+        from xfsg_shop_info
+        where deleted = 0 and line_id = #{lineId} and shop_code is not null
+    </select>
 
     <update id="batchUpdate" parameterType="list">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
@@ -446,4 +452,7 @@
             WHERE id = #{item.id}
         </foreach>
     </update>
+    <update id="updateShopCode">
+        update xfsg_shop_info set shop_code = #{shopCode} where id = #{shopId}
+    </update>
 </mapper>

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

@@ -0,0 +1,63 @@
+package com.cool.store.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/09:42
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class HomeTemplateDTO {
+
+    /**
+     * 模块列表
+     */
+    @ApiModelProperty(value = "模块列表")
+    private List<Module> moduleList;
+
+    @Data
+    public static class Module {
+
+        /**
+         * 模块的唯一标识符
+         */
+        @ApiModelProperty(value = "模块的唯一标识符")
+        private String key;
+
+        /**
+         * 模块名称
+         */
+        @ApiModelProperty(value = "模块名称")
+        private String name;
+
+        /**
+         * 是否可见
+         */
+        @ApiModelProperty(value = "是否可见")
+        private Boolean visible;
+
+        /**
+         * 是否可拖动
+         */
+        @ApiModelProperty(value = "是否可拖动")
+        private Boolean dragable;
+
+        /**
+         * 是否可配置
+         */
+        @ApiModelProperty(value = "是否可配置")
+        private Boolean configurable;
+
+        /**
+         * 模块 ID
+         */
+        @ApiModelProperty(value = "模块 ID")
+        private String id;
+
+    }
+}

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

@@ -41,6 +41,9 @@ public class TallyBookDTO {
     @ApiModelProperty(value =  "提交时间")
     private Date updateTime;
 
+    @ApiModelProperty(value = "0,未提交 1,已提交);")
+    private Integer status;
+
     @ApiModelProperty("操作人")
     private String operatorName;
 

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

@@ -15,4 +15,6 @@ public class UserDTO {
     private String userId;
     @ApiModelProperty(value = "用户名")
     private String name;
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
 }

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

@@ -136,6 +136,10 @@ public class BuildInformationDO {
     @Column(name = "settler_bank_photo_url")
     private String settlerBankPhotoUrl;
 
+    //门店POS收款银行卡反面
+    @Column(name = "settler_bank_back_photo_url")
+    private String settlerBankBackPhotoUrl;
+
     /**
      * 结算人银行卡号
      */
@@ -189,5 +193,7 @@ public class BuildInformationDO {
      */
     @Column(name = "update_user")
     private String updateUser;
-
+    //火码，点餐小程序店铺名称',
+    @Column(name = "c_shop_name")
+    private String cShopName;
 }

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

@@ -0,0 +1,73 @@
+package com.cool.store.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Data // 自动生成 getter、setter、toString 等方法
+@Table(name = "xfsg_home_template")
+public class HomeTemplateDO {
+
+    /**
+     * 主键
+     */
+    @Column(name = "id")
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 首页模板名称
+     */
+    @Column(name = "template_name")
+    private String templateName;
+
+    /**
+     * 首页模板描述
+     */
+    @Column(name = "template_description")
+    private String templateDescription;
+
+    /**
+     * 系统默认标识 0: 否，1: 是
+     */
+    @Column(name = "is_default")
+    private Boolean isDefault;
+
+    /**
+     * 是否删除: 0: 未删除，1: 删除
+     */
+    @Column(name = "deleted")
+    private Integer deleted;
+
+    /**
+     * 小程序开源首页组件json
+     */
+    @Column(name = "mini_open_components_json")
+    private String miniOpenComponentsJson;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "create_id")
+    private String createId;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @Column(name = "update_id")
+    private String updateId;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+}

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

@@ -0,0 +1,55 @@
+package com.cool.store.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Data // 自动生成 getter、setter、toString 等方法
+@Table(name = "xfsg_home_template_user_mapping") // MyBatis 别名
+public class HomeTemplateUserMappingDO {
+
+    /**
+     * 主键
+     */
+    @Column(name = "id")
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 模板 ID
+     */
+    @Column(name = "template_id")
+    private Long templateId;
+
+    /**
+     * 用户 ID 或 Partner ID
+     */
+    @Column(name = "user_id")
+    private String userId;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "create_id")
+    private String createId;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @Column(name = "update_id")
+    private String updateId;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+}

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

@@ -25,9 +25,6 @@ public class AddSignFranchiseRequest {
 
     private String detailAddress;
 
-    @ApiModelProperty("店铺编码")
-    @NotBlank(message = "店铺编码不能为空")
-    private String shopCode;
 
     @ApiModelProperty("店铺品牌")
     @NotBlank(message = "店铺品牌不能为空")

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

@@ -18,6 +18,11 @@ import java.util.Date;
 @Data
 public class BuildInformationRequest {
 
+
+    @NotBlank(message = "点餐小程序店铺名称不能为空")
+    @ApiModelProperty(value = "点餐小程序店铺名称")
+    private String cShopName;
+
     @NotNull
     private Long shopId;
     @NotBlank(message = "门店联系人姓名  不能为空")
@@ -108,6 +113,11 @@ public class BuildInformationRequest {
     @ApiModelProperty("结算人银行卡照片")
     private String settlerBankPhotoUrl;
 
+    @NotBlank(message = "结算人银行卡背面照片  不能为空")
+    @Length(max = 250, message = "结算人银行卡背面照片 长度不能超过250")
+    @ApiModelProperty("结算人银行卡背面照片")
+    private String settlerBankBackPhotoUrl;
+
     @NotBlank(message = "结算人银行卡号  不能为空")
     @Length(max = 64 , message = "结算人银行卡号 长度不能超过64")
     @ApiModelProperty("结算人银行卡号")
@@ -174,12 +184,14 @@ public class BuildInformationRequest {
         buildInformationDO.setSettlerInHandBackPicture(this.settlerInHandBackPicture);
         buildInformationDO.setSettlerIdCardNo(this.settlerIdCardNo);
         buildInformationDO.setSettlerBankPhotoUrl(this.settlerBankPhotoUrl);
+        buildInformationDO.setSettlerBankBackPhotoUrl(this.settlerBankBackPhotoUrl);
         buildInformationDO.setSettlerBankNumber(this.settlerBankNumber);
         buildInformationDO.setSettlerBankMobile(this.settlerBankMobile);
         buildInformationDO.setSettlerBankName(this.settlerBankName);
         buildInformationDO.setAuthorizationUrl(this.authorizationUrl);
         buildInformationDO.setRelationshipProve(this.relationshipProve);
         buildInformationDO.setAccountOpeningPermit(this.accountOpeningPermit);
+        buildInformationDO.setCShopName(this.cShopName);
         return buildInformationDO;
     }
 

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

@@ -4,6 +4,7 @@ import com.cool.store.entity.OrderSysInfoDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
@@ -12,7 +13,11 @@ public class OrderSysInfoRequest {
     
     @ApiModelProperty(hidden = true)
     private Integer type;
-    
+
+    @ApiModelProperty(value = "店铺编码",required = true)
+    @NotBlank(message = "店铺编码不能为空")
+    private String shopCode;
+
     @ApiModelProperty(value = "店铺ID" ,required = true)
     @NotNull(message = "门店id不能为空")
     private Long shopId;

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

@@ -36,7 +36,7 @@ public class ZxjpApiRequest {
     private String fxyAccount;
 
     @ApiModelProperty(value = "新掌柜")
-    private String  xjzAccount;
+    private String  xzjAccount;
 
     @ApiModelProperty(value = "云流水账号")
     private String  ylsAccount;
@@ -66,7 +66,7 @@ public class ZxjpApiRequest {
     private String  shopSupervisorUserName;
 
     @ApiModelProperty(value = "门店类型（1-加盟公司、2-加盟部加盟店、3-自有加盟、4-强加盟、）")
-    private Integer joinModel;
+    private Integer joinMode;
 
     @ApiModelProperty(value = "经营模式（0 无 1直营 2加盟）")
     private Integer businessModel;
@@ -114,7 +114,7 @@ public class ZxjpApiRequest {
     private String  shopLatitude;
 
     @ApiModelProperty(value = "高德、百度定位截图")
-    private String  shopLocationPictures;
+    private String  shopLocationScreenshots;
 
     @ApiModelProperty(value = "门店详细地址")
     private String  shopAddress;

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

@@ -173,4 +173,10 @@ public class BuildInformationResponse {
 
     @ApiModelProperty(value = "总部订货收款修改人" )
     private String receivingUpdateUser;
+
+    @ApiModelProperty("结算人银行卡背面照片")
+    private String settlerBankBackPhotoUrl;
+
+    @ApiModelProperty(value = "点餐小程序店铺名称")
+    private String cShopName;
 }

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

@@ -0,0 +1,20 @@
+package com.cool.store.response;
+
+import com.cool.store.dto.HomeTemplateDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/09:42
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class HomeTemplateResponse {
+
+    @ApiModelProperty(value = "小程序开源首页模板")
+    private HomeTemplateDTO miniOpenSourceHomeTemplate;
+}

coolstore-partner-service/src/main/java/com/cool/store/service/HomeTemplateService.java

@@ -0,0 +1,15 @@
+package com.cool.store.service;
+
+import com.cool.store.response.HomeTemplateResponse;
+import com.cool.store.utils.HomeTemplateTypeEnum;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/09:41
+ * @Version 1.0
+ * @注释:
+ */
+public interface HomeTemplateService {
+
+     HomeTemplateResponse  getHomeTemplateById(Long id);
+}

coolstore-partner-service/src/main/java/com/cool/store/service/HomeTemplateUserMappingService.java

@@ -0,0 +1,16 @@
+package com.cool.store.service;
+
+import com.cool.store.response.HomeTemplateResponse;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/10:44
+ * @Version 1.0
+ * @注释:
+ */
+public interface HomeTemplateUserMappingService {
+
+    HomeTemplateResponse  getHomeTemplateByUserId(String userId);
+
+    Integer  insertOrUpdateHomeTemplateUserMapping(HomeTemplateResponse homeTemplateResponse,String userId);
+}

coolstore-partner-service/src/main/java/com/cool/store/service/SyncDataService.java

@@ -0,0 +1,20 @@
+package com.cool.store.service;
+
+import com.cool.store.enums.DownSystemTypeEnum;
+import com.cool.store.request.ZxjpApiRequest;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/07/15:11
+ * @Version 1.0
+ * @注释:
+ */
+public interface SyncDataService {
+
+    /**
+     * @Auther: wangshuo
+     * @Date: 2025/4/7
+     * @description:  获取组合数据
+     */
+    ZxjpApiRequest getData(Long shopId, DownSystemTypeEnum systemType);
+}

coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java

@@ -120,6 +120,8 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
         response.setAccountOpeningPermit(informationDO.getAccountOpeningPermit());
         response.setSettlerInHandFrontPicture(informationDO.getSettlerInHandFrontPicture());
         response.setSettlerInHandBackPicture(informationDO.getSettlerInHandBackPicture());
+        response.setCShopName(informationDO.getCShopName());
+        response.setSettlerBankBackPhotoUrl(informationDO.getSettlerBankBackPhotoUrl());
     }
 
     @Override
@@ -139,12 +141,12 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
             map.put("partnerUsername",lineInfoDO.getUsername());
             map.put("partnerMobile",lineInfoDO.getMobile());
             map.put("storeName",shopInfoDO.getShopName());
-            List<EnterpriseUserDO> itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.IT_EMPLOYEE, shopInfoDO.getRegionId());
+            List<EnterpriseUserDO> logisticsList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.LOGISTICS, shopInfoDO.getRegionId());
-            List<String> itUsers = new ArrayList<>();
+            List<String> logistics = new ArrayList<>();
-            if (Objects.nonNull(itList)){
+            if (Objects.nonNull(logisticsList)){
-                itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
+                logistics.addAll(logisticsList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
             }
-            commonService.sendQWMessage(itUsers,
+            commonService.sendQWMessage(logistics,
                     MessageEnum.MESSAGE_52,
                     map);
             return buildInformationDAO.insertSelective(buildInformationDO);

coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java

@@ -539,11 +539,11 @@ public class DecorationServiceImpl implements DecorationService {
         if (Objects.isNull(request) || request.getShopId() == null) {
             throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
         }
-        //必须是待提交状态才能提交
+//        //必须是待提交状态才能提交
-        ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage());
+//        ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage());
-        if (shopStageInfo != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) {
+//        if (shopStageInfo != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) {
-            throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT);
+//            throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT);
-        }
+//        }
         DecorationDesignInfoDO decorationDesignInfoDO = request.toDecorationDesignInfoDO();
         DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId());
         if (Objects.nonNull(decoration)) {
@@ -551,14 +551,14 @@ public class DecorationServiceImpl implements DecorationService {
             decorationDesignInfoDAO.updateByPrimaryKeySelective(decorationDesignInfoDO);
         } else {
             decorationDesignInfoDAO.insertSelective(decorationDesignInfoDO);
+            //更新装修设计状态
+            shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_905);
+            ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
+            LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId());
+            Map<String, String> templateParam = new HashMap<>();
+            templateParam.put("shopName", shopInfo.getShopName());
+            commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam);
         }
-        //更新装修设计状态
-        shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_905);
-        ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
-        LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId());
-        Map<String, String> templateParam = new HashMap<>();
-        templateParam.put("shopName", shopInfo.getShopName());
-        commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam);
         return Boolean.TRUE;
     }
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateServiceImpl.java

@@ -0,0 +1,50 @@
+package com.cool.store.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.dao.HomeTemplateDAO;
+import com.cool.store.dto.HomeTemplateDTO;
+import com.cool.store.entity.HomeTemplateDO;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.exception.ServiceException;
+import com.cool.store.response.HomeTemplateResponse;
+import com.cool.store.service.HomeTemplateService;
+import com.cool.store.utils.HomeTemplateTypeEnum;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/09:41
+ * @Version 1.0
+ * @注释:
+ */
+@Service
+@Slf4j
+public class HomeTemplateServiceImpl implements HomeTemplateService {
+
+    @Resource
+    private HomeTemplateDAO homeTemplateDAO;
+    @Override
+    public HomeTemplateResponse getHomeTemplateById(Long id) {
+        HomeTemplateDO homeTemplateById = homeTemplateDAO.getHomeTemplateById(id);
+        if (homeTemplateById != null){
+            ObjectMapper objectMapper = new ObjectMapper();
+            // 将 JSON 字符串解析为 HomeTemplateResponse 对象
+            try {
+                HomeTemplateResponse componentsJson = new HomeTemplateResponse();
+                HomeTemplateDTO miniOpenComponentsJson = objectMapper.readValue(homeTemplateById.getMiniOpenComponentsJson(), HomeTemplateDTO.class);
+                componentsJson.setMiniOpenSourceHomeTemplate(miniOpenComponentsJson);
+                return componentsJson;
+            } catch (JsonProcessingException e) {
+                log.info("JSON解析失败:{}", JSONObject.toJSONString(e.getMessage()));
+                throw new ServiceException(ErrorCodeEnum.GET_HOME_TEMPLATE_ERROR);
+            }
+        }
+        return null;
+    }
+}

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateUserMappingServiceImpl.java

@@ -0,0 +1,102 @@
+package com.cool.store.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.dao.HomeTemplateDAO;
+
+import com.cool.store.dao.HomeTemplateUserMappingDAO;
+import com.cool.store.entity.HomeTemplateDO;
+
+import com.cool.store.entity.HomeTemplateUserMappingDO;
+import com.cool.store.response.HomeTemplateResponse;
+
+import com.cool.store.service.HomeTemplateService;
+import com.cool.store.service.HomeTemplateUserMappingService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/10:44
+ * @Version 1.0
+ * @注释:
+ */
+@Service
+public class HomeTemplateUserMappingServiceImpl implements HomeTemplateUserMappingService {
+
+    @Resource
+    private HomeTemplateUserMappingDAO homeTemplateUserMappingDAO;
+    @Resource
+    private HomeTemplateService homeTemplateService;
+    @Resource
+    private HomeTemplateDAO homeTemplateDAO;
+    @Override
+    public HomeTemplateResponse getHomeTemplateByUserId(String userId) {
+
+        HomeTemplateUserMappingDO homeTemplateRoleMappingById = homeTemplateUserMappingDAO.getHomeTemplateRoleMappingByUserId(userId);
+        if (homeTemplateRoleMappingById == null){
+            //使用默认模板 id =1
+            return homeTemplateService.getHomeTemplateById(1L);
+        }else{
+            return homeTemplateService.getHomeTemplateById(homeTemplateRoleMappingById.getTemplateId());
+        }
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Integer insertOrUpdateHomeTemplateUserMapping(HomeTemplateResponse homeTemplateResponse, String userId) {
+
+        HomeTemplateUserMappingDO homeTemplateRoleMappingByUserId = homeTemplateUserMappingDAO.getHomeTemplateRoleMappingByUserId(userId);
+        if (homeTemplateRoleMappingByUserId == null){
+            //获取默认模板 id =1
+            HomeTemplateDO homeTemplate = homeTemplateDAO.getHomeTemplateById(1L);
+            HomeTemplateDO homeTemplateDO = new HomeTemplateDO();
+            homeTemplateDO.setTemplateName(homeTemplate.getTemplateName());
+            homeTemplateDO.setTemplateDescription(homeTemplate.getTemplateDescription());
+            String jsonString = JSONObject.toJSONString(homeTemplateResponse.getMiniOpenSourceHomeTemplate());
+            homeTemplateDO.setMiniOpenComponentsJson(jsonString);
+            homeTemplateDO.setIsDefault(false);
+            homeTemplateDO.setDeleted(0);
+            homeTemplateDO.setCreateId(userId);
+            homeTemplateDO.setCreateTime(new Date());
+            Long tempId = homeTemplateDAO.insertSelective(homeTemplateDO);
+            homeTemplateRoleMappingByUserId = new HomeTemplateUserMappingDO();
+            homeTemplateRoleMappingByUserId.setTemplateId(tempId);
+            homeTemplateRoleMappingByUserId.setUserId(userId);
+            homeTemplateRoleMappingByUserId.setCreateId(userId);
+            homeTemplateRoleMappingByUserId.setCreateTime(new Date());
+          return   homeTemplateUserMappingDAO.insertSelective(homeTemplateRoleMappingByUserId);
+        }else{
+            HomeTemplateDO homeTemplateById = homeTemplateDAO.getHomeTemplateById(homeTemplateRoleMappingByUserId.getTemplateId());
+            if (homeTemplateById == null){
+                //如果模板不存在，则新建
+                HomeTemplateDO homeTemplate = homeTemplateDAO.getHomeTemplateById(1L);
+                HomeTemplateDO homeTemplateDO = new HomeTemplateDO();
+                homeTemplateDO.setTemplateName(homeTemplate.getTemplateName());
+                homeTemplateDO.setTemplateDescription(homeTemplate.getTemplateDescription());
+                String jsonString = JSONObject.toJSONString(homeTemplateResponse.getMiniOpenSourceHomeTemplate());
+                homeTemplateDO.setMiniOpenComponentsJson(jsonString);
+                homeTemplateDO.setIsDefault(false);
+                homeTemplateDO.setDeleted(0);
+                homeTemplateDO.setCreateId(userId);
+                homeTemplateDO.setCreateTime(new Date());
+                Long tempId = homeTemplateDAO.insertSelective(homeTemplateDO);
+                homeTemplateRoleMappingByUserId.setTemplateId(tempId);
+                homeTemplateRoleMappingByUserId.setUpdateId(userId);
+                homeTemplateRoleMappingByUserId.setUpdateTime(new Date());
+            }else{
+                homeTemplateById.setMiniOpenComponentsJson(JSONObject.toJSONString(homeTemplateResponse.getMiniOpenSourceHomeTemplate()));
+                homeTemplateById.setUpdateId(userId);
+                homeTemplateById.setUpdateTime(new Date());
+                homeTemplateDAO.updateByPrimaryKeySelective(homeTemplateById);
+            }
+            return   homeTemplateUserMappingDAO.updateByPrimaryKeySelective(homeTemplateRoleMappingByUserId);
+        }
+
+    }
+
+
+}

coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java

@@ -17,6 +17,7 @@ import com.cool.store.service.OrderSysInfoService;
 import com.cool.store.service.UserAuthMappingService;
 import com.cool.store.utils.poi.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -48,7 +49,10 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer updateByShopId(OrderSysInfoRequest request, String userId) {
+
+
         OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());
         if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())) {
             orderSysInfoDO.setXgjVicePresident(request.getXgjVicePresident());
@@ -86,6 +90,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
             }
         }
         if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())) {
+            shopInfoDAO.updateShopCode(request.getShopCode(),request.getShopId());
             orderSysInfoDO.setReceivingFirmName(request.getReceivingFirmName());
             orderSysInfoDO.setReceivingMsBankAccount(request.getReceivingMsBankAccount());
             orderSysInfoDO.setReceivingMsBankBranch(request.getReceivingMsBankBranch());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

@@ -209,7 +209,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                 shopInfoDO.setRegionId(request.getRegionId());
                 shopInfoDO.setShopName(request.getShopName());
                 shopInfoDO.setDetailAddress(request.getDetailAddress());
-                shopInfoDO.setShopCode(request.getShopCode());
                 shopInfoDO.setJoinMode(request.getJoinMode());
                 shopInfoDO.setFranchiseBrand(request.getFranchiseBrand());
                 shopInfoDO.setUpdateTime(new Date());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java

@@ -0,0 +1,194 @@
+package com.cool.store.service.impl;
+
+import com.cool.store.dao.*;
+import com.cool.store.entity.*;
+import com.cool.store.enums.DownSystemTypeEnum;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.enums.FranchiseBrandEnum;
+import com.cool.store.exception.ServiceException;
+import com.cool.store.mapper.ApplyLicenseMapper;
+import com.cool.store.mapper.SignFranchiseMapper;
+import com.cool.store.request.ZxjpApiRequest;
+import com.cool.store.service.SyncDataService;
+import com.cool.store.utils.poi.constant.Constants;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/07/15:12
+ * @Version 1.0
+ * @注释:
+ */
+@Service
+public class SyncDataServiceImpl implements SyncDataService {
+
+    @Resource
+    private ShopInfoDAO shopInfoDAO;
+    @Resource
+    private LineInfoDAO lineInfoDAO;
+    @Resource
+    private SignFranchiseMapper signFranchiseMapper;
+    @Resource
+    private HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
+    @Resource
+    private OrderSysInfoDAO orderSysInfoDAO;
+    @Resource
+    private BuildInformationDAO buildInformationDAO;
+    @Resource
+    private AcceptanceInfoDAO acceptanceInfoDAO;
+    @Resource
+    private ApplyLicenseMapper applyLicenseMapper;
+    @Resource
+    private QualificationsInfoDAO qualificationsInfoDAO;
+    @Resource
+    private PointInfoDAO pointInfoDAO;
+    @Resource
+    private EnterpriseUserDAO enterpriseUserDAO;
+
+    @Override
+    public ZxjpApiRequest getData(Long shopId, DownSystemTypeEnum systemType) {
+        ZxjpApiRequest request = new ZxjpApiRequest();
+        ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
+        if (shopInfo == null) {
+            throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
+        }
+        Long lineId = shopInfo.getLineId();
+        LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId);
+        if (lineInfoDO == null) {
+            throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
+        }
+        HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(shopInfo.getPartnerId());
+        if (hyPartnerUserInfoDO == null) {
+            throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST);
+        }
+        //加盟合同
+        SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId);
+        //加盟商所有门店的门店编码
+        List<String> shopCodeList = shopInfoDAO.getShopCodeList(lineId);
+        //订货信息 & 总部订货收款账户
+        OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(shopId);
+        //建店资料
+        BuildInformationDO buildInformationDO = buildInformationDAO.selectOneByShopId(shopId);
+        //铺位
+        PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId());
+        //营业执照
+        LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId);
+        //验收信息
+        AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
+        //资质信息
+        QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId);
+        //督导
+        String investmentManager = enterpriseUserDAO.getUserName(shopInfo.getInvestmentManager());
+        if (signFranchiseDO != null) {
+            List<String> partnershipSignatory = new ArrayList<>();
+            partnershipSignatory.add(signFranchiseDO.getPartnershipSignatoryFirst());
+            partnershipSignatory.add(signFranchiseDO.getPartnershipSignatorySecond());
+            request.setPartnershipSignatory(partnershipSignatory);
+            request.setBusinessModel(signFranchiseDO.getBusinessModel());
+        }
+        request.setPartnerMobile(lineInfoDO.getMobile());
+        if (qualificationsInfoDO != null) {
+            request.setPartnerIdCardNo(qualificationsInfoDO.getIdCardNo());
+            request.setLegalName(qualificationsInfoDO.getLegalName());
+            request.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront());
+            request.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack());
+            request.setLegalMobile(qualificationsInfoDO.getLegalMobile());
+        }
+        request.setShopCode(shopInfo.getShopCode());
+        request.setShopCodeList(shopCodeList);
+        request.setCrmAccount(lineInfoDO.getMobile());
+        request.setDownstreamSystemPassword(hyPartnerUserInfoDO.getDownstreamSystemPassword());
+        request.setDownstreamSystemSalt(hyPartnerUserInfoDO.getDownstreamSystemSalting());
+        request.setCrmAccount(lineInfoDO.getMobile());
+        request.setFxyAccount(lineInfoDO.getMobile());
+        request.setXzjAccount(shopInfo.getShopCode());
+        request.setYlsAccount(shopInfo.getShopCode());
+        request.setWqfAccount(shopInfo.getShopCode());
+        if (systemType.equals(DownSystemTypeEnum.XGJ)) {
+            //todo
+        }
+        if (systemType.equals(DownSystemTypeEnum.POS)) {
+            if (buildInformationDO != null) {
+                String brand = FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand());
+                request.setDownstreamSystemShopName(brand + "(" + buildInformationDO + ")");
+            }
+        }
+        if (orderSysInfoDO != null) {
+            request.setXgjRegionId(orderSysInfoDO.getXgjRegionId());
+            request.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident());
+            request.setAddresseeName(orderSysInfoDO.getAddresseeName());
+            request.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile());
+            request.setAddresseeProvince(orderSysInfoDO.getAddresseeProvince());
+            request.setAddresseeCity(orderSysInfoDO.getAddresseeCity());
+            request.setAddresseeDistrict(orderSysInfoDO.getAddresseeDistrict());
+            request.setAddresseeAddress(orderSysInfoDO.getAddresseeAddress());
+            request.setDeclareGoodsLogisticsWarehouse(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse());
+            request.setDeclareGoodsDate(orderSysInfoDO.getDeclareGoodsDate());
+            request.setWarehouseDeliveryDate(orderSysInfoDO.getWarehouseDeliveryDate());
+            request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName());
+            request.setReceivingMSBankAccount(orderSysInfoDO.getReceivingMsBankAccount());
+            request.setReceivingMSBankBranch(orderSysInfoDO.getReceivingMsBankBranch());
+            request.setBankUnionPayAccount(orderSysInfoDO.getBankUnionPayAccount());
+        }
+        request.setShopSupervisorUserName(investmentManager);
+        request.setJoinMode(shopInfo.getJoinMode());
+        if (acceptanceInfoDO != null) {
+            if (acceptanceInfoDO.getShopDoorwayPhoto() != null) {
+                List<String> doorwayPhoto = Arrays.stream(acceptanceInfoDO.getShopDoorwayPhoto().split(","))
+                        .collect(Collectors.toList());
+                request.setShopDoorwayPhoto(doorwayPhoto);
+            }
+            if (acceptanceInfoDO.getShopInteriorPhoto() != null) {
+                List<String> interiorPhoto = Arrays.stream(acceptanceInfoDO.getShopInteriorPhoto().split(","))
+                        .collect(Collectors.toList());
+                request.setShopInteriorPhoto(interiorPhoto);
+            }
+            request.setShopLocationScreenshots(acceptanceInfoDO.getShopLocationScreenshots());
+            request.setVerificationMobile(acceptanceInfoDO.getVerificationMobile());
+            request.setKsAccount(acceptanceInfoDO.getKsAccount());
+        }
+        if (buildInformationDO!=null){
+            request.setBusinessHours(buildInformationDO.getBusinessHours());
+            request.setShopContactName(buildInformationDO.getShopContactName());
+            request.setBusinessMobile(buildInformationDO.getBusinessMobile());
+            request.setSettlerName(buildInformationDO.getSettlerName());
+            request.setSettlerBankPhotoUrl(buildInformationDO.getSettlerBankPhotoUrl());
+            request.setSettlerBankBackPhotoUrl(buildInformationDO.getSettlerBankBackPhotoUrl());
+            request.setSettlerBankBranchName(buildInformationDO.getSettlerBankName());
+            request.setSettlerBankNumber(buildInformationDO.getSettlerBankNumber());
+            request.setSettlerBankMobile(buildInformationDO.getSettlerBankMobile());
+            request.setSettlerIdCardFront(buildInformationDO.getSettlerIdCardFront());
+            request.setSettlerIdCardReverse(buildInformationDO.getSettlerIdCardReverse());
+            request.setSettlerInHandBackPicture(buildInformationDO.getSettlerInHandBackPicture());
+            request.setSettlerInHandFrontPicture(buildInformationDO.getSettlerInHandFrontPicture());
+            request.setSettlerIdCardNo(buildInformationDO.getSettlerIdCardNo());
+
+        }
+        if (licenseTransactDO != null){
+            request.setCreditUrl(licenseTransactDO.getCreditUrl());
+            //二证合一标识；0否 1 是
+            if (Objects.equals(licenseTransactDO.getTwoCertificatesOne(), Constants.ONE_INTEGER)){
+                request.setFoodBusinessLicenseUrl(licenseTransactDO.getCreditUrl());
+            }else {
+                request.setFoodBusinessLicenseUrl(licenseTransactDO.getFoodBusinessLicenseUrl());
+            }
+        }
+        if (pointInfo!=null){
+            request.setShopProvinceCityDistrict(pointInfo.getProvince()+pointInfo.getCity()+pointInfo.getDistrict());
+            request.setShopLongitude(pointInfo.getLongitude());
+            request.setShopLatitude(pointInfo.getLatitude());
+            request.setShopAddress(pointInfo.getAddress());
+            request.setShopProvince(pointInfo.getProvince());
+            request.setShopCity(pointInfo.getCity());
+        }
+
+        return request;
+    }
+}

coolstore-partner-service/src/main/java/com/cool/store/service/impl/TallyBookServiceImpl.java

@@ -50,8 +50,10 @@ public class TallyBookServiceImpl implements TallyBookService {
         tallyBookDO.setId(request.getId());
         tallyBookDO.setStatus(TallyBookStatusEnum.IS_SUBMIT.getCode());;
         tallyBookDO.setUpdateUser(user.getPartnerId());
-        tallyBookDO.setUpdateTime(new Date());tallyBookDAO.updateByPrimaryKeySelective(tallyBookDO);
+        tallyBookDO.setTotal(request.getTotal());
+        tallyBookDO.setUpdateTime(new Date());
         tallyBookDO.setOperatorName(request.getOperatorName());
+        tallyBookDAO.updateByPrimaryKeySelective(tallyBookDO);
         tallyBookDetailDAO.batchDeleteByTallyBookId(request.getId());
         List<TallyBookDetailDO> tallyBookDetailDOList = request.toTallyBookDetailDOList(request.getId());
         tallyBookDetailDAO.batchInsert(tallyBookDetailDOList);

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java

@@ -30,7 +30,7 @@ public class PCOrderSysInfoController {
     private OrderSysInfoService orderSysInfoService;
 
     @PostMapping("/submitOrderInfo")
-    @ApiOperation("IT提交订货信息")
+    @ApiOperation("物流提交订货信息")
     public ResponseResult<Integer> submitOrderInfo(@RequestBody @Validated OrderSysInfoRequest request){
         request.setType(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType());
         return ResponseResult.success(orderSysInfoService.updateByShopId(request, CurrentUserHolder.getUserId()));

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/HomeTemplateController.java

@@ -0,0 +1,39 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.context.PartnerUserHolder;
+import com.cool.store.response.HomeTemplateResponse;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.HomeTemplateUserMappingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/13:47
+ * @Version 1.0
+ * @注释:
+ */
+@RestController
+@RequestMapping("/mini/homeTemp")
+@Api(value = "小程序首页模板", description = "小程序首页模板")
+public class HomeTemplateController {
+    @Resource
+    private HomeTemplateUserMappingService homeTemplateUserMappingService;
+
+    @ApiOperation("获取用户小程序首页配置")
+    @GetMapping("/getUserMiniHomeTemp")
+    public ResponseResult<HomeTemplateResponse> getUserMiniHomeTemp() {
+        String partnerId = PartnerUserHolder.getUser().getPartnerId();
+        return ResponseResult.success(homeTemplateUserMappingService.getHomeTemplateByUserId(partnerId));
+    }
+
+    @ApiOperation("保存用户小程序首页配置")
+    @PostMapping("/saveUserMiniHomeTemp")
+    public ResponseResult<Integer> saveUserMiniHomeTemp(@RequestBody HomeTemplateResponse response){
+        return ResponseResult.success(homeTemplateUserMappingService.insertOrUpdateHomeTemplateUserMapping(response,PartnerUserHolder.getUser().getPartnerId()));
+    }
+}

coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

@@ -317,7 +317,8 @@ public class XxlJobHandler {
         List<Long> shopIdList = new ArrayList<>();
         while (hasNext) {
             PageHelper.startPage(pageNum, pageSize);
-            List<ShopInfoDO> shopList = shopInfoDAO.getShopIdByShopStatus(ShopStatusEnum.DONE.getCode());
+            //获取成功开店的门店
+            List<ShopInfoDO> shopList = shopInfoDAO.getShopIdBySuccessOpen(eid);
             if (CollectionUtils.isEmpty(shopList)) {
                 log.info("------initTallyBook is empty------");
                 break;