Merge branch 'crm/5.3' into debug

controllers/approval.go

@@ -509,7 +509,7 @@ func (c *ApprovalCommon) ApplyApproveOld() {
 			//}
 			//如果合同时间小于等于今天，那么立马执行合同内容
 			if time.Now().After(contractStartDate) {
-				err = company_approval.TryOutToFormal(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, contract.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName)
+				err = company_approval.TryOutToFormal(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, contract.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName, contract.PackageType)
 				if err != nil {
 					c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 					return
@@ -581,7 +581,7 @@ func (c *ApprovalCommon) ApplyApproveOld() {
 
 			//如果合同时间小于等于今天，那么立马执行合同内容
 			if time.Now().After(contractStartDate) {
-				err = company_approval.ApplyServiceUpdate(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, companyProduct.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName)
+				err = company_approval.ApplyServiceUpdate(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, companyProduct.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName, contract.PackageType)
 				if err != nil {
 					c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 					return

models/tables/company_approval/company_approval.go

@@ -176,7 +176,7 @@ func GetApprovalCount(condition string, pars []interface{}) (count int, err erro
 }
 
 // TryOutToFormal 试用转正式
-func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string) (err error) {
+func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
 	defer func() {
@@ -186,8 +186,8 @@ func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyCo
 			o.Commit()
 		}
 	}()
-	sql := `UPDATE company_product SET status='正式',approve_status='已审批',start_date=?,end_date=?,modify_time=NOW(),formal_time=NOW() WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, startDate, endDate, companyId, productId).Exec()
+	sql := `UPDATE company_product SET status='正式',approve_status='已审批',start_date=?,end_date=?,package_type=?,modify_time=NOW(),formal_time=NOW() WHERE company_id=? AND product_id=? `
+	_, err = o.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
@@ -507,7 +507,7 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
 }
 
 // ApplyServiceUpdate 申请服务更新
-func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string) (err error) {
+func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
 	defer func() {
@@ -585,8 +585,8 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 	//}
 
 	//更新客户产品信息
-	sql = `UPDATE company_product SET status='正式',approve_status='已审批',start_date=?,end_date=?,modify_time=NOW() WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, updateStartDateTime, updateEndDateTime, companyId, productId).Exec()
+	sql = `UPDATE company_product SET status='正式',approve_status='已审批',start_date=?,end_date=?,package_type=?,modify_time=NOW() WHERE company_id=? AND product_id=? `
+	_, err = o.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, companyId, productId).Exec()
 	if err != nil {
 		return
 	}

models/tables/company_contract/company_contract.go

@@ -23,6 +23,7 @@ type CompanyContract struct {
 	CreateTime        time.Time `description:"合同创建时间"`
 	ModifyTime        time.Time `description:"合同修改时间"`
 	Status            int       `description:"状态"`
+	PackageType       int       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
 }
 
 type CompanyContractDetail struct {
@@ -40,6 +41,7 @@ type CompanyContractDetail struct {
 	CreateTime        time.Time `description:"合同创建时间"`
 	ModifyTime        time.Time `description:"合同修改时间"`
 	Status            int       `description:"状态"`
+	PackageType       int       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
 	PermissionList    []*company_report_permission.PermissionLookList
 }
 
@@ -55,7 +57,7 @@ func GetCompanyContractDetail(companyId, productId, companyContractId int) (item
 	return
 }
 
-//根据合同id获取已经勾选的权限
+// GetCompanyContractPermissionCheckByContractId 根据合同id获取已经勾选的权限
 func GetCompanyContractPermissionCheckByContractId(companyId, companyContractId, permissionId int) (count int, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT COUNT(1) AS count FROM company_contract_permission AS a WHERE a.company_id=? AND company_contract_id=? AND a.chart_permission_id=? `

models/tables/company_product/company_product.go

@@ -33,6 +33,7 @@ type CompanyProduct struct {
 	LoseReason       string    `description:"流失原因"`
 	LossTime         time.Time `description:"流失时间"`
 	CompanyType      string    `description:"客户类型"`
+	PackageType      int       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
 }
 
 func GetCompanyProductByCompanyIdAndProductId(companyId, productId int) (item *CompanyProduct, err error) {

services/company_approval/company_approval.go

@@ -634,7 +634,7 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 		//}
 		//如果合同时间小于等于今天，那么立马执行合同内容
 		if time.Now().After(contractStartDate) {
-			tmpErr = company_approval.TryOutToFormal(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, contractInfo.CompanyContractId, contractInfo.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName)
+			tmpErr = company_approval.TryOutToFormal(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, contractInfo.CompanyContractId, contractInfo.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName, contractInfo.PackageType)
 			if tmpErr != nil {
 				err = errors.New("试用转正式失败,Err:" + tmpErr.Error())
 				return
@@ -705,7 +705,7 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 
 		//如果合同时间小于等于今天，那么立马执行合同内容
 		if time.Now().After(contractStartDate) {
-			err = company_approval.ApplyServiceUpdate(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, recodeInfo.CompanyContractId, companyProduct.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName)
+			err = company_approval.ApplyServiceUpdate(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, recodeInfo.CompanyContractId, companyProduct.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName, contractInfo.PackageType)
 			if tmpErr != nil {
 				err = errors.New(fmt.Sprint("正式客户申请服务更新失败，执行失败;Err:" + tmpErr.Error()))
 				return

utils/constants.go

@@ -19,8 +19,8 @@ const (
 )
 
 const (
-	APPNAME          = "弘则官网"
-	EmailSendToUsers = "glji@hzinsights.com"
+	APPNAME          = "随手办公"
+	EmailSendToUsers = "glji@hzinsights.com;pyan@hzinsights.com"
 )
 
 //手机号，电子邮箱正则