no message

controllers/company_apply_v2.go

@@ -241,6 +241,10 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 		contract.ModifyTime = time.Now()
 		contract.PackageType = req.PackageType
 		contract.RaiPackageType = req.RaiPackageType
+		contract.SellerIdInit = companyProduct.SellerId
+		contract.SellerNameInit = companyProduct.SellerName
+		contract.ShareSellerInit = companyProduct.ShareSeller
+		contract.ShareSellerIdInit = companyProduct.ShareSellerId
 		newId, err := company.AddCompanyContract(contract)
 		if err != nil {
 			br.Msg = "新增合同失败"
@@ -693,6 +697,10 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 		contract.RaiPackageType = req.RaiPackageType
 		contract.CreateTime = time.Now()
 		contract.ModifyTime = time.Now()
+		contract.SellerIdInit = companyProduct.SellerId
+		contract.SellerNameInit = companyProduct.SellerName
+		contract.ShareSellerInit = companyProduct.ShareSeller
+		contract.ShareSellerIdInit = companyProduct.ShareSellerId
 		newId, err := company.AddCompanyContract(contract)
 		if err != nil {
 			br.Msg = "新增合同失败"
@@ -1176,25 +1184,29 @@ func (this *CompanyApplyController) ApplyBySystemContract() {
 		//	return
 		//}
 		companyContract := &company.CompanyContract{
-			CompanyId:        req.CompanyId,
-			ProductId:        contractDetail.ProductId,
-			ContractType:     contractType,
-			RaiContractType:  raicontractType,
-			ProductName:      companyProduct.ProductName,
-			CompanyProductId: companyProduct.CompanyProductId,
-			ContractCode:     contractDetail.ContractCode,
-			StartDate:        contractDetail.StartDate.Format(utils.FormatDate),
-			EndDate:          contractDetail.EndDate.Format(utils.FormatDate),
-			Money:            contractDetail.Price,
-			PayMethod:        contractDetail.PayRemark,
-			PayChannel:       contractDetail.PayChannel,
-			ImgUrl:           contractDetail.CheckBackFileUrl,
-			Status:           0,
-			Source:           "系统合同",
-			PackageType:      packageType,
-			RaiPackageType:   raiPackageType,
-			CreateTime:       time.Now(),
-			ModifyTime:       time.Now(),
+			CompanyId:         req.CompanyId,
+			ProductId:         contractDetail.ProductId,
+			ContractType:      contractType,
+			RaiContractType:   raicontractType,
+			ProductName:       companyProduct.ProductName,
+			CompanyProductId:  companyProduct.CompanyProductId,
+			ContractCode:      contractDetail.ContractCode,
+			StartDate:         contractDetail.StartDate.Format(utils.FormatDate),
+			EndDate:           contractDetail.EndDate.Format(utils.FormatDate),
+			Money:             contractDetail.Price,
+			PayMethod:         contractDetail.PayRemark,
+			PayChannel:        contractDetail.PayChannel,
+			ImgUrl:            contractDetail.CheckBackFileUrl,
+			Status:            0,
+			Source:            "系统合同",
+			PackageType:       packageType,
+			RaiPackageType:    raiPackageType,
+			CreateTime:        time.Now(),
+			ModifyTime:        time.Now(),
+			SellerIdInit:      companyProduct.SellerId,
+			SellerNameInit:    companyProduct.SellerName,
+			ShareSellerInit:   companyProduct.ShareSeller,
+			ShareSellerIdInit: companyProduct.ShareSellerId,
 		}
 		newId, err := company.AddCompanyContract(companyContract)
 		if err != nil {

models/company/company_contract.go

@@ -27,6 +27,10 @@ type CompanyContract struct {
 	PackageType       int       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
 	RaiPackageType    int       `description:"权益套餐类型: 0-无; 1-70w大套餐; 2-45w大套餐"`
 	RaiContractType   string    `description:"权益合同类型：枚举值：'新签合同','续约合同','补充协议'"`
+	SellerIdInit      int       `description:"销售id"`
+	SellerNameInit    string    `description:"销售名称"`
+	ShareSellerInit   string    `description:"共享销售员"`
+	ShareSellerIdInit int       `description:"共享销售员id"`
 }
 
 // 新增客户合同

models/statistic_report.go

@@ -391,6 +391,7 @@ type IncrementalList struct {
 	RegionType           string                             `description:"企业客户所属区域；可选范围：国内，海外"`
 	SellerId             int                                `description:"归属销售id"`
 	SellerName           string                             `description:"归属销售名称"`
+	ShareSeller          string                             `description:"共享销售员"`
 	ExpireDay            string                             `description:"剩余可用天数"`
 	PermissionList       []*company.CompanyReportPermission `description:"产品权限"`
 	Count                int                                `json:"-" description:"合同数"`
@@ -863,7 +864,7 @@ func GetLastContractMoney(CompanyIds string) (items []*IncrementalList, err erro
 func GetIncrementalCompanyMergeList(condition string, pars []interface{}, startSize, pageSize int) (items []*IncrementalList, err error) {
 	o := orm.NewOrm()
 
-	sql := `SELECT a.*,b.region_type,c.seller_id,c.seller_name,b.company_name,c.renewal_reason FROM company_contract a
+	sql := `SELECT a.*,b.region_type,c.seller_id,a.seller_name_init as seller_name ,a.share_seller_init as share_seller ,b.company_name,c.renewal_reason FROM company_contract a
 		 JOIN company b ON a.company_id = b.company_id
 		 JOIN company_product c ON a.company_id = c.company_id and a.product_id=c.product_id WHERE 1 = 1 `