Merge branch 'crm_need_1059' of http://8.136.199.33:3000/hongze/hongze_task into debug

models/company_product.go

@@ -321,6 +321,7 @@ type CompanyProduct struct {
 	TodoCreateTime   time.Time `description:"任务创建时间"`
 	TodoApproveTime  time.Time `description:"任务审批时间"`
 	TryStage         int       `description:"试用客户子标签：1未分类、2  推进、3 跟踪、4 预备"`
+	IsShare          int       `description:"0:非共享用户,1:共享客户"`
 }
 
 // GetCompanyProduct 获取产品详情
@@ -499,3 +500,18 @@ func GetCompanyProductItemByCompanyId(companyId int, productId int) (item *Compa
 
 	return
 }
+
+// 取消共享销售
+func UpdateCompanyProductCancelisShare(companyId, productId int) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE company_product SET
+                            is_share = 0 , 
+                            share_seller = '',
+                            share_group_id = 0,
+                            share_seller_id = 0 , 
+                            share_seller_id_last  = 0 , 
+                            share_seller_last = ''
+                            WHERE company_id = ?  AND product_id= ? `
+	_, err = o.Raw(sql, companyId, productId).Exec()
+	return
+}

services/company_product.go

@@ -95,6 +95,28 @@ func CompanyLoss(cont context.Context) (err error) {
 			AddCompanyOperationRecord(v.CompanyId, utils.AdminId, v.ProductId, utils.AdminId, v.CompanyName,
 				v.ProductName, utils.RealName, remark, operation, approveContent, approveContent, "", v.Status)
 		}
+
+		//新增操作记录
+		if v.ProductId == 2 {
+			cp, err := models.GetCompanyProduct(v.CompanyId, v.ProductId)
+			if err != nil {
+				utils.FileLog.Info("GetCompanyProduct Err:%s" + err.Error())
+				return err
+			}
+			if cp.IsShare == 1 {
+				err = models.UpdateCompanyProductCancelisShare(v.CompanyId, v.ProductId)
+				if err != nil {
+					utils.FileLog.Info("UpdateCompanyProductCancelisShare Err:%s" + err.Error())
+					return err
+				}
+				remark := "流失客户，自动取消共享"
+				operation := "no_renewed"
+				approveContent := "流失"
+				AddCompanyOperationRecord(v.CompanyId, utils.AdminId, v.ProductId, utils.AdminId, v.CompanyName,
+					v.ProductName, utils.RealName, remark, operation, approveContent, approveContent, "", v.Status)
+			}
+
+		}
 	}
 	return
 }

services/roadshow/calendar.go

@@ -603,12 +603,12 @@ func SyncCalendarFromShanghai(cont context.Context) (err error) {
 	}
 
 	if len(delRsCalendarResearcherIds) > 0 {
-		tmpErr := roadshow.ModifyRsCalendarResearcherStatusDel(delRsCalendarResearcherIds)
-		if tmpErr != nil {
-			err = tmpErr
-			errMsgList = append(errMsgList, fmt.Sprint("删除第三方日历ID：", delRsCalendarResearcherIds, "删除关联关系失败；err:"+tmpErr.Error(), ";"))
-			return
-		}
+		//tmpErr := roadshow.ModifyRsCalendarResearcherStatusDel(delRsCalendarResearcherIds)
+		//if tmpErr != nil {
+		//	err = tmpErr
+		//	errMsgList = append(errMsgList, fmt.Sprint("删除第三方日历ID：", delRsCalendarResearcherIds, "删除关联关系失败；err:"+tmpErr.Error(), ";"))
+		//	return
+		//}
 	}
 
 	mapShangHaiResearcher := make(map[string][]string)