加盟接口

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/ApplyTagEditVO.java

@@ -49,6 +49,7 @@ public class ApplyTagEditVO implements Serializable {
     private String brandLogo;
     @ApiModelProperty(value = "营业执照")
     private String licenseImg;
-
+    @ApiModelProperty(value = "合同编号contractNo")
+    private String contractNo;
 
 }

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserApplyTagVO.java

@@ -94,4 +94,6 @@ public class UserApplyTagVO implements Serializable {
     private Double lon;
 
 
+    @ApiModelProperty(value = "签署状态： 0、等待平台签署1、平台签署失败 2、等待（买家/供应商）签署（平台签署成功） 3、（买家/供应商）签署失败 4、（买家/供应商）签署成功、5、归档")
+    private Integer signStatus;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserApplyTagDO.java

 package com.mmc.iuav.user.entity;
 
+import com.mmc.iuav.user.entity.fdd.ContractInfoDO;
 import com.mmc.iuav.user.model.vo.ApplyTagEditVO;
 import com.mmc.iuav.user.model.vo.AttachmentVO;
 import com.mmc.iuav.user.model.vo.UserApplyTagVO;
@@ -18,7 +19,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserApplyTagDO implements Serializable {
+public class  UserApplyTagDO implements Serializable {
     private static final long serialVersionUID = -7581203992821286124L;
     private Integer id;
     private Integer cooperationTagId;
@@ -29,7 +30,8 @@ public class UserApplyTagDO implements Serializable {
     private Date createTime;
     private Integer applyStatus;
     private String orderNo;
-
+    private Integer signStatus;
+    private String contractNo;
     /**
      * 辅助字段start
      */
@@ -55,6 +57,7 @@ public class UserApplyTagDO implements Serializable {
                 .orderNo(orderNo)
                 .approvalStatus(applyStatus)
                 .cooperationTagName(tagName)
+                .signStatus(signStatus)
                 .attachmentList(this.attachmentList)
                 .content(this.companyInfoDO == null ? null : this.companyInfoDO.getContent())
                 .score(this.companyInfoDO == null ? null : this.companyInfoDO.getScore())
@@ -94,6 +97,7 @@ public class UserApplyTagDO implements Serializable {
                 .address(this.companyInfoDO == null ? null : this.companyInfoDO.getAddress())
                 .lat(this.companyInfoDO == null ? null : this.companyInfoDO.getLat())
                 .lon(this.companyInfoDO == null ? null : this.companyInfoDO.getLon())
+                .contractNo(contractNo)
                 .remark(this.remark)
                 .build();
     }

csm-service/cms-service-user/src/main/resources/mapper/CooperationDao.xml

@@ -16,6 +16,8 @@
         <result property="createTime" column="create_time"/>
         <result property="tagName" column="tag_name"/>
         <result property="orderNo" column="order_no"/>
+        <result property="signStatus" column="sign_status"/>
+        <result property="contractNo" column="contract_no"/>
 
         <association property="companyInfoDO" javaType="com.mmc.iuav.user.entity.CompanyInfoDO">
             <id property="id" column="company_info_id"/>
@@ -164,11 +166,13 @@
                ci.lat,
                ci.lon,
                ci.content,
-               ci.score
+               ci.score,
+        cti.contract_no
         FROM user_apply_tag ua
                  INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
                  INNER JOIN company_member cm ON cm.user_account_id = ua.user_account_id
                  INNER JOIN company_info ci ON cm.company_info_id = ci.id
+                left join contract_info cti on ua.order_no = cti.order_no
         WHERE ua.id = #{id}
           AND ua.is_deleted = 0
     </select>
@@ -268,12 +272,14 @@
         ci.lat,
         ci.lon,
         ci.content,
-        ci.score
+        ci.score,
+        cti.sign_status
         FROM
         user_apply_tag ua
         INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
         INNER JOIN company_member cm ON cm.user_account_id = ua.user_account_id
         INNER JOIN company_info ci ON cm.company_info_id = ci.id
+        left join contract_info cti on ua.order_no = cti.order_no
         <where>
             ua.is_deleted = 0
             <if test="cooperationTagId != null">