fix bug

models/company.go

@@ -51,4 +51,20 @@ func GetCompany() (items []*Company, err error) {
 	sql := `SELECT * FROM company WHERE type =1 `
 	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
 	return
-}
+}
+
+//待冻结客户
+type CompanyNeedFreeze struct {
+	CompanyId        int
+	CompanyProductId int
+}
+
+func GetCompanyNeedFreeze(endDate string) (items []*CompanyNeedFreeze, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT a.company_id,b.company_product_id FROM company AS a
+			INNER JOIN company_product AS b ON a.company_id=b.company_id
+			WHERE b.status='试用'
+			AND b.end_date<? `
+	_, err = o.Raw(sql, endDate).QueryRows(&items)
+	return
+}

services/company.go

@@ -26,42 +26,38 @@ func ImportCompany() {
 	startDate := ""
 	endDate := ""
 	dateType := 3
-	permissionMap:=make(map[string]int)
+	permissionMap := make(map[string]int)
 
-	permissionMap["宏观经济"]=1
-	permissionMap["有色"]=2
-	permissionMap["原油"]=3
-	permissionMap["橡胶"]=4
-	permissionMap["钢材"]=5
-	permissionMap["煤炭"]=6
-	permissionMap["甲醇"]=7
-	permissionMap["沥青"]=8
-	permissionMap["PTA"]=9
-	permissionMap["MEG"]=10
-	permissionMap["聚烯烃"]=11
-	permissionMap["铁矿"]=12
-	permissionMap["苯乙烯"]=13
-	permissionMap["织造终端"]=14
+	permissionMap["宏观经济"] = 1
+	permissionMap["有色"] = 2
+	permissionMap["原油"] = 3
+	permissionMap["橡胶"] = 4
+	permissionMap["钢材"] = 5
+	permissionMap["煤炭"] = 6
+	permissionMap["甲醇"] = 7
+	permissionMap["沥青"] = 8
+	permissionMap["PTA"] = 9
+	permissionMap["MEG"] = 10
+	permissionMap["聚烯烃"] = 11
+	permissionMap["铁矿"] = 12
+	permissionMap["苯乙烯"] = 13
+	permissionMap["织造终端"] = 14
 
 	for _, sheet := range xlFile.Sheet {
 		rows := sheet.MaxRow
 		for i := 0; i < rows; i++ {
 			if i > 2 {
-				row, err := sheet.Row(i)
-				if err != nil {
-					fmt.Println("get row err:" + err.Error())
-					return
-				}
-
-				realName := row.GetCell(1).String()
+				row:= sheet.Row(i)
+				cells:=row.Cells
+				realName := cells[1].String()
 				realName = strings.Trim(realName, " ")
 				realName = strings.Replace(realName, " ", "", -1)
 
-				mobile := row.GetCell(2).String()
+				mobile := cells[2].String()
 				mobile = strings.Trim(mobile, " ")
 				mobile = strings.Replace(mobile, " ", "", -1)
 				fmt.Println(mobile)
-				companyName := row.GetCell(6).String()
+				companyName := cells[6].String()
 				fmt.Println(companyName)
 				companyName = strings.Trim(companyName, " ")
 				companyName = strings.Replace(companyName, " ", "", -1)
@@ -125,9 +121,9 @@ func ImportCompany() {
 					if wxUser == nil {
 						//用户不存在，新增
 						fmt.Println("AddWxUser")
-						email:=""
+						email := ""
 						fmt.Println(company.CompanyId, mobile, realName)
-						err = models.AddWxUser(company.CompanyId, mobile, realName,email)
+						err = models.AddWxUser(company.CompanyId, mobile, realName, email)
 						if err != nil {
 							fmt.Println("AddWxUser Err:" + err.Error())
 							return
@@ -147,8 +143,6 @@ func ImportCompany() {
 	fmt.Println("len:", n)
 }
 
-
-
 //客户
 func ImportCompanyUsers() {
 	var err error
@@ -157,7 +151,7 @@ func ImportCompanyUsers() {
 			fmt.Println("err:", err.Error())
 		}
 	}()
-	fileName := "./company_user_0914.xlsx"
+	fileName := "./company_user_102202.xlsx"
 	xlFile, err := xlsx.OpenFile(fileName)
 	if err != nil {
 		fmt.Printf("open failed: %s\n", err)
@@ -167,27 +161,23 @@ func ImportCompanyUsers() {
 		rows := sheet.MaxRow
 		for i := 0; i < rows; i++ {
 			if i > 2 {
-				row, err := sheet.Row(i)
-				if err != nil {
-					fmt.Println("get row err:" + err.Error())
-					return
-				}
+				row:= sheet.Row(i)
+				cells:=row.Cells
 
-				realName := row.GetCell(0).String()
+				realName := cells[1].String()
 				realName = strings.Trim(realName, " ")
 				realName = strings.Replace(realName, " ", "", -1)
 
-				mobile := row.GetCell(1).String()
+				mobile := cells[2].String()
 				mobile = strings.Trim(mobile, " ")
 				mobile = strings.Replace(mobile, " ", "", -1)
 
-				email := row.GetCell(2).String()
+				email := cells[5].String()
 				email = strings.Trim(email, " ")
 				email = strings.Replace(email, " ", "", -1)
-
 				fmt.Println(mobile)
 				var companyId int64
-				companyId=98
+				companyId = 225
 				if companyId > 0 {
 					wxUser, err := models.GetWxUserByMobile(mobile)
 					if err != nil && err.Error() != utils.ErrNoRow() {
@@ -197,13 +187,13 @@ func ImportCompanyUsers() {
 					if wxUser == nil {
 						//用户不存在，新增
 						fmt.Println("AddWxUser")
-						err = models.AddWxUser(companyId, mobile, realName,email)
+						err = models.AddWxUser(companyId, mobile, realName, email)
 						if err != nil {
 							fmt.Println("AddWxUser Err:" + err.Error())
 							return
 						}
 					} else {
-						fmt.Println("用户存在：mobile:", mobile,realName)
+						fmt.Println("用户存在：mobile:", mobile, realName)
 					}
 				} else {
 					fmt.Println("companyId<=0")
@@ -214,3 +204,24 @@ func ImportCompanyUsers() {
 	}
 	fmt.Println("len:", n)
 }
+
+//客户自动冻结-试用两个月结束后，进入冻结
+func CompanyFreeze() (err error) {
+	endDate := time.Now().Format(utils.FormatDate)
+	items, err := models.GetCompanyNeedFreeze(endDate)
+	if err != nil {
+		fmt.Println("GetCompanyNeedFreeze Err:" + err.Error())
+		utils.FileLog.Info("GetCompanyNeedFreeze Err:%s" + err.Error())
+		return
+	}
+	for k, v := range items {
+		fmt.Println(k, v.CompanyId)
+	}
+	return
+}
+
+//客户自动流失
+func CompanyLoss() (err error) {
+
+	return
+}

services/data_source_longzhong.go

@@ -56,20 +56,18 @@ func GetLongZhongTargetInfoByExcel() {
 		//maxCol := v.MaxCol
 		fmt.Println(classifyName, maxRow)
 		for i := 0; i < maxRow; i++ {
-			row, err := v.Row(i)
-			if err != nil {
-				return
-			}
+			row := v.Row(i)
 			longzhongClassify := ""
 			if i > 0 {
-				longzhongClassifyNew := row.GetCell(0).String()
+				cells:=row.Cells
+				longzhongClassifyNew :=cells[0].String()
 				if longzhongClassifyNew != "" {
 					longzhongClassify = longzhongClassifyNew
 				}
-				secName := row.GetCell(1).Value
-				frequency := row.GetCell(2).Value
-				LongzhongId := row.GetCell(3).Value
-				remark := row.GetCell(4).String()
+				secName := cells[1].Value
+				frequency := cells[2].Value
+				LongzhongId := cells[3].Value
+				remark := cells[4].String()
 				item := new(models.DataSourceLongzhong)
 				item.ClassifyId = classifyId
 				item.ClassifyName = classifyName
@@ -581,11 +579,7 @@ func LzExportExcel() {
 			if len(dataList) <= 0 {
 				for n := 0; n < dataMax; n++ {
 					rowIndex := 5 + n
-					row, err := sheetNew.Row(rowIndex)
-					if err != nil {
-						fmt.Println("add row err:" + err.Error())
-						return
-					}
+					row:= sheetNew.Row(rowIndex)
 					row.AddCell()
 					row.AddCell()
 					row.AddCell()
@@ -594,11 +588,7 @@ func LzExportExcel() {
 				endRowIndex := 0
 				for rk, dv := range dataList {
 					rowIndex := 5 + rk
-					row, err := sheetNew.Row(rowIndex)
-					if err != nil {
-						fmt.Println("add row err:" + err.Error())
-						return
-					}
+					row := sheetNew.Row(rowIndex)
 					row.AddCell().SetValue(dv.Dt)
 					row.AddCell().SetFloat(dv.Close)
 					row.AddCell()
@@ -608,11 +598,7 @@ func LzExportExcel() {
 					dataLen := dataMax - len(dataList)
 					for n := 0; n < dataLen; n++ {
 						rowIndex := (endRowIndex + 1) + n
-						row, err := sheetNew.Row(rowIndex)
-						if err != nil {
-							fmt.Println("add row err:" + err.Error())
-							return
-						}
+						row := sheetNew.Row(rowIndex)
 						row.AddCell()
 						row.AddCell()
 						row.AddCell()
@@ -902,11 +888,7 @@ func LzPriceExportExcel() {
 			if len(dataList) <= 0 {
 				for n := 0; n < dataMax; n++ {
 					rowIndex := 8 + n
-					row, err := sheetNew.Row(rowIndex)
-					if err != nil {
-						fmt.Println("add row err:" + err.Error())
-						return
-					}
+					row := sheetNew.Row(rowIndex)
 					row.AddCell()
 					row.AddCell()
 					row.AddCell()
@@ -917,11 +899,7 @@ func LzPriceExportExcel() {
 				endRowIndex := 0
 				for rk, dv := range dataList {
 					rowIndex := 8 + rk
-					row, err := sheetNew.Row(rowIndex)
-					if err != nil {
-						fmt.Println("add row err:" + err.Error())
-						return
-					}
+					row := sheetNew.Row(rowIndex)
 					row.AddCell().SetValue(dv.PriceDate)
 					row.AddCell().SetFloat(dv.Price)
 					row.AddCell().SetFloat(dv.LowPrice)
@@ -934,11 +912,7 @@ func LzPriceExportExcel() {
 					dataLen := dataMax - len(dataList)
 					for n := 0; n < dataLen; n++ {
 						rowIndex := (endRowIndex + 1) + n
-						row, err := sheetNew.Row(rowIndex)
-						if err != nil {
-							fmt.Println("add row err:" + err.Error())
-							return
-						}
+						row := sheetNew.Row(rowIndex)
 						row.AddCell()
 						row.AddCell()
 						row.AddCell()

services/task.go

@@ -40,7 +40,7 @@ func Task() {
 
 //func Task() {
 //	fmt.Println("start")
-//	GetLzProductDetail()
+//	ImportCompanyUsers()
 //	fmt.Println("end")
 //}