2.1.0 bug fix

models/channel/channel.go

@@ -46,7 +46,7 @@ func (m *ChannelDAO) GetChannels(caseid string, page int, pageSize int) ([]Chann
 	from ta_channel a 
 	inner join sys_case b on a.case_id = b.case_id 
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&channels)
 	return channels, err
 }

models/customerremark/customerremark.go

@@ -47,7 +47,7 @@ FROM
 WHERE
 	a.sales_id = '` + salesId + `'
 	and a.customer_id = '` + customerId + `'
-	order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&remark)
 	return remark, err
 }
@@ -107,7 +107,7 @@ FROM
 	ta_customer_coupon
 	Where customer_id = '` + customerId + `'
 	and sales_id = '` + salesId + `'
-	order by receive_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	order by receive_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&customerReceive)
 	return customerReceive, err
 

models/flashbuy/flashbuy.go

@@ -63,7 +63,7 @@ FROM
 	if flashBuyStatus != "" {
 		sql += ` and a.flash_buy_status ='` + flashBuyStatus + `'`
 	}
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&flashBuy)
 	return flashBuy, err
 }
@@ -171,7 +171,7 @@ WHERE
 	if phone != "" {
 		sql += ` and b.phone like '%` + phone + `%'`
 	}
-	sql += ` order by a.create_date desc  limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	sql += ` order by a.create_date desc  limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&customerFlashBuy)
 	return customerFlashBuy, err
 
@@ -227,7 +227,7 @@ func (m *FlashbuyDAO) GetCustomerFlashBuyByCustomerId(customerId string, page, p
 	 inner join ta_flash_buy b 
 	 on a.flash_buy_id = b.flash_buy_id
 	 where a.customer_id = '` + customerId + `'`
-	sql += ` order by a.validate_start desc  limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	sql += ` order by a.validate_start desc  limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&customerResult)
 	return customerResult, err
 

models/system/user.go

@@ -179,7 +179,14 @@ func (m *UserDAO) AddUser(user model.SysUser) (*model.SysUser, error) {
 func (m *UserDAO) GenerateRecommendCode() string {
 	var temp1 int = rand.Intn(9) * 87
 	var temp2 int = rand.Intn(9)
+	var temp3 int = rand.Intn(9) * 7
 	var code string = strconv.Itoa(temp1) + strconv.Itoa(temp2)
+	if len(code) < 4 {
+		code += strconv.Itoa(temp3)
+	}
+	if len(code) > 4 {
+		code = code[0:4]
+	}
 	return code
 }
 func (m *UserDAO) IsCodeExist(code string) (int, error) {