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

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

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

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

@@ -77,6 +77,8 @@ public enum MessageEnum {
     MESSAGE_49("您有一个门店美团外卖初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"),
     MESSAGE_50("您有一个门店开业运营方案审核未通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"),
     MESSAGE_51("您有一个加盟商提交了铺位，请查收","铺位名称：${pointName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"),
+    MESSAGE_52("您有一个门店建店资料的订货信息待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"),
+    MESSAGE_53("您有一个门店建店资料的总部订货收款账户信息待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"),
 
     ;
 

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

@@ -0,0 +1,26 @@
+package com.cool.store.enums;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/06/17:08
+ * @Version 1.0
+ * @注释:
+ */
+public enum OrderSysTypeEnum {
+
+    ORDER_SYS_TYPE_1(1,"订货信息"),
+    ORDER_SYS_TYPE_2(2,"总部订货收款账户");
+    private Integer type;
+    private String name;
+    OrderSysTypeEnum(Integer type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+    public Integer getType() {
+        return type;
+    }
+    public String getName() {
+        return name;
+    }
+
+}

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

@@ -77,6 +77,8 @@ public enum ShopSubStageStatusEnum {
 
     //平台资料提交
     SHOP_SUB_STAGE_STATUS_150(ShopSubStageEnum.SHOP_STAGE_15, 1500, "待提交", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_151(ShopSubStageEnum.SHOP_STAGE_15, 1510, "订货信息待提交", Boolean.TRUE),
+    SHOP_SUB_STAGE_STATUS_152(ShopSubStageEnum.SHOP_STAGE_15, 1520, "总部订货收款账户待提交",Boolean.TRUE),
     SHOP_SUB_STAGE_STATUS_153(ShopSubStageEnum.SHOP_STAGE_15, 1530, "已完成", Boolean.TRUE),
 
     //POS

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

@@ -0,0 +1,66 @@
+package com.cool.store.utils;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/06/15:03
+ * @Version 1.0
+ * @注释:
+ */
+public class PasswordUtil {
+
+    /**
+     * 生成随机盐值
+     *
+     * @return 随机生成的盐值（字节数组）
+     */
+    public static byte[] generateSalt() {
+        SecureRandom secureRandom = new SecureRandom();
+        // 16 字节的盐值
+        byte[] salt = new byte[16];
+        secureRandom.nextBytes(salt);
+        return salt;
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param bytes 字节数组
+     * @return 十六进制字符串
+     */
+    public static String bytesToHex(byte[] bytes) {
+        StringBuilder hexString = new StringBuilder();
+        for (byte b : bytes) {
+            String hex = Integer.toHexString(0xff & b);
+            if (hex.length() == 1) {
+                hexString.append('0');
+            }
+            hexString.append(hex);
+        }
+        return hexString.toString();
+    }
+
+    /**
+     * 使用 SHA-256 加密密码
+     *
+     * @param plainPassword 明文密码
+     * @param salt          盐值
+     * @return 加密后的密码（十六进制字符串）
+     */
+    public static String encryptPassword(String plainPassword, byte[] salt) {
+        try {
+            MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
+            // 将盐值和明文密码拼接后进行哈希计算
+            messageDigest.update(salt);
+            byte[] hashedBytes = messageDigest.digest(plainPassword.getBytes());
+
+            // 将字节数组转换为十六进制字符串
+            return bytesToHex(hashedBytes);
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("Error encrypting password", e);
+        }
+    }
+}

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

@@ -82,6 +82,14 @@ public class HyPartnerUserInfoDAO {
         return hyPartnerUserInfoMapper.updateByPartnerId(record);
     }
 
+    public int updatePasswordByPartnerId(HyPartnerUserInfoDO record){
+        if(StringUtils.isBlank(record.getPartnerId())){
+            return 0;
+        }
+        return hyPartnerUserInfoMapper.updatePasswordByPartnerId(record);
+    }
+
+
 
     public String selectLastCrmCreateTime() {
         return hyPartnerUserInfoMapper.selectLastCrmCreateTime();

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

@@ -0,0 +1,37 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.OrderSysInfoDO;
+import com.cool.store.mapper.OrderSysInfoMapper;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/06/16:03
+ * @Version 1.0
+ * @注释:
+ */
+@Repository
+public class OrderSysInfoDAO {
+
+    @Resource
+    private OrderSysInfoMapper orderSysInfoMapper;
+
+    public Integer insertSelective(OrderSysInfoDO orderSysInfoDO) {
+        return orderSysInfoMapper.insertSelective(orderSysInfoDO);
+    }
+
+    public OrderSysInfoDO selectByShopId(Long shopId) {
+        Example example = new Example(OrderSysInfoDO.class);
+        example.createCriteria().andEqualTo("shopId",shopId);
+        return orderSysInfoMapper.selectOneByExample(example);
+    }
+
+    public Integer updateByShopId(OrderSysInfoDO orderSysInfoDO) {
+        Example example = new Example(OrderSysInfoDO.class);
+        example.createCriteria().andEqualTo("shopId",orderSysInfoDO.getShopId());
+        return orderSysInfoMapper.updateByExampleSelective(orderSysInfoDO,example);
+    }
+}

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

@@ -49,4 +49,6 @@ public interface HyPartnerUserInfoMapper {
 
     String selectLastCrmCreateTime();
 
+    int updatePasswordByPartnerId(@Param("record") HyPartnerUserInfoDO record);
+
 }

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

@@ -0,0 +1,14 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.OrderSysInfoDO;
+import tk.mybatis.mapper.common.Mapper;
+
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/06/15:57
+ * @Version 1.0
+ * @注释:
+ */
+public interface OrderSysInfoMapper extends Mapper<OrderSysInfoDO> {
+}

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

@@ -2,9 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cool.store.mapper.AcceptanceInfoMapper">
     <resultMap id="BaseResultMap" type="com.cool.store.entity.AcceptanceInfoDO">
-        <!--
-          WARNING - @mbg.generated
-        -->
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="shop_id" jdbcType="BIGINT" property="shopId"/>
         <result column="actual_entry_time" jdbcType="TIMESTAMP" property="actualEntryTime"/>
@@ -25,13 +22,19 @@
         <result column="actual_acceptance_time" jdbcType="TIMESTAMP" property="actualAcceptanceTime"/>
         <result column="booking_user" jdbcType="VARCHAR" property="bookingUser"/>
         <result column="plan_exit_time" jdbcType="TIMESTAMP" property="planExitTime"/>
+        <result column="ks_account" jdbcType="VARCHAR" property="ksAccount"/>
+        <result column="verification_mobile" jdbcType="VARCHAR" property="verificationMobile"/>
+        <result column="shop_location_screenshots" jdbcType="VARCHAR" property="shopLocationScreenshots"/>
+        <result column="shop_doorway_photo" jdbcType="VARCHAR" property="shopDoorwayPhoto"/>
+        <result column="shop_interior_photo" jdbcType="VARCHAR" property="shopInteriorPhoto"/>
     </resultMap>
     <sql id="baseColumn">
         id
         ,shop_id,actual_entry_time,planned_completion_time,planned_start_time,decoration_planned_completion_time,
            decoration_planned_start_time,construction_completion_time,engineering_acceptance_signatures,
            operations_acceptance_signatures,partner_acceptance_signatures,
-           create_time,update_time,deleted,plan_acceptance_time,actual_acceptance_time,booking_user,plan_exit_time
+           create_time,update_time,deleted,plan_acceptance_time,actual_acceptance_time,booking_user,plan_exit_time,
+           ks_account,verification_mobile,shop_location_screenshots,shop_doorway_photo,shop_Interior_photo
     </sql>
     <update id="updateByShopIDSelective">
         update xfsg_acceptance_info
@@ -81,6 +84,21 @@
             <if test="planExitTime !=null">
                 plan_exit_time =#{planExitTime}
             </if>
+            <if test="ksAccount !=null">
+                ks_account =#{ksAccount}
+            </if>
+            <if test="verificationMobile !=null">
+                verification_mobile =#{verificationMobile}
+            </if>
+            <if test="shopLocationScreenshots !=null">
+                shop_location_screenshots =#{shopLocationScreenshots}
+            </if>
+            <if test="shopDoorwayPhoto !=null">
+                shop_doorway_photo =#{shopDoorwayPhoto}
+            </if>
+            <if test="shopInteriorPhoto !=null">
+                shop_Interior_photo =#{shopInteriorPhoto}
+            </if>
         </set>
         where shop_id = #{shopId}
     </update>

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

@@ -19,8 +19,11 @@
         <result property="juridicalHandheldIdCardReverse" column="juridical_handheld_id_card_reverse"
                 jdbcType="VARCHAR"/>
         <result property="juridicalIdCardNo" column="juridical_id_card_no" jdbcType="VARCHAR"/>
+        <result property="settlerName" column="settler_name" jdbcType="VARCHAR"/>
         <result property="settlerIdCardFront" column="settler_id_card_front" jdbcType="VARCHAR"/>
         <result property="settlerIdCardReverse" column="settler_id_card_reverse" jdbcType="VARCHAR"/>
+        <result property="settlerInHandFrontPicture" column="settler_in_hand_front_picture" jdbcType="VARCHAR"/>
+        <result property="settlerInHandBackPicture" column="settler_in_hand_back_picture" jdbcType="VARCHAR"/>
         <result property="settlerIdCardNo" column="settler_id_card_no" jdbcType="VARCHAR"/>
         <result property="settlerBankPhotoUrl" column="settler_bank_photo_url" jdbcType="VARCHAR"/>
         <result property="settlerBankNumber" column="settler_bank_number" jdbcType="VARCHAR"/>
@@ -40,8 +43,8 @@
         ,shop_id,shop_contact_name,
         shop_contact_mobile,business_hours,business_mobile,settler_bank_photo_url,juridical_id_card_no,
         door_photo,in_store_photo,juridical_id_card_front,authorizationUrl,relationshipProve,accountOpeningPermit,
-        juridical_id_card_reverse,juridical_handheld_id_card_front,juridical_handheld_id_card_reverse,
+        juridical_id_card_reverse,juridical_handheld_id_card_front,juridical_handheld_id_card_reverse,settler_name,
-        settler_id_card_front,settler_id_card_reverse,settler_id_card_no,
+        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

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

@@ -10,9 +10,11 @@
     <result column="user_channel_id" jdbcType="BIGINT" property="userChannelId" />
     <result column="crm_create_time" jdbcType="TIMESTAMP" property="crmCreateTime" />
     <result column="openid" jdbcType="VARCHAR" property="openid" />
+    <result column="downstream_system_salting" jdbcType="VARCHAR" property="downstreamSystemSalting" />
+    <result column="downstream_system_password" jdbcType="VARCHAR" property="downstreamSystemPassword" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, partner_id, mobile, create_time, update_time, user_channel_id, crm_create_time, openid
+    id, partner_id, mobile, create_time, update_time, user_channel_id, crm_create_time, openid, downstream_system_salting, downstream_system_password
   </sql>
   <select id="selectByPartnerId" resultMap="BaseResultMap" >
     select
@@ -148,5 +150,20 @@
     </set>
     where partner_id = #{record.partnerId}
   </update>
+  <update id="updatePasswordByPartnerId">
+    update xfsg_partner_user_info
+    <set>
+      <if test="record.downstreamSystemSalting != null">
+        downstream_system_salting = #{record.downstreamSystemSalting},
+      </if>
+      <if test="record.downstreamSystemPassword != null">
+        downstream_system_password = #{record.downstreamSystemPassword},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime},
+      </if>
+    </set>
+    where partner_id = #{record.partnerId}
+  </update>
 
 </mapper>

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

@@ -0,0 +1,41 @@
+<?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.OrderSysInfoMapper">
+    <resultMap id="BaseResultMap" type="com.cool.store.entity.OrderSysInfoDO">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="shopId" column="shop_id" jdbcType="BIGINT"/>
+        <result property="xgjVicePresident" column="xgj_vice_president" jdbcType="VARCHAR"/>
+        <result property="xgjRegionId" column="xgj_region_id" jdbcType="VARCHAR"/>
+        <result property="addresseeName" column="addressee_name" jdbcType="VARCHAR"/>
+        <result property="addresseeMobile" column="addressee_mobile" jdbcType="VARCHAR"/>
+        <result property="addresseeProvince" column="addressee_province" jdbcType="VARCHAR"/>
+        <result property="addresseeCity" column="addressee_city" jdbcType="VARCHAR"/>
+        <result property="addresseeDistrict" column="addressee_district" jdbcType="VARCHAR"/>
+        <result property="addresseeAddress" column="addressee_address" jdbcType="VARCHAR"/>
+        <result property="declareGoodsLogisticsWarehouse" column="declare_goods_logistics_warehouse"
+                jdbcType="VARCHAR"/>
+        <result property="declareGoodsDate" column="declare_goods_date" jdbcType="VARCHAR"/>
+        <result property="warehouseDeliveryDate" column="warehouse_delivery_date" jdbcType="VARCHAR"/>
+        <result property="orderCreateTime" column="order_create_time" jdbcType="TIMESTAMP"/>
+        <result property="orderUpdateTime" column="order_update_time" jdbcType="TIMESTAMP"/>
+        <result property="orderCreateUser" column="order_create_user" jdbcType="VARCHAR"/>
+        <result property="orderUpdateUser" column="order_update_user" jdbcType="VARCHAR"/>
+        <result property="receivingFirmName" column="receiving_firm_name" jdbcType="VARCHAR"/>
+        <result property="receivingMsBankAccount" column="receiving_ms_bank_account" jdbcType="VARCHAR"/>
+        <result property="receivingMsBankBranch" column="receiving_ms_bank_branch" jdbcType="VARCHAR"/>
+        <result property="bankUnionPayAccount" column="bank_unionPay_account" jdbcType="VARCHAR"/>
+        <result property="receivingCreateTime" column="receiving_create_time" jdbcType="TIMESTAMP"/>
+        <result property="receivingUpdateTime" column="receiving_update_time" jdbcType="TIMESTAMP"/>
+        <result property="receivingCreateUser" column="receiving_create_user" jdbcType="VARCHAR"/>
+        <result property="receivingUpdateUser" column="receiving_update_user" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="base_colum_list">
+        id, shop_id, xgj_vice_president, xgj_region_id,addresseeName, addressee_mobile, addressee_province, addressee_city,
+        addressee_district, addressee_address, declare_goods_logistics_warehouse, declare_goods_date,
+        warehouse_delivery_date, order_create_time, order_update_time, order_create_user, order_update_user,
+        receiving_firm_name, receiving_ms_bank_account, receiving_ms_bank_branch, bank_unionPay_account,
+        receiving_create_time, receiving_update_time, receiving_create_user, receiving_update_user
+    </sql>
+</mapper>

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

@@ -77,45 +77,45 @@
         from xfsg_point_info a
         left join xfsg_shop_info b on a.shop_id = b.id
         left join store_${eid} c on b.shop_code = c.store_num
-        where deleted = 0 and development_manager = #{request.developmentManager}
+        where a.deleted = 0 and a.development_manager = #{request.developmentManager}
         <if test="request.keyword != null and request.keyword != ''">
-            and (point_code like concat('%', #{request.keyword}, '%') or point_name like concat('%', #{request.keyword},
+            and (a.point_code like concat('%', #{request.keyword}, '%') or a.point_name like concat('%', #{request.keyword},
             '%'))
         </if>
         <if test="request.developmentStartTime != null and request.developmentStartTime != ''">
-            and development_time >= #{request.developmentStartTime}
+            and a.development_time >= #{request.developmentStartTime}
         </if>
         <if test="request.developmentEndTime != null and request.developmentEndTime != ''">
-            <![CDATA[and development_time <= #{request.developmentEndTime}]]>
+            <![CDATA[and a.development_time <= #{request.developmentEndTime}]]>
         </if>
         <if test="request.pointStatusList != null and request.pointStatusList.size() > 0">
-            and point_status in
+            and a.point_status in
             <foreach collection="request.pointStatusList" item="pointStatus" open="(" close=")" separator=",">
                 #{pointStatus}
             </foreach>
         </if>
         <if test="request.storageStatus != null">
-            and storage_status = #{request.storageStatus}
+            and a.storage_status = #{request.storageStatus}
         </if>
         <if test="request.operateUserId != null and request.operateUserId != ''">
-            and operate_user_id = #{request.operateUserId}
+            and a.operate_user_id = #{request.operateUserId}
         </if>
         <if test="request.createStartTime != null and request.createStartTime != ''">
-            and create_time >= #{request.createStartTime}
+            and a.create_time >= #{request.createStartTime}
         </if>
         <if test="request.createEndTime != null and request.createEndTime != ''">
-            <![CDATA[and create_time <= #{request.createEndTime}]]>
+            <![CDATA[and a.create_time <= #{request.createEndTime}]]>
         </if>
         <if test="request.regionIds != null and request.regionIds.size() > 0">
-            and region_id in
+            and a.region_id in
             <foreach collection="request.regionIds" item="regionId" index="index" open="(" separator="," close=")">
                 #{regionId}
             </foreach>
         </if>
         <if test="request.areaCode!=null and request.areaCode!=''">
-            and (province_code = #{request.areaCode} or city_code = #{request.areaCode} or district_code = #{request.areaCode})
+            and (a.province_code = #{request.areaCode} or a.city_code = #{request.areaCode} or a.district_code = #{request.areaCode})
         </if>
-        order by id desc
+        order by a.id desc
     </select>
     <select id="getSelectedShopNum" resultType="com.cool.store.dto.point.LineCountDTO">
         select

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

@@ -67,6 +67,7 @@
       <if test="request.companyRegisteredAddress != null">company_registered_address,</if>
       <if test="request.officeAddress != null">office_address,</if>
       <if test="request.legalName != null">legal_name,</if>
+      <if test="request.legalMobile != null">legal_mobile,</if>
       <if test="request.legalIdCardNo != null">legal_id_card_no,</if>
       <if test="request.legalIdCardFront != null">legal_id_card_front,</if>
       <if test="request.legalIdCardBack != null">legal_id_card_back,</if>
@@ -100,6 +101,7 @@
       <if test="request.companyRegisteredAddress != null">#{request.companyRegisteredAddress},</if>
       <if test="request.officeAddress != null">#{request.officeAddress},</if>
       <if test="request.legalName != null">#{request.legalName},</if>
+      <if test="request.legalMobile != null">#{request.legalMobile},</if>
       <if test="request.legalIdCardNo != null">#{request.legalIdCardNo},</if>
       <if test="request.legalIdCardFront != null">#{request.legalIdCardFront},</if>
       <if test="request.legalIdCardBack != null">#{request.legalIdCardBack},</if>
@@ -134,6 +136,7 @@
       <if test="request.companyRegisteredAddress != null">company_registered_address = #{request.companyRegisteredAddress},</if>
       <if test="request.officeAddress != null">office_address = #{request.officeAddress},</if>
       <if test="request.legalName != null">legal_name = #{request.legalName},</if>
+      <if test="request.legalMobile != null">legal_mobile = #{request.legalMobile},</if>
       <if test="request.legalIdCardNo != null">legal_id_card_no = #{request.legalIdCardNo},</if>
       <if test="request.legalIdCardFront != null">legal_id_card_front = #{request.legalIdCardFront},</if>
       <if test="request.legalIdCardBack != null">legal_id_card_back = #{request.legalIdCardBack},</if>

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

@@ -414,7 +414,8 @@
     </select>
     <select id="getShopListSuccessOpen" resultType="com.cool.store.response.MiniShopsResponse">
         select a.shop_name as shopName,
-        a.id as shopId
+        a.id as shopId,
+        a.shop_code as shopCode
         from  xfsg_shop_info a
         inner join store_${eid} c on a.shop_code = c.store_num
         where a.line_id = #{lineId}

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

@@ -107,6 +107,68 @@ public class AcceptanceInfoDO {
     @Column(name = "plan_exit_time")
     private Date planExitTime;
 
+    /** 快手号*/
+    @Column(name = "ks_account")
+    private String ksAccount;
+
+    /** 核销手机号 */
+    @Column(name = "verification_mobile")
+    private String verificationMobile;
+
+    /** 高德、百度定位截图', */
+    @Column(name = "shop_location_screenshots")
+    private String shopLocationScreenshots;
+
+    /** 门店门头照片*/
+    @Column(name = "shop_doorway_photo")
+    private String shopDoorwayPhoto;
+
+    /** 门店内景照片*/
+    @Column(name = "shop_interior_photo")
+    private String shopInteriorPhoto;
+
+
+    public String getKsAccount() {
+        return ksAccount;
+    }
+
+    public void setKsAccount(String ksAccount) {
+        this.ksAccount = ksAccount;
+    }
+
+    public String getVerificationMobile() {
+        return verificationMobile;
+    }
+
+    public void setVerificationMobile(String verificationMobile) {
+        this.verificationMobile = verificationMobile;
+    }
+
+    public String getShopLocationScreenshots() {
+        return shopLocationScreenshots;
+    }
+
+    public void setShopLocationScreenshots(String shopLocationScreenshots) {
+        this.shopLocationScreenshots = shopLocationScreenshots;
+    }
+
+    public String getShopDoorwayPhoto() {
+        return shopDoorwayPhoto;
+    }
+
+    public void setShopDoorwayPhoto(String shopDoorwayPhoto) {
+        this.shopDoorwayPhoto = shopDoorwayPhoto;
+    }
+
+    public String getShopInteriorPhoto() {
+        return shopInteriorPhoto;
+    }
+
+    public void setShopInteriorPhoto(String shopInteriorPhoto) {
+        this.shopInteriorPhoto = shopInteriorPhoto;
+    }
+
+
     public Date getPlanExitTime() {
         return planExitTime;
     }

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

@@ -94,6 +94,12 @@ public class BuildInformationDO {
     @Column(name = "juridical_handheld_id_card_reverse")
     private String juridicalHandheldIdCardReverse;
 
+    /**
+     * 结算人姓名
+     */
+    @Column(name = "settler_name")
+    private String settlerName;
+
     /**
      * 结算人身份证正面（图片）
      */
@@ -106,6 +112,18 @@ public class BuildInformationDO {
     @Column(name = "settler_id_card_reverse")
     private String settlerIdCardReverse;
 
+    /**
+     * 门店POS收款开户人手持身份证正面
+     */
+    @Column(name = "settler_in_hand_front_picture")
+    private String settlerInHandFrontPicture;
+
+    /**
+     *  门店POS收款开户人手持身份证反面
+     */
+    @Column(name = "settler_in_hand_back_picture")
+    private String settlerInHandBackPicture;
+
     /**
      * 结算人身份证号
      */

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import javax.persistence.Column;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -49,4 +50,11 @@ public class HyPartnerUserInfoDO implements Serializable {
     @ApiModelProperty("微信openid")
     private String openid;
 
+    @ApiModelProperty("盐值")
+    @Column(name = "downstream_system_salting")
+    private  String downstreamSystemSalting;
+
+    @ApiModelProperty("下游系统密码")
+    @Column(name = "downstream_system_password")
+    private String downstreamSystemPassword;
 }

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

@@ -0,0 +1,113 @@
+package com.cool.store.entity;
+
+import lombok.Data;
+import javax.persistence.*;
+import java.util.Date;
+
+@Data // 自动生成 getter、setter、toString 等方法
+@Entity // 标记为 JPA 实体类
+@Table(name = "xfsg_order_sys_info") // 指定表名
+public class OrderSysInfoDO {
+
+    /** 主键ID */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /** 店铺ID */
+    @Column(name = "shop_id")
+    private Long shopId;
+
+    /** 副总裁 */
+    @Column(name = "xgj_vice_president")
+    private String xgjVicePresident;
+
+    /** 新管家对应组织 */
+    @Column(name = "xgj_region_id")
+    private String xgjRegionId;
+
+    /** 收件人 */
+    @Column(name = "addressee_name")
+    private String addresseeName;
+
+     /** 手机号 */
+    @Column(name = "addressee_mobile")
+    private String addresseeMobile;
+
+    /** 收件省 */
+    @Column(name = "addressee_province")
+    private String addresseeProvince;
+
+    /** 收件市 */
+    @Column(name = "addressee_city")
+    private String addresseeCity;
+
+    /** 收件区 */
+    @Column(name = "addressee_district")
+    private String addresseeDistrict;
+
+    /** 详细地址 */
+    @Column(name = "addressee_address")
+    private String addresseeAddress;
+
+    /** 报货物流仓库（编码） */
+    @Column(name = "declare_goods_logistics_warehouse")
+    private String declareGoodsLogisticsWarehouse;
+
+    /** 报货日期 */
+    @Column(name = "declare_goods_date")
+    private String declareGoodsDate;
+
+    /** 仓库配送日期 */
+    @Column(name = "warehouse_delivery_date")
+    private String warehouseDeliveryDate;
+
+    /** 订货信息创建时间 */
+    @Column(name = "order_create_time")
+    private Date orderCreateTime;
+
+    /** 订货信息修改时间 */
+    @Column(name = "order_update_time")
+    private Date orderUpdateTime;
+
+    /** 订货信息创建人 */
+    @Column(name = "order_create_user")
+    private String orderCreateUser;
+
+    /** 订货信息修改人 */
+    @Column(name = "order_update_user")
+    private String orderUpdateUser;
+
+    /** 收款公司名称 */
+    @Column(name = "receiving_firm_name")
+    private String receivingFirmName;
+
+    /** 收款公司民生银行账号 */
+    @Column(name = "receiving_ms_bank_account")
+    private String receivingMsBankAccount;
+
+    /** 收款公司民生银行支行 */
+    @Column(name = "receiving_ms_bank_branch")
+    private String receivingMsBankBranch;
+
+    /** 银行银联号 */
+    @Column(name = "bank_unionPay_account")
+    private String bankUnionPayAccount;
+
+    /** 总部订货收款创建时间 */
+    @Column(name = "receiving_create_time")
+    private Date receivingCreateTime;
+
+    /** 总部订货收款修改时间 */
+    @Column(name = "receiving_update_time")
+    private Date receivingUpdateTime;
+
+    /** 总部订货收款创建人 */
+    @Column(name = "receiving_create_user")
+    private String receivingCreateUser;
+
+    /** 总部订货收款修改人 */
+    @Column(name = "receiving_update_user")
+    private String receivingUpdateUser;
+}

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

@@ -145,6 +145,12 @@ public class QualificationsInfoDO {
     @Column(name = "legal_name")
     private String legalName;
 
+    /**
+     * 法人手机号
+     */
+    @Column(name = "legal_mobile")
+    private String legalMobile;
+
     /**
      * 法人身份证号码
      */

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

@@ -60,4 +60,6 @@ public class SignFranchiseDO {
     private String partnershipSignatoryFirst;
     @Column(name = "partnership_signatory_second")
     private String partnershipSignatorySecond;
+    @Column(name = "business_model")
+    private Integer businessModel;
 }

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -25,8 +26,21 @@ public class AddSignFranchiseRequest {
     private String detailAddress;
 
     @ApiModelProperty("店铺编码")
-    @NotBlank(message = "shopCode不能为空")
+    @NotBlank(message = "店铺编码不能为空")
     private String shopCode;
+
+    @ApiModelProperty("店铺品牌")
+    @NotBlank(message = "店铺品牌不能为空")
+    private String franchiseBrand;
+
+    @ApiModelProperty("经营模式（0 无 1直营 2加盟）")
+    @NotBlank(message = "经营模式不能为空")
+    private Integer businessModel;
+
+    @ApiModelProperty("加盟模式（1-加盟部加盟店、2-加盟公司、3-自有加盟、4-强加盟）")
+    @NotNull(message = "加盟模式不能为空")
+    private Integer joinMode;
+
     /**
      * SignTypeEnum
      */
@@ -99,6 +113,7 @@ public class AddSignFranchiseRequest {
         signFranchiseDO.setContractAmount(this.contractAmount);
         signFranchiseDO.setPartnershipSignatoryFirst(this.partnershipSignatoryFirst);
         signFranchiseDO.setPartnershipSignatorySecond(this.partnershipSignatorySecond);
+        signFranchiseDO.setBusinessModel(this.businessModel);
         return signFranchiseDO;
     }
 

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

@@ -74,11 +74,25 @@ public class BuildInformationRequest {
     @ApiModelProperty("法人手持身份证反面（图片）")
     private String juridicalHandheldIdCardReverse;
 
+    @ApiModelProperty("结算人姓名")
+    @NotBlank(message = "结算人姓名  不能为空")
+    private String settlerName;
+
     @NotBlank(message = "结算人身份证正面  不能为空")
     @Length(max = 250 , message = "结算人身份证正面 长度不能超过250")
     @ApiModelProperty("结算人身份证正面（图片）")
     private String settlerIdCardFront;
 
+    @NotBlank(message = "结算人手持身份证正面   不能为空")
+    @Length(max = 250 , message = "结算人手持身份证正面  长度不能超过250")
+    @ApiModelProperty("结算人手持身份证正面")
+    private String settlerInHandFrontPicture;
+
+    @NotBlank(message = "结算人手持身份证反面   不能为空")
+    @Length(max = 250 , message = "结算人手持身份证反面  长度不能超过250")
+    @ApiModelProperty("结算人手持身份证反面 （图片）")
+    private String settlerInHandBackPicture;
+
     @NotBlank(message = "结算人身份证反面  不能为空")
     @Length(max = 250 , message = "结算人身份证反面 长度不能超过250")
     @ApiModelProperty("结算人身份证反面（图片）")
@@ -121,6 +135,24 @@ public class BuildInformationRequest {
     @ApiModelProperty("公司结算需要:开户许可证")
     private String accountOpeningPermit;
 
+    @ApiModelProperty(value = "收件人")
+    private String addresseeName;
+
+    @ApiModelProperty(value = "手机号" )
+    private String addresseeMobile;
+
+    @ApiModelProperty(value = "收件省" )
+    private String addresseeProvince;
+
+    @ApiModelProperty(value = "收件市" )
+    private String addresseeCity;
+
+    @ApiModelProperty(value = "收件区" )
+    private String addresseeDistrict;
+
+    @ApiModelProperty(value = "详细地址" )
+    private String addresseeAddress;
+
     public BuildInformationDO toDO(){
         BuildInformationDO buildInformationDO = new BuildInformationDO();
         buildInformationDO.setShopId(this.shopId);
@@ -135,8 +167,11 @@ public class BuildInformationRequest {
         buildInformationDO.setJuridicalIdCardReverse(this.juridicalIdCardReverse);
         buildInformationDO.setJuridicalHandheldIdCardFront(this.juridicalHandheldIdCardFront);
         buildInformationDO.setJuridicalHandheldIdCardReverse(this.juridicalHandheldIdCardReverse);
+        buildInformationDO.setSettlerName(this.settlerName);
         buildInformationDO.setSettlerIdCardFront(this.settlerIdCardFront);
         buildInformationDO.setSettlerIdCardReverse(this.settlerIdCardReverse);
+        buildInformationDO.setSettlerInHandFrontPicture(this.settlerInHandFrontPicture);
+        buildInformationDO.setSettlerInHandBackPicture(this.settlerInHandBackPicture);
         buildInformationDO.setSettlerIdCardNo(this.settlerIdCardNo);
         buildInformationDO.setSettlerBankPhotoUrl(this.settlerBankPhotoUrl);
         buildInformationDO.setSettlerBankNumber(this.settlerBankNumber);

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

@@ -79,6 +79,8 @@ public class JoinIntentionRequest {
     private String legalIdCardFront;
     @ApiModelProperty("法人身份证反面")
     private String legalIdCardBack;
+    @ApiModelProperty("法人手机号")
+    private String legalMobile;
     @ApiModelProperty("业务负责人姓名")
     private String businessLeaderName;
     @ApiModelProperty("业务负责人联系方式")
@@ -137,6 +139,7 @@ public class JoinIntentionRequest {
         qualificationsInfoDO.setCompanyRegisteredAddress(this.companyRegisteredAddress);
         qualificationsInfoDO.setOfficeAddress(this.officeAddress);
         qualificationsInfoDO.setLegalName(this.legalName);
+        qualificationsInfoDO.setLegalMobile(this.legalMobile);
         qualificationsInfoDO.setLegalIdCardNo(this.legalIdCardNo);
         qualificationsInfoDO.setLegalIdCardBack(this.legalIdCardBack);
         qualificationsInfoDO.setLegalIdCardFront(this.legalIdCardFront);

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

@@ -0,0 +1,103 @@
+package com.cool.store.request;
+
+import com.cool.store.entity.OrderSysInfoDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class OrderSysInfoRequest {
+    
+    @ApiModelProperty(hidden = true)
+    private Integer type;
+    
+    @ApiModelProperty(value = "店铺ID" ,required = true)
+    @NotNull(message = "门店id不能为空")
+    private Long shopId;
+
+    @ApiModelProperty(value = "副总裁" )
+    private String xgjVicePresident;
+
+    @ApiModelProperty(value = "新管家对应组织" )
+    private String xgjRegionId;
+
+    @ApiModelProperty(value = "收件省" )
+    private String addresseeProvince;
+
+    @ApiModelProperty(value = "收件市" )
+    private String addresseeCity;
+
+    @ApiModelProperty(value = "收件区" )
+    private String addresseeDistrict;
+
+    @ApiModelProperty(value = "详细地址" )
+    private String addresseeAddress;
+
+    @ApiModelProperty(value = "报货物流仓库（编码）" )
+    private String declareGoodsLogisticsWarehouse;
+
+    @ApiModelProperty(value = "报货日期" )
+    private String declareGoodsDate;
+
+    @ApiModelProperty(value = "仓库配送日期" )
+    private String warehouseDeliveryDate;
+
+    @ApiModelProperty(value = "订货信息创建时间" )
+    private Date orderCreateTime;
+
+    @ApiModelProperty(value = "订货信息修改时间" )
+    private Date orderUpdateTime;
+
+    @ApiModelProperty(value = "订货信息创建人" )
+    private String orderCreateUser;
+
+    @ApiModelProperty(value = "订货信息修改人" )
+    private String orderUpdateUser;
+
+    @ApiModelProperty(value = "收款公司名称" )
+    private String receivingFirmName;
+
+    @ApiModelProperty(value = "收款公司民生银行账号" )
+    private String receivingMsBankAccount;
+
+    @ApiModelProperty(value = "收款公司民生银行支行" )
+    private String receivingMsBankBranch;
+
+    @ApiModelProperty(value = "银行银联号" )
+    private String bankUnionPayAccount;
+
+    @ApiModelProperty(value = "总部订货收款创建时间" )
+    private Date receivingCreateTime;
+
+    @ApiModelProperty(value = "总部订货收款修改时间" )
+    private Date receivingUpdateTime;
+
+    @ApiModelProperty(value = "总部订货收款创建人" )
+    private String receivingCreateUser;
+
+    @ApiModelProperty(value = "总部订货收款修改人" )
+    private String receivingUpdateUser;
+    
+    public OrderSysInfoDO toOrderSysInfoDO() {
+        OrderSysInfoDO orderSysInfoDO = new OrderSysInfoDO();
+        orderSysInfoDO.setShopId(this.shopId);
+        orderSysInfoDO.setXgjVicePresident(this.xgjVicePresident);
+        orderSysInfoDO.setXgjRegionId(this.xgjRegionId);
+        orderSysInfoDO.setAddresseeProvince(this.addresseeProvince);
+        orderSysInfoDO.setAddresseeCity(this.addresseeCity);
+        orderSysInfoDO.setAddresseeDistrict(this.addresseeDistrict);
+        orderSysInfoDO.setAddresseeAddress(this.addresseeAddress);
+        orderSysInfoDO.setDeclareGoodsLogisticsWarehouse(this.declareGoodsLogisticsWarehouse);
+        orderSysInfoDO.setDeclareGoodsDate(this.declareGoodsDate);
+        orderSysInfoDO.setWarehouseDeliveryDate(this.warehouseDeliveryDate);
+    
+        orderSysInfoDO.setReceivingFirmName(this.receivingFirmName);
+        orderSysInfoDO.setReceivingMsBankAccount(this.receivingMsBankAccount);
+        orderSysInfoDO.setReceivingMsBankBranch(this.receivingMsBankBranch);
+        orderSysInfoDO.setBankUnionPayAccount(this.bankUnionPayAccount);
+      
+        return orderSysInfoDO;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.cool.store.request;
 
 import com.cool.store.dto.decoration.ThreeAcceptanceDTO;
 import com.cool.store.entity.AssessmentDataDO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -22,4 +23,14 @@ public class ThreeAcceptanceRequest {
     private ThreeAcceptanceDTO operationsAcceptance;
     @ApiModelProperty("加盟商验收")
     private ThreeAcceptanceDTO partnerAcceptance;
+    @ApiModelProperty("快手号")
+    private String ksAccount;
+    @ApiModelProperty("核销手机号")
+    private String verificationPhone;
+    @ApiModelProperty("高德、百度定位截图")
+    private String shopLocationScreenshots;
+    @ApiModelProperty("门店门头照片")
+    private String shopDoorwayPhoto;
+    @ApiModelProperty("门店内景照片")
+    private String shopInteriorPhoto;
 }

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

@@ -0,0 +1,216 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/05/16:29
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ZxjpApiRequest {
+
+    @ApiModelProperty(value = "签约人姓名（可能为多个）")
+    private List<String> partnershipSignatory;
+
+    @ApiModelProperty(value = "签约人手机号")
+    private String partnerMobile;
+
+    @ApiModelProperty(value = "加盟商身份证号")
+    private String partnerIdCardNo;
+
+    @ApiModelProperty("当前铺位编号")
+    private String shopCode;
+
+    @ApiModelProperty("当前加盟商所有铺位编号")
+    private List<String> shopCodeList;
+
+    @ApiModelProperty(value = "CRM加盟注册账号")
+    private String crmAccount;
+
+    @ApiModelProperty(value = "分销易账号")
+    private String fxyAccount;
+
+    @ApiModelProperty(value = "新掌柜")
+    private String  xjzAccount;
+
+    @ApiModelProperty(value = "云流水账号")
+    private String  ylsAccount;
+
+    @ApiModelProperty(value = "微企付")
+    private String  wqfAccount;
+
+    @ApiModelProperty(value = "下游系统密码")
+    private String  downstreamSystemPassword ;
+
+    @ApiModelProperty(value = "下游系统密码盐值")
+    private String  downstreamSystemSalt;
+
+    @ApiModelProperty(value = "下游系统店铺名称")
+    private String downstreamSystemShopName;
+
+    @ApiModelProperty(value = "店铺品牌")
+    private String franchiseBrand;
+
+    @ApiModelProperty(value = "新管家对应组织")
+    private String  xgjRegionId;
+
+    @ApiModelProperty(value = "新管家副总裁")
+    private String  xgjVicePresident;
+
+    @ApiModelProperty(value = "所属督导")
+    private String  shopSupervisorUserName;
+
+    @ApiModelProperty(value = "门店类型（1-加盟公司、2-加盟部加盟店、3-自有加盟、4-强加盟、）")
+    private Integer joinModel;
+
+    @ApiModelProperty(value = "经营模式（0 无 1直营 2加盟）")
+    private Integer businessModel;
+
+    @ApiModelProperty(value = "门店门头照片")
+    private List<String>  shopDoorwayPhoto;
+
+    @ApiModelProperty(value = "门店内景照片")
+    private List<String>  shopInteriorPhoto;
+
+    @ApiModelProperty(value = "营业时间")
+    private String  businessHours;
+
+    @ApiModelProperty(value = "营业执照照片")
+    private String  creditUrl;
+
+    @ApiModelProperty(value = "食品经营许可证")
+    private String  foodBusinessLicenseUrl ;
+
+    @ApiModelProperty(value = " 法人姓名")
+    private String  legalName;
+
+    @ApiModelProperty(value = "法人身份证正面照片")
+    private String legalIdCardFront;
+
+    @ApiModelProperty(value = "法人身份证反面照片")
+    private String legalIdCardBack;
+
+    @ApiModelProperty(value = "法人手机号")
+    private String legalMobile;
+
+    @ApiModelProperty(value = "经营者姓名")
+    private String  shopContactName;
+
+    @ApiModelProperty(value = "门店营业手机号/电话")
+    private String businessMobile;
+
+    @ApiModelProperty(value = "门店经营省市区")
+    private String  shopProvinceCityDistrict;
+
+    @ApiModelProperty(value = "门店经度")
+    private String  shopLongitude;
+
+    @ApiModelProperty(value = "门店纬度")
+    private String  shopLatitude;
+
+    @ApiModelProperty(value = "高德、百度定位截图")
+    private String  shopLocationPictures;
+
+    @ApiModelProperty(value = "门店详细地址")
+    private String  shopAddress;
+
+    @ApiModelProperty(value = "核销手机号")
+    private String  verificationMobile;
+
+    @ApiModelProperty(value = "快手号")
+    private String  ksAccount;
+
+    @ApiModelProperty(value = "门店POS收款开户人开户人姓名")
+    private String  settlerName;
+
+    @ApiModelProperty(value = "门店POS收款银行卡照片")
+    private String  settlerBankPhotoUrl;
+
+    @ApiModelProperty(value = "门店POS收款银行卡反面")
+    private String  settlerBankBackPhotoUrl;
+
+    @ApiModelProperty(value = "门店POS收款银行卡办理支行名称")
+    private String  settlerBankBranchName;
+
+    @ApiModelProperty(value = "门店POS收款银行卡号")
+    private String  settlerBankNumber;
+
+    @ApiModelProperty(value = "门店省")
+    private String  shopProvince;
+
+    @ApiModelProperty(value = "门店市")
+    private String  shopCity;
+
+    @ApiModelProperty(value = "门店POS收款银行卡预留手机号")
+    private String  settlerBankMobile;
+
+    @ApiModelProperty(value = "门店POS收款开户人身份证正面照片")
+    private String  settlerIdCardFront;
+
+    @ApiModelProperty(value = "门店POS收款开户人身份证反面照片")
+    private String  settlerIdCardReverse;
+
+    @ApiModelProperty(value = "门店POS收款开户人手持身份证正面")
+    private String settlerInHandFrontPicture;
+
+    @ApiModelProperty(value = "门店POS收款开户人手持身份证反面")
+    private String settlerInHandBackPicture;
+
+    @ApiModelProperty(value = "门店POS收款开户人身份证号")
+    private String  settlerIdCardNo;
+
+    @ApiModelProperty(value = "收件人姓名")
+    private String  addresseeName ;
+
+    @ApiModelProperty(value = "收件人手机号")
+    private String  addresseeMobile ;
+
+    @ApiModelProperty(value = "订货信息收件省")
+    private String  addresseeProvince ;
+
+    @ApiModelProperty(value = "订货信息收件市")
+    private String  addresseeCity ;
+
+    @ApiModelProperty(value = "订货信息收件区")
+    private String  addresseeDistrict ;
+
+    @ApiModelProperty(value = "订货信息收件详细地址")
+    private String  addresseeAddress ;
+
+    @ApiModelProperty(value = "报货物流仓库(编码)")
+    private String  declareGoodsLogisticsWarehouse ;
+
+    @ApiModelProperty(value = "报货日期")
+    private String  declareGoodsDate ;
+
+    @ApiModelProperty(value = "仓库配送日期")
+    private String  warehouseDeliveryDate ;
+
+    @ApiModelProperty(value = "收款公司名称")
+    private String  receivingFirmName;
+
+    @ApiModelProperty(value = "收款公司民生银行账号")
+    private String  receivingMSBankAccount;
+
+    @ApiModelProperty(value = "收款公司民生银行支行")
+    private String  receivingMSBankBranch;
+
+    @ApiModelProperty(value = "银行银联号")
+    private String  bankUnionPayAccount;
+
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @Data
@@ -172,5 +174,17 @@ public class AddSignFranchiseResponse {
     @ApiModelProperty("合伙签约人2")
     private String partnershipSignatorySecond;
 
+    @ApiModelProperty("店铺编码")
+    private String shopCode;
+
+    @ApiModelProperty("店铺品牌")
+    private String franchiseBrand;
+
+    @ApiModelProperty("经营模式（0 无 1直营 2加盟）")
+    private Integer businessModel;
+
+    @ApiModelProperty("加盟模式（1-加盟部加盟店、2-加盟公司、3-自有加盟、4-强加盟）")
+    private Integer joinMode;
+
 
 }

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

@@ -71,12 +71,21 @@ public class BuildInformationResponse {
     @ApiModelProperty("法人手持身份证反面（图片）")
     private String juridicalHandheldIdCardReverse;
 
+    @ApiModelProperty("结算人姓名")
+    private String settlerName;
+
     @ApiModelProperty("结算人身份证正面（图片）")
     private String settlerIdCardFront;
 
     @ApiModelProperty("结算人身份证反面（图片）")
     private String settlerIdCardReverse;
 
+    @ApiModelProperty("结算人手持身份证正面")
+    private String settlerInHandFrontPicture;
+
+    @ApiModelProperty("结算人手持身份证反面")
+    private String settlerInHandBackPicture;
+
     @ApiModelProperty("结算人身份证号")
     private String settlerIdCardNo;
 
@@ -102,4 +111,66 @@ public class BuildInformationResponse {
     @ApiModelProperty("公司结算需要:开户许可证")
     private String accountOpeningPermit;
 
+    @ApiModelProperty(value = "副总裁" )
+    private String xgjVicePresident;
+
+    @ApiModelProperty(value = "新管家对应组织" )
+    private String xgjRegionId;
+
+    @ApiModelProperty(value = "收件省" )
+    private String addresseeProvince;
+
+    @ApiModelProperty(value = "收件市" )
+    private String addresseeCity;
+
+    @ApiModelProperty(value = "收件区" )
+    private String addresseeDistrict;
+
+    @ApiModelProperty(value = "详细地址" )
+    private String addresseeAddress;
+
+    @ApiModelProperty(value = "报货物流仓库（编码）" )
+    private String declareGoodsLogisticsWarehouse;
+
+    @ApiModelProperty(value = "报货日期" )
+    private String declareGoodsDate;
+
+    @ApiModelProperty(value = "仓库配送日期" )
+    private String warehouseDeliveryDate;
+
+    @ApiModelProperty(value = "订货信息创建时间" )
+    private Date orderCreateTime;
+
+    @ApiModelProperty(value = "订货信息修改时间" )
+    private Date orderUpdateTime;
+
+    @ApiModelProperty(value = "订货信息创建人" )
+    private String orderCreateUser;
+
+    @ApiModelProperty(value = "订货信息修改人" )
+    private String orderUpdateUser;
+
+    @ApiModelProperty(value = "收款公司名称" )
+    private String receivingFirmName;
+
+    @ApiModelProperty(value = "收款公司民生银行账号" )
+    private String receivingMsBankAccount;
+
+    @ApiModelProperty(value = "收款公司民生银行支行" )
+    private String receivingMsBankBranch;
+
+    @ApiModelProperty(value = "银行银联号" )
+    private String bankUnionPayAccount;
+
+    @ApiModelProperty(value = "总部订货收款创建时间" )
+    private Date receivingCreateTime;
+
+    @ApiModelProperty(value = "总部订货收款修改时间" )
+    private Date receivingUpdateTime;
+
+    @ApiModelProperty(value = "总部订货收款创建人" )
+    private String receivingCreateUser;
+
+    @ApiModelProperty(value = "总部订货收款修改人" )
+    private String receivingUpdateUser;
 }

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

@@ -9,39 +9,39 @@ import java.util.List;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class IncomeSummaryResponse {
 
-    @ApiModelProperty("现金")
+    @ApiModelProperty(value = "现金")
     private PaymentDetail offline;
-    @ApiModelProperty("微信")
+    @ApiModelProperty(value ="微信")
     private PaymentDetail wechat;
-    @ApiModelProperty("支付宝")
+    @ApiModelProperty(value ="支付宝")
     private PaymentDetail ali;
-    @ApiModelProperty("会员卡")
+    @ApiModelProperty(value ="会员卡")
     private PaymentDetail vip;
-    @ApiModelProperty("美团券核销")
+    @ApiModelProperty(value ="美团券核销")
     private PaymentDetail meituan_coupon;
-    @ApiModelProperty("抖音券核销")
+    @ApiModelProperty(value ="抖音券核销")
     private PaymentDetail douyin_coupon;
-    @ApiModelProperty("快手券核销")
+    @ApiModelProperty(value ="快手券核销")
     private PaymentDetail kuaishou_coupon;
-    @ApiModelProperty("口碑券核销")
+    @ApiModelProperty(value ="口碑券核销")
     private PaymentDetail koubei_coupon;
-    @ApiModelProperty("支付宝券核销")
+    @ApiModelProperty(value ="支付宝券核销")
     private PaymentDetail zfb_coupon;
-    @ApiModelProperty("云闪付")
+    @ApiModelProperty(value ="云闪付")
     private PaymentDetail union_pay;
-    @ApiModelProperty("龙支付")
+    @ApiModelProperty(value ="龙支付")
     private PaymentDetail dragon_pay;
-    @ApiModelProperty("其他支付")
+    @ApiModelProperty(value ="其他支付")
     private OtherPayDetail other_pay;
-    @ApiModelProperty("补贴金额")
+    @ApiModelProperty(value ="补贴金额")
     private PaymentDetail subsidy_total;
-    @ApiModelProperty("配送费支出")
+    @ApiModelProperty(value ="配送费支出")
     private PaymentDetail logistics_cost_price_total;
-    @ApiModelProperty("饿了么外卖")
+    @ApiModelProperty(value ="饿了么外卖")
     private PaymentDetail eleme;
-    @ApiModelProperty("美团外卖")
+    @ApiModelProperty(value ="美团外卖")
     private PaymentDetail meituan;
-    @ApiModelProperty("APP")
+    @ApiModelProperty(value ="APP")
     private PaymentDetail wenma_app;
 }
 

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

@@ -1,5 +1,6 @@
 package com.cool.store.response;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,5 +12,8 @@ import lombok.Data;
 @Data
 public class MiniShopsResponse {
     private Long shopId;
+    @ApiModelProperty("店铺名称")
     private String shopName;
+    @ApiModelProperty("店铺编码")
+    private String shopCode;
 }

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

@@ -12,10 +12,10 @@ import lombok.Data;
 public class ProfitDataResponse {
     @ApiModelProperty("⻔店编码")
     private String store_code;
-    @ApiModelProperty("上⽉⽑利率")
+    @ApiModelProperty("截⽌到上⽉累计⽑利/累计⽑利")
     private Double profit_total_amt;
-    @ApiModelProperty("截⽌到上⽉累计⽑利")
+    @ApiModelProperty("上⽉⽑利/⽑利")
     private Double profit_amt;
-    @ApiModelProperty("上⽉⽑利")
+    @ApiModelProperty("上⽉⽑利率/⽑利率")
     private Double profit_rate;
 }

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

@@ -77,6 +77,8 @@ public class PartnerBaseInfoVO {
     private String legalIdCardFront;
     @ApiModelProperty("法人身份证反面")
     private String legalIdCardBack;
+    @ApiModelProperty("法人手机号")
+    private String legalMobile;
     @ApiModelProperty("业务负责人姓名")
     private String businessLeaderName;
     @ApiModelProperty("业务负责人联系方式")
@@ -129,6 +131,7 @@ public class PartnerBaseInfoVO {
         partnerBaseInfoVO.setCompanyRegisteredAddress(qualificationsInfoDO.getCompanyRegisteredAddress());
         partnerBaseInfoVO.setOfficeAddress(qualificationsInfoDO.getOfficeAddress());
         partnerBaseInfoVO.setLegalName(qualificationsInfoDO.getLegalName());
+        partnerBaseInfoVO.setLegalMobile(qualificationsInfoDO.getLegalMobile());
         partnerBaseInfoVO.setLegalIdCardNo(qualificationsInfoDO.getLegalIdCardNo());
         partnerBaseInfoVO.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack());
         partnerBaseInfoVO.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront());

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

@@ -0,0 +1,16 @@
+package com.cool.store.service;
+
+import com.cool.store.request.OrderSysInfoRequest;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/06/16:07
+ * @Version 1.0
+ * @注释:
+ */
+public interface OrderSysInfoService {
+
+
+    Integer updateByShopId(OrderSysInfoRequest request,String userId);
+}

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

@@ -5,6 +5,7 @@ import com.cool.store.dao.*;
 import com.cool.store.entity.*;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.enums.MessageEnum;
+import com.cool.store.enums.OrderSysTypeEnum;
 import com.cool.store.enums.UserRoleEnum;
 import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
@@ -15,6 +16,7 @@ import com.cool.store.service.BuildInformationService;
 import com.cool.store.mapper.BuildInformationMapper;
 import com.cool.store.service.PreparationService;
 import com.cool.store.service.UserAuthMappingService;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +51,8 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
     private CommonService commonService;
     @Autowired
     private UserAuthMappingService userAuthMappingService;
+    @Autowired
+    private OrderSysInfoDAO orderSysInfoDAO;
     @Override
     public BuildInformationResponse getBuildInformation(Long shopId) {
         BuildInformationResponse response = new BuildInformationResponse();
@@ -68,30 +72,54 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
         }
         BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId);
         if (Objects.nonNull(informationDO)) {
-            response.setShopContactName(informationDO.getShopContactName());
+            extracted(response, informationDO);
-            response.setShopContactMobile(informationDO.getShopContactMobile());
+        }
-            response.setBusinessHours(informationDO.getBusinessHours());
+        OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(shopId);
-            response.setBusinessMobile(informationDO.getBusinessMobile());
+        if (Objects.nonNull(orderSysInfoDO)){
-            response.setDoorPhoto(informationDO.getDoorPhoto());
+            response.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident());
-            response.setInStorePhoto(informationDO.getInStorePhoto());
+            response.setXgjRegionId(orderSysInfoDO.getXgjRegionId());
-            response.setJuridicalIdCardFront(informationDO.getJuridicalIdCardFront());
+            response.setAddresseeProvince(orderSysInfoDO.getAddresseeProvince());
-            response.setJuridicalIdCardNo(informationDO.getJuridicalIdCardNo());
+            response.setAddresseeCity(orderSysInfoDO.getAddresseeCity());
-            response.setJuridicalIdCardReverse(informationDO.getJuridicalIdCardReverse());
+            response.setAddresseeDistrict(orderSysInfoDO.getAddresseeDistrict());
-            response.setJuridicalHandheldIdCardReverse(informationDO.getJuridicalHandheldIdCardReverse());
+            response.setAddresseeAddress(orderSysInfoDO.getAddresseeAddress());
-            response.setJuridicalHandheldIdCardFront(informationDO.getJuridicalHandheldIdCardFront());
+            response.setDeclareGoodsLogisticsWarehouse(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse());
-            response.setJuridicalHandheldIdCardReverse(informationDO.getJuridicalHandheldIdCardReverse());
+            response.setDeclareGoodsDate(orderSysInfoDO.getDeclareGoodsDate());
-            response.setSettlerIdCardNo(informationDO.getSettlerIdCardNo());
+            response.setWarehouseDeliveryDate(orderSysInfoDO.getWarehouseDeliveryDate());
-            response.setSettlerBankPhotoUrl(informationDO.getSettlerBankPhotoUrl());
+            response.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName());
-            response.setSettlerIdCardFront(informationDO.getSettlerIdCardFront());
+            response.setReceivingMsBankAccount(orderSysInfoDO.getReceivingMsBankAccount());
-            response.setSettlerIdCardReverse(informationDO.getSettlerIdCardReverse());
+            response.setReceivingMsBankBranch(orderSysInfoDO.getReceivingMsBankBranch());
-            response.setSettlerBankNumber(informationDO.getSettlerBankNumber());
+            response.setBankUnionPayAccount(orderSysInfoDO.getBankUnionPayAccount());
-            response.setSettlerBankMobile(informationDO.getSettlerBankMobile());
-            response.setSettlerBankName(informationDO.getSettlerBankName());
-            response.setAuthorizationUrl(informationDO.getAuthorizationUrl());
-            response.setRelationshipProve(informationDO.getRelationshipProve());
-            response.setAccountOpeningPermit(informationDO.getAccountOpeningPermit());
         }
         return response;
+
+    }
+
+    private static void extracted(BuildInformationResponse response, BuildInformationDO informationDO) {
+        response.setShopContactName(informationDO.getShopContactName());
+        response.setShopContactMobile(informationDO.getShopContactMobile());
+        response.setBusinessHours(informationDO.getBusinessHours());
+        response.setBusinessMobile(informationDO.getBusinessMobile());
+        response.setDoorPhoto(informationDO.getDoorPhoto());
+        response.setInStorePhoto(informationDO.getInStorePhoto());
+        response.setJuridicalIdCardFront(informationDO.getJuridicalIdCardFront());
+        response.setJuridicalIdCardNo(informationDO.getJuridicalIdCardNo());
+        response.setJuridicalIdCardReverse(informationDO.getJuridicalIdCardReverse());
+        response.setJuridicalHandheldIdCardReverse(informationDO.getJuridicalHandheldIdCardReverse());
+        response.setJuridicalHandheldIdCardFront(informationDO.getJuridicalHandheldIdCardFront());
+        response.setJuridicalHandheldIdCardReverse(informationDO.getJuridicalHandheldIdCardReverse());
+        response.setSettlerIdCardNo(informationDO.getSettlerIdCardNo());
+        response.setSettlerName(informationDO.getSettlerName());
+        response.setSettlerBankPhotoUrl(informationDO.getSettlerBankPhotoUrl());
+        response.setSettlerIdCardFront(informationDO.getSettlerIdCardFront());
+        response.setSettlerIdCardReverse(informationDO.getSettlerIdCardReverse());
+        response.setSettlerBankNumber(informationDO.getSettlerBankNumber());
+        response.setSettlerBankMobile(informationDO.getSettlerBankMobile());
+        response.setSettlerBankName(informationDO.getSettlerBankName());
+        response.setAuthorizationUrl(informationDO.getAuthorizationUrl());
+        response.setRelationshipProve(informationDO.getRelationshipProve());
+        response.setAccountOpeningPermit(informationDO.getAccountOpeningPermit());
+        response.setSettlerInHandFrontPicture(informationDO.getSettlerInHandFrontPicture());
+        response.setSettlerInHandBackPicture(informationDO.getSettlerInHandBackPicture());
     }
 
     @Override
@@ -99,13 +127,12 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
     public Integer submitOrUpdate(BuildInformationRequest request) {
         BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(request.getShopId());
         BuildInformationDO buildInformationDO = request.toDO();
+        OrderSysInfoDO orderSysInfoDO = getOrderSysInfoDO(request);
+        orderSysInfoDAO.updateByShopId(orderSysInfoDO);
         if (Objects.isNull(informationDO)) {
             buildInformationDO.setCreateTime(new Date());
             buildInformationDO.setUpdateTime(new Date());
-            shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153);
+            shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151);
-            //初始化数据
-            preparationService.licenseCompleted(request.getShopId());
-            preparationService.sysStoreCompleted(request.getShopId());
             ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId());
             LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
             HashMap<String, String> map = new HashMap<>();
@@ -118,31 +145,7 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
                 itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
             }
             commonService.sendQWMessage(itUsers,
-                    MessageEnum.MESSAGE_39,
+                    MessageEnum.MESSAGE_52,
-                    map);
-            List<EnterpriseUserDO> posList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.HUO_MA_EMPLOYEE, shopInfoDO.getRegionId());
-            List<String> posUsers = new ArrayList<>();
-            if (Objects.nonNull(posList)){
-                posUsers.addAll( posList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
-            }
-            commonService.sendQWMessage(posUsers,
-                    MessageEnum.MESSAGE_38,
-                    map);
-            List<EnterpriseUserDO> xfList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.XIN_FA_SYS_CUSTOMER, shopInfoDO.getRegionId());
-            List<String> xfUsers = new ArrayList<>();
-            if(Objects.nonNull(xfList)){
-                xfUsers.addAll(xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
-            }
-            commonService.sendQWMessage(xfUsers,
-                    MessageEnum.MESSAGE_40,
-                    map);
-            List<EnterpriseUserDO> zxtList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.TENT_PASS_CUSTOMER, shopInfoDO.getRegionId());
-            List<String> zxtUsers = new ArrayList<>();
-            if(Objects.nonNull(zxtList)){
-                zxtUsers.addAll(zxtList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
-            }
-            commonService.sendQWMessage(zxtUsers,
-                    MessageEnum.MESSAGE_41,
                     map);
             return buildInformationDAO.insertSelective(buildInformationDO);
         }else {
@@ -152,6 +155,18 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
 
     }
 
+    private static @NotNull OrderSysInfoDO getOrderSysInfoDO(BuildInformationRequest request) {
+        OrderSysInfoDO orderSysInfoDO = new OrderSysInfoDO();
+        orderSysInfoDO.setShopId(request.getShopId());
+        orderSysInfoDO.setAddresseeName(request.getAddresseeName());
+        orderSysInfoDO.setAddresseeMobile(request.getAddresseeMobile());
+        orderSysInfoDO.setAddresseeProvince(request.getAddresseeProvince());
+        orderSysInfoDO.setAddresseeCity(request.getAddresseeCity());
+        orderSysInfoDO.setAddresseeDistrict(request.getAddresseeDistrict());
+        orderSysInfoDO.setAddresseeAddress(request.getAddresseeAddress());
+        return orderSysInfoDO;
+    }
+
     @Override
     public Integer getJoinType(Long lineId) {
         QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId);

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

@@ -359,6 +359,9 @@ public class DecorationServiceImpl implements DecorationService {
             acceptanceInfoDO.setShopId(request.getShopId());
             acceptanceInfoDO.setPartnerAcceptanceSignatures(jsonString);
             acceptanceInfoDO.setUpdateTime(new Date());
+            acceptanceInfoDO.setKsAccount(request.getKsAccount());
+            acceptanceInfoDO.setVerificationMobile(request.getVerificationPhone());
+            acceptanceInfoDO.setShopLocationScreenshots(request.getShopLocationScreenshots());
             acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
         }
         //更新阶段状态验收中
@@ -698,6 +701,8 @@ public class DecorationServiceImpl implements DecorationService {
             acceptanceInfoDO.setOperationsAcceptanceSignatures(jsonString);
             acceptanceInfoDO.setUpdateTime(new Date());
             acceptanceInfoDO.setActualAcceptanceTime(new Date());
+            acceptanceInfoDO.setShopDoorwayPhoto(request.getShopDoorwayPhoto());
+            acceptanceInfoDO.setShopInteriorPhoto(request.getShopInteriorPhoto());
             acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
             if (CommonConstants.ONE == request.getOperationsAcceptance().getResult()
                     && CommonConstants.ONE == partner.getResult()) {

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

@@ -2,6 +2,7 @@ package com.cool.store.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
+import com.cool.store.dao.HyPartnerUserInfoDAO;
 import com.cool.store.dao.LineInfoDAO;
 import com.cool.store.dao.QualificationsInfoDAO;
 import com.cool.store.dao.RegionAreaConfigDao;
@@ -15,6 +16,7 @@ import com.cool.store.mapper.LineInfoMapper;
 import com.cool.store.request.JoinIntentionRequest;
 import com.cool.store.service.JoinIntentionService;
 import com.cool.store.service.UserAuthMappingService;
+import com.cool.store.utils.PasswordUtil;
 import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.utils.poi.StringUtils;
 import com.cool.store.vo.PartnerBaseInfoVO;
@@ -26,10 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.text.MessageFormat;
-import java.util.Collections;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
 
 
 @Service
@@ -63,6 +62,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
 
     @Resource
     CommonService commonService;
+    @Resource
+    HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -108,6 +109,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     protected Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) {
         WorkflowSubStageEnum workflowSubStageEnum = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage());
         WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage();
@@ -116,6 +118,20 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
         lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId);
         //更新加盟问卷信息
         qualificationsInfoDAO.updateAuditIdByLineId(auditId, lineInfo.getId());
+        QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfo.getId());
+        if (StringUtils.isBlank(qualificationsInfoDO.getIdCardNo())||qualificationsInfoDO.getIdCardNo().length()<6){
+            throw new ServiceException(ErrorCodeEnum.CREATE_PASSWORD_FAIL);
+        }
+        String substring = qualificationsInfoDO.getIdCardNo().substring(qualificationsInfoDO.getIdCardNo().length() - 6);
+        //生成密码和盐值
+        byte[] saltBytes = PasswordUtil.generateSalt();
+        String salt = PasswordUtil.bytesToHex(saltBytes);
+        String password = PasswordUtil.encryptPassword(substring, saltBytes);
+        HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(lineInfo.getPartnerId());
+        hyPartnerUserInfoDO.setDownstreamSystemPassword(password);
+        hyPartnerUserInfoDO.setDownstreamSystemSalting(salt);
+        hyPartnerUserInfoDO.setUpdateTime(new Date());
+        hyPartnerUserInfoDAO.updateByPartnerId(hyPartnerUserInfoDO);
         return Boolean.TRUE;
     }
 

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

@@ -0,0 +1,148 @@
+package com.cool.store.service.impl;
+
+import com.cool.store.dao.LineInfoDAO;
+import com.cool.store.dao.OrderSysInfoDAO;
+import com.cool.store.dao.ShopInfoDAO;
+import com.cool.store.dao.ShopStageInfoDAO;
+import com.cool.store.entity.EnterpriseUserDO;
+import com.cool.store.entity.LineInfoDO;
+import com.cool.store.entity.OrderSysInfoDO;
+import com.cool.store.entity.ShopInfoDO;
+import com.cool.store.enums.MessageEnum;
+import com.cool.store.enums.OrderSysTypeEnum;
+import com.cool.store.enums.UserRoleEnum;
+import com.cool.store.enums.point.ShopSubStageStatusEnum;
+import com.cool.store.request.OrderSysInfoRequest;
+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 javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/06/16:07
+ * @Version 1.0
+ * @注释:
+ */
+@Service
+public class OrderSysInfoServiceImpl implements OrderSysInfoService {
+
+    @Resource
+    private OrderSysInfoDAO orderSysInfoDAO;
+    @Resource
+    private ShopStageInfoDAO shopStageInfoDAO;
+    @Resource
+    private PreparationServiceImpl preparationService;
+    @Resource
+    private UserAuthMappingService userAuthMappingService;
+    @Resource
+    private CommonService commonService;
+    @Resource
+    private ShopInfoDAO shopInfoDAO;
+    @Resource
+    private LineInfoDAO lineInfoDAO;
+
+
+    @Override
+    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());
+            orderSysInfoDO.setXgjRegionId(request.getXgjRegionId());
+            orderSysInfoDO.setAddresseeProvince(request.getAddresseeProvince());
+            orderSysInfoDO.setAddresseeCity(request.getAddresseeCity());
+            orderSysInfoDO.setAddresseeDistrict(request.getAddresseeDistrict());
+            orderSysInfoDO.setAddresseeAddress(request.getAddresseeAddress());
+            orderSysInfoDO.setDeclareGoodsLogisticsWarehouse(request.getDeclareGoodsLogisticsWarehouse());
+            orderSysInfoDO.setDeclareGoodsDate(request.getDeclareGoodsDate());
+            orderSysInfoDO.setWarehouseDeliveryDate(request.getWarehouseDeliveryDate());
+            if (Objects.isNull(orderSysInfoDO.getOrderCreateTime())) {
+                orderSysInfoDO.setOrderCreateTime(new Date());
+                orderSysInfoDO.setOrderCreateUser(userId);
+                shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152);
+                ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId());
+                LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
+                HashMap<String, String> map = new HashMap<>();
+                map.put("partnerUsername",lineInfoDO.getUsername());
+                map.put("partnerMobile",lineInfoDO.getMobile());
+                map.put("storeName",shopInfoDO.getShopName());
+                List<EnterpriseUserDO> itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId());
+                List<String> itUsers = new ArrayList<>();
+                if (Objects.nonNull(itList)){
+                    itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
+                }
+                commonService.sendQWMessage(itUsers,
+                        MessageEnum.MESSAGE_53,
+                        map);
+               return orderSysInfoDAO.updateByShopId(orderSysInfoDO);
+            }else{
+                orderSysInfoDO.setOrderUpdateTime(new Date());
+                orderSysInfoDO.setOrderUpdateUser(userId);
+               return orderSysInfoDAO.updateByShopId(orderSysInfoDO);
+            }
+        }
+        if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())) {
+            orderSysInfoDO.setReceivingFirmName(request.getReceivingFirmName());
+            orderSysInfoDO.setReceivingMsBankAccount(request.getReceivingMsBankAccount());
+            orderSysInfoDO.setReceivingMsBankBranch(request.getReceivingMsBankBranch());
+            orderSysInfoDO.setBankUnionPayAccount(request.getBankUnionPayAccount());
+            if (Objects.isNull(orderSysInfoDO.getReceivingCreateTime())) {
+                orderSysInfoDO.setReceivingCreateTime(new Date());
+                orderSysInfoDO.setReceivingCreateUser(userId);
+                shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153);
+                //初始化数据
+                preparationService.licenseCompleted(request.getShopId());
+                preparationService.sysStoreCompleted(request.getShopId());
+
+                ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId());
+                LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
+                HashMap<String, String> map = new HashMap<>();
+                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<String> itUsers = new ArrayList<>();
+                if (Objects.nonNull(itList)){
+                    itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
+                }
+                commonService.sendQWMessage(itUsers,
+                        MessageEnum.MESSAGE_39,
+                        map);
+                List<EnterpriseUserDO> posList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.HUO_MA_EMPLOYEE, shopInfoDO.getRegionId());
+                List<String> posUsers = new ArrayList<>();
+                if (Objects.nonNull(posList)){
+                    posUsers.addAll( posList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
+                }
+                commonService.sendQWMessage(posUsers,
+                        MessageEnum.MESSAGE_38,
+                        map);
+                List<EnterpriseUserDO> xfList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.XIN_FA_SYS_CUSTOMER, shopInfoDO.getRegionId());
+                List<String> xfUsers = new ArrayList<>();
+                if(Objects.nonNull(xfList)){
+                    xfUsers.addAll(xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
+                }
+                commonService.sendQWMessage(xfUsers,
+                        MessageEnum.MESSAGE_40,
+                        map);
+                List<EnterpriseUserDO> zxtList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.TENT_PASS_CUSTOMER, shopInfoDO.getRegionId());
+                List<String> zxtUsers = new ArrayList<>();
+                if(Objects.nonNull(zxtList)){
+                    zxtUsers.addAll(zxtList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
+                }
+                commonService.sendQWMessage(zxtUsers,
+                        MessageEnum.MESSAGE_41,
+                        map);
+             return    orderSysInfoDAO.updateByShopId(orderSysInfoDO);
+            }else{
+                orderSysInfoDO.setReceivingUpdateTime(new Date());
+                orderSysInfoDO.setReceivingUpdateUser(userId);
+              return   orderSysInfoDAO.updateByShopId(orderSysInfoDO);
+            }
+        }
+        return null;
+    }
+}

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

@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.context.LoginUserInfo;
+import com.cool.store.dao.OrderSysInfoDAO;
 import com.cool.store.dao.QualificationsInfoDAO;
 import com.cool.store.dao.ShopStageInfoDAO;
 import com.cool.store.entity.*;
@@ -97,6 +98,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
     @Resource
     RegionMapper regionMapper;
 
+    @Resource
+    private OrderSysInfoDAO orderSysInfoDAO;
+
 
     @Override
     public Boolean auditResult(AuditResultRequest request) {
@@ -206,8 +210,16 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                 shopInfoDO.setShopName(request.getShopName());
                 shopInfoDO.setDetailAddress(request.getDetailAddress());
                 shopInfoDO.setShopCode(request.getShopCode());
+                shopInfoDO.setJoinMode(request.getJoinMode());
+                shopInfoDO.setFranchiseBrand(request.getFranchiseBrand());
+                shopInfoDO.setUpdateTime(new Date());
                 shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO);
-
+                OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());
+                if (Objects.isNull(orderSysInfoDO)){
+                    orderSysInfoDO = new OrderSysInfoDO();
+                    orderSysInfoDO.setShopId(request.getShopId());
+                    orderSysInfoDAO.insertSelective(orderSysInfoDO);
+                }
                 return new ResponseResult(200000, "提交成功");
             } else {
                 throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION);
@@ -291,6 +303,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             addSignFranchiseResponse.setContractAmount(signFranchiseDO.getContractAmount());
             addSignFranchiseResponse.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
             addSignFranchiseResponse.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
+            addSignFranchiseResponse.setBusinessModel(signFranchiseDO.getBusinessModel());
 
         } else {
             BigDecimal total = new BigDecimal(franchiseFeeDO.getYearFranchiseFee())
@@ -302,6 +315,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             addSignFranchiseResponse.setMobile(lineInfoDO.getMobile());
         }
         addSignFranchiseResponse.setStoreName(shopInfoDO.getShopName());
+        addSignFranchiseResponse.setShopCode(shopInfoDO.getShopCode());
+        addSignFranchiseResponse.setFranchiseBrand(shopInfoDO.getFranchiseBrand());
+        addSignFranchiseResponse.setJoinMode(shopInfoDO.getJoinMode());
 
         if (Objects.nonNull(regionInfo)) {
             addSignFranchiseResponse.setRegionId(shopInfoDO.getRegionId());

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

@@ -0,0 +1,45 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.enums.OrderSysTypeEnum;
+import com.cool.store.request.OrderSysInfoRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.OrderSysInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/06/17:39
+ * @Version 1.0
+ * @注释:
+ */
+@Api("pc订货信息&总部订货收款账户")
+@RestController
+@RequestMapping("/pc/orderInfo")
+public class PCOrderSysInfoController {
+
+    @Resource
+    private OrderSysInfoService orderSysInfoService;
+
+    @PostMapping("/submitOrderInfo")
+    @ApiOperation("IT提交订货信息")
+    public ResponseResult<Integer> submitOrderInfo(@RequestBody @Validated OrderSysInfoRequest request){
+        request.setType(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType());
+        return ResponseResult.success(orderSysInfoService.updateByShopId(request, CurrentUserHolder.getUserId()));
+    }
+
+    @PostMapping("/submitReceiving")
+    @ApiOperation("财务提交总部订货收款账户")
+    public ResponseResult<Integer> submitReceiving(@RequestBody @Validated OrderSysInfoRequest request){
+        request.setType(OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType());
+        return ResponseResult.success(orderSysInfoService.updateByShopId(request, CurrentUserHolder.getUserId()));
+    }
+}

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

@@ -9,6 +9,7 @@ import com.cool.store.response.ResponseResult;
 import com.cool.store.service.SignFranchiseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -22,7 +23,7 @@ public class PCSignFranchiseController {
 
     @ApiOperation("提交(更新)加盟合同签约")
     @PostMapping("/submitOrUpdate")
-    public ResponseResult<Boolean> submitSignFranchise(@RequestBody AddSignFranchiseRequest request) {
+    public ResponseResult<Boolean> submitSignFranchise(@RequestBody @Validated AddSignFranchiseRequest request) {
         LoginUserInfo user = CurrentUserHolder.getUser();
         return signFranchiseService.submitSignFranchise(request,user);
     }