fix(消息)：调整消息发送逻辑

models/request/contract/contract.go

@@ -18,7 +18,7 @@ type UploadCheckBackFileReq struct {
 	ContractId int    `description:"合同id"`
 }
 
-//作废用印请求
+//作废合同请求
 type InvalidReq struct {
 	ContractId int `description:"合同id"`
 }

models/tables/contract/contract.go

@@ -16,7 +16,7 @@ type Contract struct {
 	SellerName       string    `description:"所属销售名称"`
 	ProductId        int       `description:"产品id，1：ficc；2：权益"`
 	ContractType     string    `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
-	Status           string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废','已签回'"`
+	Status           string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废','已签回','已解约'"`
 	StartDate        time.Time `description:"合同开始日期"`
 	EndDate          time.Time `description:"合同结束日期"`
 	OriginalPrice    float64   `description:"合同原金额，优惠前的金额"`
@@ -37,6 +37,7 @@ type Contract struct {
 	ApprovalRemark   string    `description:"审核备注"`
 	FileUrl          string    `description:"合同文件地址"`
 	CheckBackFileUrl string    `description:"签回合同文件地址"`
+	RescindFileUrl   string    `description:"解约合同文件地址"`
 	TemplateId       int       `description:"模板id"`
 	SourceId         int       `description:"来源合同id，默认是0；如果是通过其他合同复制过来的，那么就是原合同的id"`
 	IsDelete         int       `description:"是否已经删除，0：未删除，1：已删除",json:"-"`
@@ -67,7 +68,7 @@ type ContractDetail struct {
 	SellerName       string    `description:"所属销售名称"`
 	ProductId        int       `description:"产品id，1：ficc；2：权益"`
 	ContractType     string    `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
-	Status           string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废'"`
+	Status           string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废','已解约'"`
 	StartDate        time.Time `description:"合同开始日期"`
 	EndDate          time.Time `description:"合同结束日期"`
 	OriginalPrice    float64   `description:"合同原金额，优惠前的金额"`
@@ -84,10 +85,12 @@ type ContractDetail struct {
 	Phone            string    `description:"电话,长度32位"`
 	Postcode         string    `description:"邮编,长度16位"`
 	Remark           string    `description:"补充内容,长度255位"`
+	SellerRemark     string    `description:"销售备注,长度255位"`
 	ModifyContent    string    `description:"修改内容"`
 	ApprovalRemark   string    `description:"审核备注"`
 	FileUrl          string    `description:"合同文件地址"`
 	CheckBackFileUrl string    `description:"签回合同文件地址"`
+	RescindFileUrl   string    `description:"解约合同文件地址"`
 	TemplateId       int       `description:"模板id"`
 	SourceId         int       `description:"来源合同id，默认是0；如果是通过其他合同复制过来的，那么就是原合同的id"`
 	IsDelete         int       `json:"-";description:"是否已经删除，0：未删除，1：已删除"`
@@ -193,6 +196,7 @@ type ContractList struct {
 	Phone            string    `description:"电话,长度32位"`
 	Postcode         string    `description:"邮编,长度16位"`
 	Remark           string    `json:"-";description:"补充内容,长度255位"`
+	SellerRemark     string    `description:"销售备注,长度255位"`
 	ApprovalRemark   string    `description:"审核备注"`
 	ModifyContent    string    `description:"修改内容"`
 	FileUrl          string    `description:"合同文件地址"`

services/contract/contract.go

@@ -13,6 +13,7 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract_service_detail"
 	"hongze/hongze_mobile_admin/utils"
 	"strings"
+	"time"
 )
 
 //作废合同
@@ -93,8 +94,11 @@ func UploadCheckBackFile(contractId int, fileUrl string, opUser *custom.AdminWx)
 	}
 	contractInfo.CheckBackFileUrl = fileUrl
 	contractInfo.Status = "已签回"
-	var updateCol = []string{"CheckBackFileUrl", "Status"}
-	contractInfo.Update(updateCol)
+	contractInfo.ModifyTime = time.Now()
+	err = contractInfo.Update([]string{"CheckBackFileUrl", "Status", "ModifyTime"})
+	if err != nil {
+		return
+	}
 
 	//添加操作日志
 	remark := "上传签回合同附件"
@@ -104,7 +108,6 @@ func UploadCheckBackFile(contractId int, fileUrl string, opUser *custom.AdminWx)
 
 //获取审批流和权限
 func GetOpButton(contractInfo *contract.ContractDetail, contractApprovalInfo *contract_approval.ContractApproval, opUser *custom.AdminWx) (contractOpButton contractResp.OpButton, flowNodeListResp [][]contract_approval_record.ContractApprovalRecord, err error) {
-
 	//审批流
 	approvalRecordList, err := contract_approval_record.GetContractApprovalRecordListByContractApprovalId(contractApprovalInfo.ContractApprovalId)
 	if err != nil {

services/contract/contract_approval.go

@@ -150,7 +150,7 @@ func Apply(contractId int) (err error) {
 		go messageToNodeUser(contractApprovalRecordList[0].NodeId, contractInfo.SellerId, contractApproval.ContractApprovalId, 1, 1, contractInfo.CompanyName, applyContent)
 
 		//发送消息给所有的抄送人
-		go messageToAllCcUser(contractInfo.SellerId, contractApproval.ContractApprovalId, 1, 1, contractInfo.CompanyName, applyContent)
+		//go messageToAllCcUser(contractInfo.SellerId, contractApproval.ContractApprovalId, 1, 1, contractInfo.CompanyName, applyContent)
 	}
 	return
 }
@@ -375,7 +375,7 @@ func Reject(contractInfo *contract.Contract, approvalInfo *contract_approval.Con
 		go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 3, contractInfo.CompanyName, content, content, approvalSysUser.Mobile)
 
 		//发送消息给所有的抄送人
-		go messageToAllCcUser(opUserId, contractApprovalRecord.ContractApprovalId, 2, 3, contractInfo.CompanyName, content)
+		//go messageToAllCcUser(opUserId, contractApprovalRecord.ContractApprovalId, 2, 3, contractInfo.CompanyName, content)
 	}
 	return
 }
@@ -436,7 +436,7 @@ func Approved(contractInfo *contract.Contract, approvalInfo *contract_approval.C
 
 	//发送信息给所有抄送人
 	content := contractInfo.CompanyName + " 合同模板已审核"
-	go messageToAllCcUser(opUserId, contractApprovalRecord.ContractApprovalId, 2, 2, contractInfo.CompanyName, content)
+	//go messageToAllCcUser(opUserId, contractApprovalRecord.ContractApprovalId, 2, 2, contractInfo.CompanyName, content)
 	//如果下一个节点属于结束节点，那么通知对应的销售，同时，异步生成合同pdf
 	if contractApprovalRecord.NextNodeId == 0 {
 		//待办通知（通知销售已经审核通过了）
@@ -524,7 +524,7 @@ func approved(contractInfo *contract.Contract, contractApprovalRecord *contract_
 
 	//发送信息给所有抄送人
 	content := contractInfo.CompanyName + " 合同模板已审核"
-	go messageToAllCcUser(opUserId, contractApprovalRecord.ContractApprovalId, 2, 2, contractInfo.CompanyName, content)
+	//go messageToAllCcUser(opUserId, contractApprovalRecord.ContractApprovalId, 2, 2, contractInfo.CompanyName, content)
 	//如果下一个节点属于结束节点，那么通知对应的销售，同时，异步生成合同pdf
 	if contractApprovalRecord.NextNodeId == 0 {
 		//待办通知（通知销售已经审核通过了）

services/seal/approval.go

@@ -113,7 +113,7 @@ func Apply(sealInfo *seal.Seal) (err error) {
 		go messageToNodeUser(contractApprovalRecordList[0].NodeId, approval.ApplyUserId, approval.ContractApprovalId, 1, 1, sealInfo.CompanyName, sealInfo.Use)
 
 		//发送消息给所有的抄送人
-		go messageToAllCcUser(approval.ApplyUserId, approval.ContractApprovalId, 1, 1, sealInfo.CompanyName, sealInfo.Use)
+		//go messageToAllCcUser(approval.ApplyUserId, approval.ContractApprovalId, 1, 1, sealInfo.CompanyName, sealInfo.Use)
 	}
 	return
 }
@@ -292,7 +292,7 @@ func Reject(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractApprova
 		go services.AddCompanyApprovalMessage(opUserId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, 2, 3, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
 
 		//发送消息给所有的抄送人
-		go messageToAllCcUser(opUserId, approvalRecord.ContractApprovalId, 2, 3, sealInfo.CompanyName, content)
+		//go messageToAllCcUser(opUserId, approvalRecord.ContractApprovalId, 2, 3, sealInfo.CompanyName, content)
 	}
 	return
 }
@@ -352,7 +352,7 @@ func Approved(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractAppro
 
 	//发送信息给所有抄送人
 	content := sealInfo.CompanyName + " 用印已审核"
-	go messageToAllCcUser(opUserId, approvalRecord.ContractApprovalId, 2, 2, sealInfo.CompanyName, content)
+	//go messageToAllCcUser(opUserId, approvalRecord.ContractApprovalId, 2, 2, sealInfo.CompanyName, content)
 	//如果下一个节点属于结束节点，那么通知对应的销售
 	if approvalRecord.NextNodeId == 0 {
 		//待办通知（通知销售已经审核通过了）